Mercurial > hg

diff mercurial/rewriteutil.py @ 47859:155a2ec8a9dc

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 Sun, 22 Aug 2021 16:32:06 -0400
parents 48da5c325750
children 6000f5b25c9b d4752aeb20f1
line wrap: on
line diff
--- a/mercurial/rewriteutil.py	Tue Jul 20 17:20:19 2021 +0200
+++ b/mercurial/rewriteutil.py	Sun Aug 22 16:32:06 2021 -0400
@@ -207,7 +207,12 @@
     hashes = re.findall(NODE_RE, commitmsg)
     unfi = repo.unfiltered()
     for h in hashes:
-        fullnode = scmutil.resolvehexnodeidprefix(unfi, h)
+        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.
+            continue
         if fullnode is None:
             continue
         ctx = unfi[fullnode]