Show provenance of import constraint
With this change to the solver message rendering, I also fix some bugs around project imports, adding tests for those cases. Reviewers asked that the Y-shaped import checks (using IORef) be made on a separate pull request. Removing those lead to cascading deletions. - Regenerate expected .out files - Show tree provenance of import constraint - Add trimmed down PackageTests/VersionPriority - Add changelog entry - Use NonEmpty - Fix check for cyclical import - Use primes for next iteration - Remove unused LANGUAGE pragmas - Rename to projectConfigPathRoot - Docs for ProjectConfigPath and showProjectConfigPath - Renaming - Add cyclical import tests with 1 and 2 hops in cycle - Use full path for cyclical error message - Expected output has project with full project path - Add fullPath local function - Project directory as FilePath, not Maybe FilePath - Use (_, projectFileName) binding splitFileName - Need full path to project parsing legacy - Inline seenImports conversion - Add cyclical checks with same file names and hops - Add noncyclical tests that hop over folders - Add a project testing skipping in and out of a folder - Update expectations of cyclical tests - Use canonicalizePath for collapsing .. when possible - Capture trace for later - Add module for ProjectConfigPath - Move functions for ProjectConfigPath to its module - Fetch URI is not prefixed with ./https://etc - Document normaliseConfigPath - Add doctests for normaliseConfigPath - Add doctest of canonicalizeConfigPath - Show an example of canonical paths - Use importer and importee in canonicalizeConfigPaths - Add logging
Showing
- cabal-install-solver/cabal-install-solver.cabal 3 additions, 0 deletionscabal-install-solver/cabal-install-solver.cabal
- cabal-install-solver/src/Distribution/Solver/Modular/Message.hs 3 additions, 0 deletions...install-solver/src/Distribution/Solver/Modular/Message.hs
- cabal-install-solver/src/Distribution/Solver/Types/ConstraintSource.hs 4 additions, 3 deletions...-solver/src/Distribution/Solver/Types/ConstraintSource.hs
- cabal-install-solver/src/Distribution/Solver/Types/ProjectConfigPath.hs 205 additions, 0 deletions...solver/src/Distribution/Solver/Types/ProjectConfigPath.hs
- cabal-install/src/Distribution/Client/ProjectConfig.hs 8 additions, 4 deletionscabal-install/src/Distribution/Client/ProjectConfig.hs
- cabal-install/src/Distribution/Client/ProjectConfig/Legacy.hs 91 additions, 38 deletions...l-install/src/Distribution/Client/ProjectConfig/Legacy.hs
- cabal-install/src/Distribution/Client/ProjectConfig/Types.hs 10 additions, 2 deletionscabal-install/src/Distribution/Client/ProjectConfig/Types.hs
- cabal-install/src/Distribution/Client/ProjectPlanning.hs 9 additions, 6 deletionscabal-install/src/Distribution/Client/ProjectPlanning.hs
- cabal-install/src/Distribution/Client/ScriptUtils.hs 3 additions, 2 deletionscabal-install/src/Distribution/Client/ScriptUtils.hs
- cabal-install/tests/UnitTests/Distribution/Client/ProjectConfig.hs 4 additions, 3 deletions...tall/tests/UnitTests/Distribution/Client/ProjectConfig.hs
- cabal-install/tests/UnitTests/Distribution/Client/TreeDiffInstances.hs 2 additions, 0 deletions.../tests/UnitTests/Distribution/Client/TreeDiffInstances.hs
- cabal-testsuite/PackageTests/ConditionalAndImport/cabal.out 74 additions, 18 deletionscabal-testsuite/PackageTests/ConditionalAndImport/cabal.out
- cabal-testsuite/PackageTests/ConditionalAndImport/cabal.test.hs 120 additions, 23 deletions...testsuite/PackageTests/ConditionalAndImport/cabal.test.hs
- cabal-testsuite/PackageTests/ConditionalAndImport/oops-0.project 4 additions, 0 deletions...estsuite/PackageTests/ConditionalAndImport/oops-0.project
- cabal-testsuite/PackageTests/ConditionalAndImport/oops-2.config 1 addition, 0 deletions...testsuite/PackageTests/ConditionalAndImport/oops-2.config
- cabal-testsuite/PackageTests/ConditionalAndImport/oops-4.config 1 addition, 0 deletions...testsuite/PackageTests/ConditionalAndImport/oops-4.config
- cabal-testsuite/PackageTests/ConditionalAndImport/oops-6.config 1 addition, 0 deletions...testsuite/PackageTests/ConditionalAndImport/oops-6.config
- cabal-testsuite/PackageTests/ConditionalAndImport/oops-8.config 1 addition, 0 deletions...testsuite/PackageTests/ConditionalAndImport/oops-8.config
- cabal-testsuite/PackageTests/ConditionalAndImport/oops/oops-1.config 1 addition, 0 deletions...uite/PackageTests/ConditionalAndImport/oops/oops-1.config
- cabal-testsuite/PackageTests/ConditionalAndImport/oops/oops-3.config 1 addition, 0 deletions...uite/PackageTests/ConditionalAndImport/oops/oops-3.config
Loading
Please register or sign in to comment