[Updated] D10832: rewriteutil: add pointer to help text when rewrite would cause divergence

[martinvonz (Martin von Zweigbergk)]

Closed by commit rHG8125bcd28a5c: rewriteutil: add pointer to help text when rewrite would cause divergence (authored by martinvonz).
This revision was automatically updated to reflect the committed changes.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D10832?vs=28431&id=28463

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D10832/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D10832

AFFECTED FILES
  mercurial/rewriteutil.py
  tests/test-amend.t

CHANGE DETAILS

diff --git a/tests/test-amend.t b/tests/test-amend.t
--- a/tests/test-amend.t
+++ b/tests/test-amend.t
@@ -241,6 +241,13 @@
   abort: cannot amend 112478962961, as that creates content-divergence with 16084da537dd
   (add --verbose for details or see 'hg help evolution.instability')
   [10]
+  $ hg amend -m divergent --verbose
+  abort: cannot amend 112478962961, as that creates content-divergence with 16084da537dd
+      changeset 112478962961 already has a successor in changeset 16084da537dd
+      rewriting changeset 112478962961 would create "content-divergence"
+      set experimental.evolution.allowdivergence=True to skip this check
+  (see 'hg help evolution.instability' for details on content-divergence)
+  [10]
   $ hg amend -m divergent --config experimental.evolution.allowdivergence=true
   2 new content-divergent changesets
 #endif
diff --git a/mercurial/rewriteutil.py b/mercurial/rewriteutil.py
--- a/mercurial/rewriteutil.py
+++ b/mercurial/rewriteutil.py
@@ -111,7 +111,12 @@
                     b'    set experimental.evolution.allowdivergence=True to '
                     b'skip this check'
                 ) % (base_ctx, other_ctx, local_ctx)
-                raise error.InputError(msg)
+                raise error.InputError(
+                    msg,
+                    hint=_(
+                        b"see 'hg help evolution.instability' for details on content-divergence"
+                    ),
+                )
             else:
                 raise error.InputError(
                     msg,



To: martinvonz, #hg-reviewers, pulkit
Cc: mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20210607/40190c0e/attachment-0002.html>