Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport #10548: Print info about current project file in use to stderr and ignore the imports by default #10550

Merged
merged 2 commits into from
Nov 18, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 13, 2024

fix #10547 by printing the project config info to stderr.

Also, report only top-level project configs with the default verbosity. Otherwise, imported config files can still be seen in the verbose mode.

Manual Q/A

Try to reproduce #10547


Template Α: This PR modifies behaviour or interface

Include the following checklist in your PR:

  • Patches conform to the coding conventions.
  • [N/A] This fixes code that has not been released yet. Any changes that could be relevant to users have been recorded in the changelog.
  • [N/A] The documentation has been updated, if necessary.
  • Manual QA notes have been included.
  • Tests have been added. (Ask for help if you don’t know how to write them! Ask for an exemption if tests are too complex for too little coverage!)

This is an automatic backport of pull request #10548 done by [Mergify](https://mergify.com).

… imports by default (#10548)

* Print info about current project file in use to stderr (fix #10547)

* only report top-level project config files in the default verbosity

in verbose mode report imported files too

* fix tests

* don't print anything when provenance is empty

* fix tests

* Apply suggestions from code review

Co-authored-by: ffaf1 <fa-ml@ariis.it>

---------

Co-authored-by: ffaf1 <fa-ml@ariis.it>
(cherry picked from commit 7de199a)

# Conflicts:
#	cabal-testsuite/PackageTests/ConditionalAndImport/cabal.out
@mergify mergify bot added the conflicts label Nov 13, 2024
Copy link
Contributor Author

mergify bot commented Nov 13, 2024

Cherry-pick of 7de199a has failed:

On branch mergify/bp/3.14/pr-10548
Your branch is up to date with 'origin/3.14'.

You are currently cherry-picking commit 7de199ad5.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   cabal-install-solver/src/Distribution/Solver/Types/ProjectConfigPath.hs
	modified:   cabal-install/src/Distribution/Client/ProjectConfig.hs
	modified:   cabal-install/src/Distribution/Client/ProjectPlanning.hs
	modified:   cabal-testsuite/PackageTests/NewConfigure/LocalConfigOverwrite/cabal.out
	modified:   cabal-testsuite/PackageTests/NewFreeze/BuildTools/new_freeze.out
	modified:   cabal-testsuite/PackageTests/NewFreeze/Flags/new_freeze.out
	modified:   cabal-testsuite/PackageTests/NewFreeze/FreezeFile/new_freeze.out
	modified:   cabal-testsuite/PackageTests/RelativePathProjectImports/cabal.out
	modified:   cabal-testsuite/PackageTests/VersionPriority/1-local.out
	modified:   cabal-testsuite/PackageTests/VersionPriority/1-web.out
	modified:   cabal-testsuite/PackageTests/VersionPriority/2-local.out
	modified:   cabal-testsuite/PackageTests/VersionPriority/2-web.out
	modified:   cabal-testsuite/PackageTests/VersionPriority/3-web.out

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   cabal-testsuite/PackageTests/ConditionalAndImport/cabal.out

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@ulysses4ever ulysses4ever force-pushed the mergify/bp/3.14/pr-10548 branch from 578f431 to 2692a22 Compare November 13, 2024 03:50
@ulysses4ever
Copy link
Collaborator

If anyone wants to try to fix up the test, I'd appreciate that since I'm traveling during this week.

@ulysses4ever ulysses4ever force-pushed the mergify/bp/3.14/pr-10548 branch from 2692a22 to de3bb02 Compare November 18, 2024 04:18
@mergify mergify bot merged commit 281927c into 3.14 Nov 18, 2024
53 checks passed
@mergify mergify bot deleted the mergify/bp/3.14/pr-10548 branch November 18, 2024 06:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport squash+merge me Tell Mergify Bot to squash-merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant