[Request] [+ ] D10723: rewriteutil: add pointer to help text when rewrite would cause divergence
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Mon May 17 22:16:49 UTC 2021
martinvonz created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.
REVISION SUMMARY
The evolve extension's version of the hint has this pointer. I missed
it when I moved it to core.
REPOSITORY
rHG Mercurial
BRANCH
default
REVISION DETAIL
https://phab.mercurial-scm.org/D10723
AFFECTED FILES
mercurial/rewriteutil.py
tests/test-amend.t
tests/test-branch-change.t
CHANGE DETAILS
diff --git a/tests/test-branch-change.t b/tests/test-branch-change.t
--- a/tests/test-branch-change.t
+++ b/tests/test-branch-change.t
@@ -151,7 +151,7 @@
$ hg branch -r 4 --hidden foobar
abort: cannot change branch of 3938acfb5c0f, as that creates content-divergence with 7c1991464886
- (add --verbose for details)
+ (add --verbose for details or see 'hg help evolution.instability')
[10]
Make sure bookmark movement is correct
diff --git a/tests/test-amend.t b/tests/test-amend.t
--- a/tests/test-amend.t
+++ b/tests/test-amend.t
@@ -239,7 +239,7 @@
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg amend -m divergent
abort: cannot amend 112478962961, as that creates content-divergence with 16084da537dd
- (add --verbose for details)
+ (add --verbose for details or see 'hg help evolution.instability')
[10]
$ hg amend -m divergent --config experimental.evolution.allowdivergence=true
2 new content-divergent changesets
diff --git a/mercurial/rewriteutil.py b/mercurial/rewriteutil.py
--- a/mercurial/rewriteutil.py
+++ b/mercurial/rewriteutil.py
@@ -114,7 +114,11 @@
raise error.InputError(msg)
else:
raise error.InputError(
- msg, hint=_(b"add --verbose for details")
+ msg,
+ hint=_(
+ b"add --verbose for details or see "
+ b"'hg help evolution.instability'"
+ ),
)
To: martinvonz, #hg-reviewers
Cc: mercurial-patches, mercurial-devel
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mercurial-scm.org/pipermail/mercurial-patches/attachments/20210517/2617e740/attachment.html>
More information about the Mercurial-patches
mailing list