# HG changeset patch
# User Boris Feld <boris.feld@octobus.net>
# Date 2018-09-26 21:51:11
# Node ID a8318c9cb2ade10ac55eee7f462ec12f244bc7f7
# Parent  a8ccd9523d4087614b89af1852f0a9a30242f3a9

rebase: use tuple as `replacement` keys

Now that `cleanupnodes` support tuples as key, we update the rebase code to use
them. No changes in the replacement tracked are introduced yet.

diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -1777,15 +1777,16 @@ def clearrebased(ui, repo, destmap, stat
                 else:
                     succs = (newnode,)
                 if succs is not None:
-                    replacements[oldnode] = succs
+                    replacements[(oldnode,)] = succs
     scmutil.cleanupnodes(repo, replacements, 'rebase', moves, backup=backup)
     if fm:
         hf = fm.hexfunc
         fl = fm.formatlist
         fd = fm.formatdict
         changes = {}
-        for oldn, newn in replacements.iteritems():
-            changes[hf(oldn)] = fl([hf(n) for n in newn], name='node')
+        for oldns, newn in replacements.iteritems():
+            for oldn in oldns:
+                changes[hf(oldn)] = fl([hf(n) for n in newn], name='node')
         nodechanges = fd(changes, key="oldnode", value="newnodes")
         fm.data(nodechanges=nodechanges)