Detect all registered VCS and choose inner-most #7593
Merged
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
pradyunsg
reviewed
Jan 13, 2020
uranusjr
force-pushed
the
hg-under-git
branch
from
5a46eec
to
4796ea2
Compare
uranusjr
force-pushed
the
hg-under-git
branch
from
4796ea2
to
62ffc7b
Compare
| except BadCommand: | ||
| logger.debug("could not determine if %s is under git control " | ||
| "because git is not available", location) | ||
| return False | ||
| return None | ||
| except InstallationError: |
There was a problem hiding this comment.
This seems weird, I'd say call_subprocess should not raise InstallationError which is too high-level.
There was a problem hiding this comment.
It is definitely not right, but I’d say this belongs to another (refactoring) PR. Note that the Mercurial implementation already catches InstallationError right now.
|
Soft ping, I believe I have addressed all comments. There are a few follow-up improvements I am looking to do after this. |
pradyunsg
approved these changes
Feb 7, 2020
xavfernandez
approved these changes
Feb 7, 2020
chrahunt
suggested changes
Feb 8, 2020
Co-Authored-By: Christopher Hunt <[email protected]>
|
Thanks all! |
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.
Fix #3988.
The idea (as describe in #3988 (comment)) is to test all VCS, and choose the one that controls the inner-most directory as root. Git provides this value via
git rev-parse --show-toplevel, and Mercurialhg root.The implementation seems to work from my limited testing, but there are still much to do. A test, at least. And the VCS code modified in this PR probably could use some refactoring as well.