Fetch only tags within the range (#1349)

Author: 2-towns

src/nimblepkg/nimblesat.nim

@@ -537,9 +537,10 @@ proc saveTaggedVersions*(repoDir, pkgName: string, taggedVersions: TaggedPackage
   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] =
+proc getPackageMinimalVersionsFromRepo*(repoDir: string, pkg: PkgTuple, version: Version, downloadMethod: DownloadMethod, options: Options): seq[PackageMinimalInfo] =
   result = newSeq[PackageMinimalInfo]()
 
+  let name = pkg[0]
   let taggedVersions = getTaggedVersions(repoDir, name, options)
   if taggedVersions.isSome:
     return taggedVersions.get.versions
@@ -568,6 +569,12 @@ proc getPackageMinimalVersionsFromRepo*(repoDir: string, name: string, version:
       inc checkedTags
 
       try:
+        let tagVersion = newVersion($ver)
+
+        if not tagVersion.withinRange(pkg[1]):
+          displayInfo(&"Ignoring {tagVersion} because out of range {pkg[1]}")
+          break
+
         doCheckout(downloadMethod, tempDir, tag)
         let nimbleFile = findNimbleFile(tempDir, true, options)
         if options.useDeclarativeParser:
@@ -598,7 +605,7 @@ proc downloadMinimalPackage*(pv: PkgTuple, options: Options): seq[PackageMinimal
     result = @[downloadPkInfoForPv(pv, options).getMinimalInfo(options)]
   else:    
     let (downloadRes, downloadMeth) = downloadPkgFromUrl(pv, options)
-    result = getPackageMinimalVersionsFromRepo(downloadRes.dir, pv.name, downloadRes.version, downloadMeth, options)
+    result = getPackageMinimalVersionsFromRepo(downloadRes.dir, pv, downloadRes.version, downloadMeth, options)
   # echo "Downloading minimal package for ", pv.name, " ", $pv.ver, result
 
 proc fillPackageTableFromPreferred*(packages: var Table[string, PackageVersions], preferredPackages: seq[PackageMinimalInfo]) =

tests/tdeclarativeparser.nim

@@ -56,7 +56,7 @@ suite "Declarative parsing":
     let repoDir = downloadRes.dir
     let downloadMethod = DownloadMethod git
     let packageVersions = getPackageMinimalVersionsFromRepo(
-      repoDir, pv[0], downloadRes.version, downloadMethod, options
+      repoDir, pv, downloadRes.version, downloadMethod, options
     )
 
     #we know these versions are available

tests/tsat.nim

@@ -305,7 +305,7 @@ suite "SAT solver":
     let downloadRes = pv.downloadPkgFromUrl(options)[0] #This is just to setup the test. We need a git dir to work on
     let repoDir = downloadRes.dir
     let downloadMethod = DownloadMethod git
-    let packageVersions = getPackageMinimalVersionsFromRepo(repoDir, pv[0], downloadRes.version, downloadMethod, options)
+    let packageVersions = getPackageMinimalVersionsFromRepo(repoDir, pv, downloadRes.version, downloadMethod, options)
 
     #we know these versions are available
     let availableVersions = @["0.3.4", "0.3.5", "0.3.6", "0.4.5", "0.4.4"].mapIt(newVersion(it))
@@ -329,15 +329,15 @@ suite "SAT solver":
     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)
+    discard getPackageMinimalVersionsFromRepo(repoDirPrev, pvPrev, downloadResPrev.version,  DownloadMethod.git, options)
     check fileExists(repoDirPrev / TaggedVersionsFileName)
 
     let pv = parseRequires("nimfp >= 0.4.4")
     let downloadRes = pv.downloadPkgFromUrl(options)[0]
     let repoDir = downloadRes.dir 
     check not fileExists(repoDir / TaggedVersionsFileName)
 
-    let packageVersions = getPackageMinimalVersionsFromRepo(repoDir, pv[0], downloadRes.version, DownloadMethod.git, options)
+    let packageVersions = getPackageMinimalVersionsFromRepo(repoDir, pv, downloadRes.version, DownloadMethod.git, options)
     #we know these versions are available
     let availableVersions = @["0.4.5", "0.4.4"].mapIt(newVersion(it))
     for version in availableVersions:
@@ -363,7 +363,7 @@ suite "SAT solver":
     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)
+    discard getPackageMinimalVersionsFromRepo(repoDirPrev, pvPrev, downloadResPrev.version,  DownloadMethod.git, options)
     check not fileExists(repoDirPrev / TaggedVersionsFileName)
 
     check fileExists("nimbledeps" / "pkgcache" / "tagged" / "nimfp.json")