Pull ReRequest: Fix for "Cloning HG repo to Git creates "uncheck-out-able" repositories". And upgrade for filenames transcoding #1
Conversation
This file contains hidden or 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
... rather than only adding remote ones locally and never deleting. In particular, makes fetch --prune work. Fixes felipec#15
Also prevent errors when trying to push no changesets to a peer, which some combinations of versions and extensions do not handle well; see e.g. as in felipec#32 and felipec#22
Push capability is used depending on remote-hg.capability-push setting and ... * handles dry-run properly, * passes copy and rename information onto Mercurial Fixes felipec#61
Also remove some superfluous function parameters and add another one to avoid using global var.
... as configured by remote-hg.push-updates-notes setting.
... at least in the sane capability_push mode. Remove documentation on obsolete push-updates-notes setting.
... as the old mode is not so safe and on its way to deprecation.
If you have a repository with multiple independent histories (perhaps that get merged later), under some circumstances revision 0 can get imported *after* some other revision. "Independent histories" are those that start from different zero-parent commits. I have thus far failed to get a local reproduction on this, in part because I don't understand how git-remote-hg choses the order in which to import branches. But we did notice this in our production system. If revision 0 is imported late, a reset would not be issued, and it would be wrongly re-parented on top of whatever previous history existed, instead of being a root-level commit. Fix this by always issuing a reset for a parentless commit, even on revision 0.
Based on reproduction steps provided by Adam Bliss.
... in particular when these would otherwise map to unsupported refnames. Fixes #10
... to align it with current git's more restricted behavior
... now in a separate module as of 55e8efa2451a0999b56978e471dc31dc8066a0fb
... as modified in cd23423029287e299d65bbece497ff09a2a673f4
... as modified in 38f4805020437f126f5c1c8f41d78445f9ab6547 Fixes #16
... to ensure setup.py does not trip some later time. Fixes #25
If new heads are created on a remote http repo after we pull but before we request branch heads, we'll try to read a head that we don't actually have locally. To fix this, we request the branchmap before fetching, and only fetch the heads that we just learned about.
|
wrong direction... |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Hi! I've got a pull request to felipec repo felipec#79, but it hungs there for a few months with no action.
Can you please check it and use in your fork?