Mercurial > hg-stable

diff mercurial/rewriteutil.py @ 49139:ea98850a136e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Matt Harbison <matt_harbison@yahoo.com>
date Tue, 19 Apr 2022 10:53:58 -0400
parents bde2e4ef968a 532b649c1deb
children cbcbf63b6dbf
line wrap: on
line diff
--- a/mercurial/rewriteutil.py	Fri Apr 15 11:20:49 2022 -0400
+++ b/mercurial/rewriteutil.py	Tue Apr 19 10:53:58 2022 -0400
@@ -214,9 +214,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