D7024: destutil: add mechanism to specify ambiguous destination on rebase and merge
spectral (Kyle Lippincott)
phabricator at mercurial-scm.org
Tue Oct 8 18:17:24 UTC 2019
spectral created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
We've seen some confusion where users specify -t, thinking it means target, and
are confused when it says to explicitly specify a revision/destination: they
feel like they already have.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D7024
AFFECTED FILES
mercurial/destutil.py
CHANGE DETAILS
diff --git a/mercurial/destutil.py b/mercurial/destutil.py
--- a/mercurial/destutil.py
+++ b/mercurial/destutil.py
@@ -182,14 +182,14 @@
b"multiple matching bookmarks to merge -"
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"multiple matching bookmarks to rebase -"
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
@@ -199,47 +199,47 @@
b"no matching bookmark to merge - "
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"no matching bookmark to rebase - "
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
b'toomanyheads': {
b'merge': (
_(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"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
b'bookmarkedheads': {
b'merge': (
_(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"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
b'nootherbranchheads': {
b'merge': (
_(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"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
To: spectral, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list