When in local tagged cache is local as well (#1305)

* when in local tagged cache is local as well

* fix

* fix

* disableNimBinaries in test

* removes 1.6.20 which fails in the CI for an unrelated reason

* Update src/nimblepkg/nimblesat.nim

---------

Co-authored-by: Andreas Rumpf <[email protected]>

Author: jmgomez

src/nimblepkg/nimblesat.nim

@@ -496,8 +496,12 @@ proc getAllNimReleases(options: Options): seq[PackageMinimalInfo] =
   if options.nimBin.isSome:
     result.addUnique PackageMinimalInfo(name: "nim", version: options.nimBin.get.version)
 
-proc getTaggedVersions*(repoDir: string, options: Options): Option[TaggedPackageVersions] =
-  let file = repoDir / TaggedVersionsFileName
+proc getTaggedVersions*(repoDir, pkgName: string, options: Options): Option[TaggedPackageVersions] =
+  var file: string
+  if options.localDeps:
+    file = options.getNimbleDir / "pkgcache" / "tagged" / pkgName & ".json"
+  else: 
+    file = repoDir / TaggedVersionsFileName
   if file.fileExists:
     try:
       let taggedVersions = file.readFile.parseJson().to(TaggedPackageVersions)
@@ -510,26 +514,45 @@ proc getTaggedVersions*(repoDir: string, options: Options): Option[TaggedPackage
   else:
     none(TaggedPackageVersions)
 
-proc saveTaggedVersions*(repoDir: string, taggedVersions: TaggedPackageVersions) =
+proc saveTaggedVersions*(repoDir, pkgName: string, taggedVersions: TaggedPackageVersions, options: Options) =
+  var file: string
+  if options.localDeps:
+    file = options.getNimbleDir / "pkgcache" / "tagged" / pkgName & ".json"
+  else: 
+    file = repoDir / TaggedVersionsFileName
   try:
-    let file = repoDir / TaggedVersionsFileName
+    createDir(file.parentDir)
     file.writeFile((taggedVersions.toJson()).pretty)
   except CatchableError as e:
     displayWarning(&"Error saving tagged versions: {e.msg}", HighPriority)
 
 proc getPackageMinimalVersionsFromRepo*(repoDir: string, name: string, version: Version, downloadMethod: DownloadMethod, options: Options): seq[PackageMinimalInfo] =
   #This is expensive. We need to cache it. Potentially it could be also run in parallel
   # echo &"Discovering version for {pkgName}"
-  let taggedVersions = getTaggedVersions(repoDir, options)
+  gitFetchTags(repoDir, downloadMethod)    
+  let tags = getTagsList(repoDir, downloadMethod).getVersionList()
+  template checkoutCurrentVersion() = 
+    if version.isSpecial:
+      var specialVersion = substr($version, 1)
+      if specialVersion == "head":
+        specialVersion = "HEAD"
+      doCheckout(downloadMethod, repoDir, specialVersion)
+    else:
+      for (ver, tag) in tags.pairs:    
+        if ver == version:
+          doCheckout(downloadMethod, repoDir, tag)
+
+  result = newSeq[PackageMinimalInfo]()
+  checkoutCurrentVersion()
+  let taggedVersions = getTaggedVersions(repoDir, name, options)
   if taggedVersions.isSome:
     return taggedVersions.get.versions
-  gitFetchTags(repoDir, downloadMethod)    
+
   #First package must be the current one
   try:
     result.add getPkgInfo(repoDir, options).getMinimalInfo(options)
   except CatchableError as e:
     displayWarning(&"Error getting package info for {name}: {e.msg}", HighPriority)
-  let tags = getTagsList(repoDir, downloadMethod).getVersionList()
   var checkedTags = 0
   for (ver, tag) in tags.pairs:    
     if options.maxTaggedVersions > 0 and checkedTags >= options.maxTaggedVersions:
@@ -545,12 +568,9 @@ proc getPackageMinimalVersionsFromRepo*(repoDir: string, name: string, version:
     except CatchableError as e:
       displayWarning(&"Error reading tag {tag}: for package {name}. This may not be relevant as it could be an old version of the package. \n {e.msg}", HighPriority)
 
-  #make sure we let this folder as it was
-  for (ver, tag) in tags.pairs:    
-    if ver == version:
-      doCheckout(downloadMethod, repoDir, tag)
+    checkoutCurrentVersion()
 
-  saveTaggedVersions(repoDir, TaggedPackageVersions(maxTaggedVersions: options.maxTaggedVersions, versions: result))
+  saveTaggedVersions(repoDir, name, TaggedPackageVersions(maxTaggedVersions: options.maxTaggedVersions, versions: result), options)
 
 proc downloadMinimalPackage*(pv: PkgTuple, options: Options): seq[PackageMinimalInfo] =
   if pv.name == "": return newSeq[PackageMinimalInfo]()

tests/tniminstall.nim

@@ -20,7 +20,7 @@ proc isNimPkgVer(folder: string, ver: string): bool =
 suite "Nim install":
   test "Should be able to install different Nim versions":
     cd "nimnimble":
-      for nimVerDir in ["nim1.6.20", "nim2.0.4"]:
+      for nimVerDir in ["nim2.0.4"]:
         cd nimVerDir:
           let nimVer = nimVerDir.replace("nim", "")
           echo "Checking version ", nimVer

tests/tsat.nim

@@ -335,6 +335,30 @@ suite "SAT solver":
       check version in packageVersions.mapIt(it.version)
     check fileExists(repoDir / TaggedVersionsFileName)
 
+  test "should not use the global tagged cache when in local but a local one":
+    var options = initOptions()
+    options.localDeps = true
+    options.maxTaggedVersions = 0 #all
+    options.nimBin = some options.makeNimBin("nim")
+    options.config.packageLists["official"] = PackageList(name: "Official", urls: @[
+    "https://raw.githubusercontent.com/nim-lang/packages/master/packages.json",
+    "https://nim-lang.org/nimble/packages.json"
+    ])
+    options.setNimbleDir()
+    echo "NIMBLE DIR", options.getNimbleDir()
+    for dir in walkDir(".", true):
+      if dir.kind == PathComponent.pcDir and dir.path.startsWith("githubcom_vegansknimfp"):
+        echo "Removing dir", dir.path
+        removeDir(dir.path)
+    
+    let pvPrev = parseRequires("nimfp >= 0.3.4")
+    let downloadResPrev = pvPrev.downloadPkgFromUrl(options)[0]
+    let repoDirPrev = downloadResPrev.dir
+    discard getPackageMinimalVersionsFromRepo(repoDirPrev, pvPrev[0], downloadResPrev.version,  DownloadMethod.git, options)
+    check not fileExists(repoDirPrev / TaggedVersionsFileName)
+
+    check fileExists("nimbledeps" / "pkgcache" / "tagged" / "nimfp.json")
+
   test "if a dependency is unsatisfable, it should fallback to the previous version of the depency when available":
     let pkgVersionTable = {
       "a": PackageVersions(pkgName: "a", versions: @[