Fix dips, nimble file handling, and gitops #120

elcritch · 2024-03-11T14:48:01Z

This PR started to work on #117 but uncovered a few other items which needed cleaned up or fixed.

Changes:

Combine multiple ways to search for Nimble files into one place
fixes some edge cases in handling finding Nimble files
fixes issue with writing default config file and handling the deps cli option
unit tests for various nimble file states (missing, ambiguous, etc)
unit tests for parsing PkgUrl's
merges adhoc git execs to use the gitops module, restoring logging etc
cleanup for setting up triple-name on conflicts

This PR started to work on nim-lang#117 but uncovered a few other items which needed cleaned up or fixed. Changes: Combine multiple ways to search for Nimble files into one place fixes some edge cases in handling finding Nimble files fixes issue with writing default config file and handling the deps cli option osutils.nim provides shims for unit testing proc's using a subset of file operations unit tests for various nimble file states unit tests for parsing PkgUrl's fixes some adhoc git execs to use the gitops module, restoring logging etc

elcritch · 2024-05-13T16:03:22Z

@Araq fixed this PR. I started tracking down another set of issues and got a broken commit mixed in here.

src/atlas.nim

src/nimbleparser.nim

Araq · 2024-05-13T17:04:44Z

Option[string] is actually worse than string if s.len == 0 is already an errornous state. You added yet another error state on top of the one we already have. For Nimble file detection it's something like:

type
  NimbleFile = object
     results: int
     file: string # only valid if results == 1

src/nimbleparser.nim

Don't error on ambiguous nimble files

src/atlas.nim

spelling

src/atlas.nim

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

elcritch · 2024-05-13T22:24:37Z

Option[string] is actually worse than string if s.len == 0 is already an errornous state. You added yet another error state on top of the one we already have.

It does introducing another possible error state, but that can be handled by ensuring the code that finds the nimble files doesn't return some(""). It's not, ideal, granted to be able to make an invalid state but it's localized to that single proc so should be easy to vet.

Mainly I found it useful in documenting elsewhere in the codebase that the Nimble file might not be found yet and that using .get will result in an easier to trace defect vs an empty string which might go unchecked.

tests/unit_tests/testpkgurls.nim

Clonkk · 2024-07-10T09:34:01Z

This seems like a good PR. Any status on it ?

Araq · 2024-07-20T09:04:50Z

src/depgraphs.nim

@@ -295,6 +306,7 @@ proc expand*(c: var AtlasContext; g: var DepGraph; nc: NimbleContext; m: Travers
        g.nodes[i].status = status

      if g.nodes[i].status == Ok:
+        g.nodes[i].nimbleFile = c.findNimbleFile(g.nodes[i].pkg, dest)


It's been a while but IIRC there were cases where the nimble file wasn't being found for newly added dependencies as it's traversing the graph.

Also, it needs to properly set the full path for the nimble file. There's issues when the deps or projects folder are different from the standard locations.

Araq · 2024-07-20T09:05:25Z

src/depgraphs.nim

+      echo "\n"
+      echo "SAT MaxIterationLimitError: "
+      debugFormular c, g, f, s
+      echo "\n"


Other parts of the codebase don't use echo to report errors.

Good catch, just left over debugging statements. I'll go through and clean it up.

elcritch force-pushed the fix-deps-setup branch from 7bba972 to 65630b3 Compare March 11, 2024 15:06

elcritch marked this pull request as ready for review March 11, 2024 15:07

elcritch marked this pull request as draft March 11, 2024 16:37

elcritch marked this pull request as ready for review March 29, 2024 14:13

elcritch force-pushed the fix-deps-setup branch from b76d86e to 4882b25 Compare March 30, 2024 12:48

elcritch added 3 commits March 30, 2024 14:51

remove debug exception handlers

6ccb567

add short options for workspaces or deps dirs

53e6a3d

merge workspace short commands

37f4462

elcritch force-pushed the fix-deps-setup branch from b9258cb to 37f4462 Compare May 13, 2024 15:54

Araq reviewed May 13, 2024

View reviewed changes

src/atlas.nim Outdated Show resolved Hide resolved

Araq reviewed May 13, 2024

View reviewed changes

src/nimbleparser.nim Outdated Show resolved Hide resolved