Fix pip freeze not showing correct entry for mercurial packages that use subdirectories. #7072
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…so it porperly detects that subdirectories are under mercurial control.
…t a setup.py in a repo subdirectory.
…her the source or setup.py is located in a subdirectory of the repo root.
- fixed lint errors.
…t installed, causing errors to be logged.
|
Hello! I am an automated bot and I have noticed that this pull request is not currently able to be merged. If you are able to either merge the |
chrahunt
suggested changes
Oct 6, 2019
…rial`, adding `get_repo_root_dir()` for the vcs specific code. - Reverted behaviour of `Git.controls_location()` and `Mercurial.controls_location()` to call the vcs command if the base `VersionControl.controls_location()` doesn't detect the vcs directory. - Added `log_failed_cmd` argument `VcsSupport.run_command()` to allow vcs commands to be tried without logging errors if they aren't present. - Corrected indentation. - Removed `expect_stderr=True` in `test_freeze_mercurial_clone_srcdir` as its not required.
…`Git.get_subdirectory()` and `Mercurial.get_subdirectory()`. Added `find_path_to_setup_from_repo_root()` function to perform the common parts of `get_subdirectory()`.
|
It looks like LF got converted to CRLF on the latest commit. |
chrahunt
reviewed
Oct 11, 2019
…n optimization that belongs in another PR.
only got found after reverting `VersionControl.controls_location()`
chrahunt
approved these changes
Oct 11, 2019
Closed
xavfernandez
approved these changes
Oct 12, 2019
|
This has apparently conflicts with master: could you rebase it ? |
|
@xavfernandez I could merge this in, so I did. Lemme know if I did something wrong? |
Strange, Github wasn't letting me merge it 🤔 |
|
Brilliant! Big thanks to @chrahunt for your eagle eyes and patience on this. |
lock
bot
added
the
auto-locked
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
fixes #7071
Changes are based on functionality that exists in the Git implementation, copied and modified for Mercurial.
Also changes the behavior of
VcsSupport.controls_location()which now traverses up the filesystem looking for an appropriate vcs directory (.git, .hg etc) before invoking the applicable vcs command. This solves the problem of errors being printed to stderr due to vcs commands being run when no such vcs is installed. i.e. installing as editable from mercurial would causepip freezeto callgitand print an error ifgitis not installed.