Patchwork D1293: rebase: use fm.formatlist() and fm.formatdict() to support user template

login
register
mail settings
Submitter phabricator
Date Nov. 21, 2017, 1:04 a.m.
Message ID <33d61819eecb34aee4726659e6fcbaad@localhost.localdomain>
Download mbox | patch
Permalink /patch/25698/
State Not Applicable
Headers show

Comments

phabricator - Nov. 21, 2017, 1:04 a.m.
pulkit updated this revision to Diff 3705.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D1293?vs=3670&id=3705

REVISION DETAIL
  https://phab.mercurial-scm.org/D1293

AFFECTED FILES
  hgext/rebase.py
  tests/test-rebase-templates.t

CHANGE DETAILS




To: pulkit, #hg-reviewers, yuja
Cc: yuja, mercurial-devel

Patch

diff --git a/tests/test-rebase-templates.t b/tests/test-rebase-templates.t
--- a/tests/test-rebase-templates.t
+++ b/tests/test-rebase-templates.t
@@ -54,5 +54,4 @@ 
   
 
   $ hg rebase -s 6 -d 4 -q -T "{nodechanges % '{key}:{value}'}"
-  d9d6773efc831c274eace04bc13e8e6412517139:f48cd65c6dc3d2acb55da54402a5b029546e546f (no-eol) (false !)
-  d9d6773efc831c274eace04bc13e8e6412517139 (no-eol) (true !)
+  d9d6773efc831c274eace04bc13e8e6412517139:f48cd65c6dc3d2acb55da54402a5b029546e546f (no-eol)
diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -21,7 +21,6 @@ 
 
 from mercurial.i18n import _
 from mercurial.node import (
-    hex,
     nullid,
     nullrev,
     short,
@@ -1563,8 +1562,11 @@ 
                 replacements[oldnode] = succs
     scmutil.cleanupnodes(repo, replacements, 'rebase', moves)
     if fm:
-        nodechanges = {hex(oldn): [hex(n) for n in newn]
-                       for oldn, newn in replacements.iteritems()}
+        hf = fm.hexfunc
+        fl = fm.formatlist
+        fd = fm.formatdict
+        nodechanges = fd({hf(oldn): fl([hf(n) for n in newn], 'succ')
+                          for oldn, newn in replacements.iteritems()})
         fm.data(nodechanges=nodechanges)
 
 def pullrebase(orig, ui, repo, *args, **opts):