Mercurial > hg
comparison mercurial/rewriteutil.py @ 47859:155a2ec8a9dc
merge with stable
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Sun, 22 Aug 2021 16:32:06 -0400 |
parents | 48da5c325750 |
children | 6000f5b25c9b d4752aeb20f1 |
comparison
equal
deleted
inserted
replaced
47802:de2e04fe4897 | 47859:155a2ec8a9dc |
---|---|
205 pending = {} | 205 pending = {} |
206 cache = {} | 206 cache = {} |
207 hashes = re.findall(NODE_RE, commitmsg) | 207 hashes = re.findall(NODE_RE, commitmsg) |
208 unfi = repo.unfiltered() | 208 unfi = repo.unfiltered() |
209 for h in hashes: | 209 for h in hashes: |
210 fullnode = scmutil.resolvehexnodeidprefix(unfi, h) | 210 try: |
211 fullnode = scmutil.resolvehexnodeidprefix(unfi, h) | |
212 except error.WdirUnsupported: | |
213 # Someone has an fffff... in a commit message we're | |
214 # rewriting. Don't try rewriting that. | |
215 continue | |
211 if fullnode is None: | 216 if fullnode is None: |
212 continue | 217 continue |
213 ctx = unfi[fullnode] | 218 ctx = unfi[fullnode] |
214 if not ctx.obsolete(): | 219 if not ctx.obsolete(): |
215 successors = pending.get(fullnode) | 220 successors = pending.get(fullnode) |