Make sure that lock does not fail if non-dependecy in dev is dirty

- fixes nim-lang#1007

Author: yyoncho

src/nimble.nim

@@ -1508,14 +1508,13 @@ proc updateSyncFile(dependentPkg: PackageInfo, options: Options) =
   syncFile.save
 
 proc validateDevModeDepsWorkingCopiesBeforeLock(
-    pkgInfo: PackageInfo, options: Options) =
+    pkgInfo: PackageInfo, options: Options): ValidationErrors =
   ## Validates that the develop mode dependencies states are suitable for
   ## locking. They must be under version control, their working copies must be
   ## in a clean state and their current VCS revision must be present on some of
   ## the configured remotes.
 
-  var errors: ValidationErrors
-  findValidationErrorsOfDevDepsWithLockFile(pkgInfo, options, errors)
+  findValidationErrorsOfDevDepsWithLockFile(pkgInfo, options, result)
 
   # Those validation errors are not errors in the context of generating a lock
   # file.
@@ -1526,12 +1525,9 @@ proc validateDevModeDepsWorkingCopiesBeforeLock(
     }
 
   # Remove not errors from the errors set.
-  for name, error in common.dup(errors):
+  for name, error in common.dup(result):
     if error.kind in notAnErrorSet:
-      errors.del name
-
-  if errors.len > 0:
-    raise validationErrors(errors)
+      result.del name
 
 proc mergeLockedDependencies*(pkgInfo: PackageInfo, newDeps: LockFileDeps,
                               options: Options): LockFileDeps =
@@ -1592,13 +1588,21 @@ proc lock(options: Options) =
   let pkgInfo = getPkgInfo(currentDir, options)
 
   let doesLockFileExist = displayLockOperationStart(currentDir)
-  validateDevModeDepsWorkingCopiesBeforeLock(pkgInfo, options)
+  var errors = validateDevModeDepsWorkingCopiesBeforeLock(pkgInfo, options)
 
   let dependencies = pkgInfo.processFreeDependencies(options).map(
     pkg => pkg.toFullInfo(options)).toSeq
   pkgInfo.validateDevelopDependenciesVersionRanges(dependencies, options)
   var dependencyGraph = buildDependencyGraph(dependencies, options)
 
+  # throw error only for dependencies that are part of the graph
+  for name, error in common.dup(errors):
+    if not dependencyGraph.contains(name):
+      errors.del name
+
+  if errors.len > 0:
+    raise validationErrors(errors)
+
   if currentDir.lockFileExists:
     # If we already have a lock file, merge its data with the newly generated
     # one.
@@ -1856,7 +1860,7 @@ proc getPackageForAction(pkgInfo: PackageInfo, options: Options): PackageInfo =
   ## with the name specified in `options.package`. If `options.package` is empty
   ## or it matches the name of the `pkgInfo` then `pkgInfo` is returned. Raises
   ## a `NimbleError` if the package with the provided name is not found.
-  
+
   result = initPackageInfo()
 
   if options.package.len == 0 or pkgInfo.basicInfo.name == options.package:

tests/tlockfile.nim

@@ -46,7 +46,7 @@ suite "lock file":
       `pkgName"PkgRepoPath"` {.used, inject.} = tempDir / `pkgName"PkgName"`
       `pkgName"PkgOriginRepoPath"`{.used, inject.} =
         originsDirPath / `pkgName"PkgName"`
-      `pkgName"PkgRemoteName"` {.used, inject.} = 
+      `pkgName"PkgRemoteName"` {.used, inject.} =
         `pkgName"PkgName"` & "Remote"
       `pkgName"PkgRemotePath"` {.used, inject.} =
         additionalRemotesDirPath / `pkgName"PkgRemoteName"`
@@ -327,7 +327,7 @@ requires "nim >= 1.5.1"
       cd dep1PkgOriginRepoPath:
         createBranchAndSwitchToIt(branchName)
         addAdditionalFileToTheRepo("dep1.nim", additionalFileContent)
-      
+
       cd dep2PkgOriginRepoPath:
         createBranchAndSwitchToIt(branchName)
         addAdditionalFileToTheRepo("dep2.nim", additionalFileContent)
@@ -370,7 +370,7 @@ requires "nim >= 1.5.1"
       # match those in the lock file.
       testLockedVcsRevisions(@[(dep1PkgName, dep1PkgRepoPath),
                                 (dep2PkgName, dep2PkgRepoPath)])
-  
+
   test "can sync out of sync develop dependencies":
     outOfSyncDepsTest(""):
       testDepsSync()
@@ -408,8 +408,9 @@ requires "nim >= 1.5.1"
                            @[dep1PkgName])
       initNewNimblePackage(dep1PkgOriginRepoPath, dep1PkgRepoPath)
       cd dep1PkgRepoPath:
-        # Modify the Nimble file to make the working copy not clean.
-        discard initNewNimbleFile(dep1PkgRepoPath, @[dep2PkgName])
+        # Add a file to make the working copy not clean.
+        writeFile("dirty", "dirty")
+        addFiles("dirty")
       cd mainPkgRepoPath:
         writeDevelopFile(developFileName, @[], @[dep1PkgRepoPath])
         let (output, exitCode) = execNimbleYes("lock")
@@ -528,3 +529,25 @@ requires "nim >= 1.5.1"
                                  path: dep1PkgRepoPath)
          errorMessage = getValidationErrorMessage(dep1PkgName, error)
        check output.processOutput.inLines(errorMessage)
+
+  test "can lock with dirty non-deps in develop file":
+    cleanUp()
+    withPkgListFile:
+      initNewNimblePackage(mainPkgOriginRepoPath, mainPkgRepoPath,
+                           @[dep1PkgName])
+      initNewNimblePackage(dep1PkgOriginRepoPath, dep1PkgRepoPath)
+      initNewNimblePackage(dep2PkgOriginRepoPath, dep2PkgRepoPath)
+
+      cd dep2PkgRepoPath:
+        # make dep2 dirty
+        writeFile("dirty", "dirty")
+        addFiles("dirty")
+
+
+      cd mainPkgRepoPath:
+        # make main dirty
+        writeFile("dirty", "dirty")
+        addFiles("dirty")
+        writeDevelopFile(developFileName, @[],
+                         @[dep2PkgRepoPath, mainPkgRepoPath, dep1PkgRepoPath])
+        testLockFile(@[(dep1PkgName, dep1PkgRepoPath)], isNew = true)