This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7024

destutil: provide hint on rebase+merge for how to specify destination/rev
ClosedPublic

Authored by spectral on Oct 8 2019, 2:17 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG8197b395710e: destutil: provide hint on rebase+merge for how to specify destination/rev
rHGbff942299ca9: destutil: provide hint on rebase+merge for how to specify destination/rev
Summary

Without a destination specified, rebase and merge attempt to identify a good
candidate; this fails if there's too many heads, the heads have a bookmark, or
other reasons.

Complicating the issue, users may have specified -t, thinking it means target,
and are confused when the error message says that they need to specify an
explicit rev or explicit destination - they feel like they already have.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

spectral created this revision.Oct 8 2019, 2:17 PM
pulkit added a subscriber: pulkit.Oct 8 2019, 3:35 PM

IIUC, you mean unambiguous instead of ambiguous in the commit message? Re-reading I am confused.

spectral retitled this revision from destutil: add mechanism to specify ambiguous destination on rebase and merge to destutil: provide hint on rebase+merge for how to specify destination/rev.Oct 8 2019, 4:49 PM
spectral edited the summary of this revision. (Show Details)
spectral added a comment.Oct 8 2019, 4:50 PM
In D7024#103055, @pulkit wrote:

IIUC, you mean unambiguous instead of ambiguous in the commit message? Re-reading I am confused.

Updated the message, see if this works better?

pulkit accepted this revision.Oct 8 2019, 5:03 PM
This revision is now accepted and ready to land.Oct 8 2019, 5:03 PM

Revision Contents
Changeset List

PathPackages
Mmercurial/destutil.py (20 lines)

Diff 16977

mercurial/destutil.py

msgdestmerge = { msgdestmerge = {
# too many matching divergent bookmark # too many matching divergent bookmark
b'toomanybookmarks': { b'toomanybookmarks': {
b'merge': ( b'merge': (
_( _(
b"multiple matching bookmarks to merge -" b"multiple matching bookmarks to merge -"
b" please merge with an explicit rev or bookmark" b" please merge with an explicit rev or bookmark"
), ),
_(b"run 'hg heads' to see all heads"), _(b"run 'hg heads' to see all heads, specify rev with -r"),
), ),
b'rebase': ( b'rebase': (
_( _(
b"multiple matching bookmarks to rebase -" b"multiple matching bookmarks to rebase -"
b" please rebase to an explicit rev or bookmark" b" please rebase to an explicit rev or bookmark"
), ),
_(b"run 'hg heads' to see all heads"), _(b"run 'hg heads' to see all heads, specify destination with -d"),
), ),
}, },
# no other matching divergent bookmark # no other matching divergent bookmark
b'nootherbookmarks': { b'nootherbookmarks': {
b'merge': ( b'merge': (
_( _(
b"no matching bookmark to merge - " b"no matching bookmark to merge - "
b"please merge with an explicit rev or bookmark" b"please merge with an explicit rev or bookmark"
), ),
_(b"run 'hg heads' to see all heads"), _(b"run 'hg heads' to see all heads, specify rev with -r"),
), ),
b'rebase': ( b'rebase': (
_( _(
b"no matching bookmark to rebase - " b"no matching bookmark to rebase - "
b"please rebase to an explicit rev or bookmark" b"please rebase to an explicit rev or bookmark"
), ),
_(b"run 'hg heads' to see all heads"), _(b"run 'hg heads' to see all heads, specify destination with -d"),
), ),
}, },
# branch have too many unbookmarked heads, no obvious destination # branch have too many unbookmarked heads, no obvious destination
b'toomanyheads': { b'toomanyheads': {
b'merge': ( b'merge': (
_(b"branch '%s' has %d heads - please merge with an explicit rev"), _(b"branch '%s' has %d heads - please merge with an explicit rev"),
_(b"run 'hg heads .' to see heads"), _(b"run 'hg heads .' to see heads, specify rev with -r"),
), ),
b'rebase': ( b'rebase': (
_(b"branch '%s' has %d heads - please rebase to an explicit rev"), _(b"branch '%s' has %d heads - please rebase to an explicit rev"),
_(b"run 'hg heads .' to see heads"), _(b"run 'hg heads .' to see heads, specify destination with -d"),
), ),
}, },
# branch have no other unbookmarked heads # branch have no other unbookmarked heads
b'bookmarkedheads': { b'bookmarkedheads': {
b'merge': ( b'merge': (
_(b"heads are bookmarked - please merge with an explicit rev"), _(b"heads are bookmarked - please merge with an explicit rev"),
_(b"run 'hg heads' to see all heads"), _(b"run 'hg heads' to see all heads, specify rev with -r"),
), ),
b'rebase': ( b'rebase': (
_(b"heads are bookmarked - please rebase to an explicit rev"), _(b"heads are bookmarked - please rebase to an explicit rev"),
_(b"run 'hg heads' to see all heads"), _(b"run 'hg heads' to see all heads, specify destination with -d"),
), ),
}, },
# branch have just a single heads, but there is other branches # branch have just a single heads, but there is other branches
b'nootherbranchheads': { b'nootherbranchheads': {
b'merge': ( b'merge': (
_(b"branch '%s' has one head - please merge with an explicit rev"), _(b"branch '%s' has one head - please merge with an explicit rev"),
_(b"run 'hg heads' to see all heads"), _(b"run 'hg heads' to see all heads, specify rev with -r"),
), ),
b'rebase': ( b'rebase': (
_(b"branch '%s' has one head - please rebase to an explicit rev"), _(b"branch '%s' has one head - please rebase to an explicit rev"),
_(b"run 'hg heads' to see all heads"), _(b"run 'hg heads' to see all heads, specify destination with -d"),
), ),
}, },
# repository have a single head # repository have a single head
b'nootherheads': { b'nootherheads': {
b'merge': (_(b'nothing to merge'), None), b'merge': (_(b'nothing to merge'), None),
b'rebase': (_(b'nothing to rebase'), None), b'rebase': (_(b'nothing to rebase'), None),
}, },
# repository have a single head and we are not on it # repository have a single head and we are not on it