##// END OF EJS Templates
rebase: use tuple as `replacement` keys...
Boris Feld -
r39954:a8318c9c default
parent child Browse files
Show More
@@ -1777,15 +1777,16 b' def clearrebased(ui, repo, destmap, stat'
1777 else:
1777 else:
1778 succs = (newnode,)
1778 succs = (newnode,)
1779 if succs is not None:
1779 if succs is not None:
1780 replacements[oldnode] = succs
1780 replacements[(oldnode,)] = succs
1781 scmutil.cleanupnodes(repo, replacements, 'rebase', moves, backup=backup)
1781 scmutil.cleanupnodes(repo, replacements, 'rebase', moves, backup=backup)
1782 if fm:
1782 if fm:
1783 hf = fm.hexfunc
1783 hf = fm.hexfunc
1784 fl = fm.formatlist
1784 fl = fm.formatlist
1785 fd = fm.formatdict
1785 fd = fm.formatdict
1786 changes = {}
1786 changes = {}
1787 for oldn, newn in replacements.iteritems():
1787 for oldns, newn in replacements.iteritems():
1788 changes[hf(oldn)] = fl([hf(n) for n in newn], name='node')
1788 for oldn in oldns:
1789 changes[hf(oldn)] = fl([hf(n) for n in newn], name='node')
1789 nodechanges = fd(changes, key="oldnode", value="newnodes")
1790 nodechanges = fd(changes, key="oldnode", value="newnodes")
1790 fm.data(nodechanges=nodechanges)
1791 fm.data(nodechanges=nodechanges)
1791
1792
General Comments 0
You need to be logged in to leave comments. Login now