Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: while rewriting desc hashes, ignore ambiguous prefix "hashes" stable
authorKyle Lippincott <spectral@google.com>
Wed, 13 Apr 2022 12:14:17 -0700
branchstable
changeset 49060 532b649c1deb
parent 49059 80579e597439
child 49066 65eda809b943
rebase: while rewriting desc hashes, ignore ambiguous prefix "hashes" If a repo is sufficiently large, a six digit number "hash prefix" can somewhat easily reference an ambiguous hash prefix. Differential Revision: https://phab.mercurial-scm.org/D12552
mercurial/rewriteutil.py file | annotate | diff | comparison | revisions
tests/test-rebase-inmemory.t file | annotate | diff | comparison | revisions 
--- a/mercurial/rewriteutil.py	Wed Apr 13 13:15:33 2022 -0700
+++ b/mercurial/rewriteutil.py	Wed Apr 13 12:14:17 2022 -0700
@@ -215,9 +215,9 @@
     for h in hashes:
         try:
             fullnode = scmutil.resolvehexnodeidprefix(unfi, h)
-        except error.WdirUnsupported:
-            # Someone has an fffff... in a commit message we're
-            # rewriting. Don't try rewriting that.
+        except (error.WdirUnsupported, error.AmbiguousPrefixLookupError):
+            # Someone has an fffff... or some other prefix that's ambiguous in a
+            # commit message we're rewriting. Don't try rewriting that.
             continue
         if fullnode is None:
             continue
--- a/tests/test-rebase-inmemory.t	Wed Apr 13 13:15:33 2022 -0700
+++ b/tests/test-rebase-inmemory.t	Wed Apr 13 12:14:17 2022 -0700
@@ -1027,8 +1027,7 @@
   $ hg ci -qAm 'The previous two (parentless) commits had a hash prefix of b04363. Check that rewrite_hash_refs will not fail because of that.'
   $ hg rebase -r . -d 5
   rebasing 8:5c4cdabf5769 tip "The previous two (parentless) commits had a hash prefix of b04363. Check that rewrite_hash_refs will not fail because of that."
-  abort: 00changelog@b04363: ambiguous identifier (known-bad-output !)
-  [50]
+  saved backup bundle to $TESTTMP/keep_merge/.hg/strip-backup/5c4cdabf5769-335e1828-rebase.hg
 
   $ cd ..
mercurial