--- a/hgext3rd/evolve/cmdrewrite.py Sun Feb 02 15:51:10 2020 +0700
+++ b/hgext3rd/evolve/cmdrewrite.py Sat Jan 11 19:52:56 2020 +0700
@@ -801,9 +801,15 @@
p2.node()],
commitopts=commitopts)
phases.retractboundary(repo, tr, targetphase, [newid])
- replacements = {ctx.node(): [newid] for ctx in allctx}
- scmutil.cleanupnodes(repo, replacements, operation=b"fold",
- metadata=metadata)
+ if 'repls' in scmutil.cleanupnodes.__code__.co_varnames:
+ replacements = {tuple(ctx.node() for ctx in allctx): [newid]}
+ scmutil.cleanupnodes(repo, replacements, operation=b"fold",
+ metadata=metadata)
+ else:
+ # hg <= 4.7 (b99903534e06)
+ replacements = {ctx.node(): [newid] for ctx in allctx}
+ scmutil.cleanupnodes(repo, replacements, operation=b"fold",
+ metadata=metadata)
tr.close()
finally:
tr.release()