# HG changeset patch # User Paul Gossman # Date 2019-09-25 14:59:29 # Node ID 43c84b81644505e3bd01ce639af582c682a3b746 # Parent 576fd1c8b20bae1645440a8c26af39418d7a65bc rebase: track new nodes when --keep is set When --keep is passed with rebase, the new nodes created are not accessible from templates. This change enables accessing the newly-created nodes from nodechanges, just as if --keep was not set. Differential Revision: https://phab.mercurial-scm.org/D6880 diff --git a/hgext/rebase.py b/hgext/rebase.py --- a/hgext/rebase.py +++ b/hgext/rebase.py @@ -1783,20 +1783,18 @@ def clearrebased(ui, repo, destmap, stat oldnode = tonode(rev) newnode = collapsedas or tonode(newrev) moves[oldnode] = newnode - if not keepf: - succs = None - if rev in skipped: - if stripcleanup or not repo[rev].obsolete(): - succs = () - elif collapsedas: - collapsednodes.append(oldnode) - else: - succs = (newnode,) - if succs is not None: - replacements[(oldnode,)] = succs + succs = None + if rev in skipped: + if stripcleanup or not repo[rev].obsolete(): + succs = () + elif collapsedas: + collapsednodes.append(oldnode) + else: + succs = (newnode,) + if succs is not None: + replacements[(oldnode,)] = succs if collapsednodes: replacements[tuple(collapsednodes)] = (collapsedas,) - scmutil.cleanupnodes(repo, replacements, 'rebase', moves, backup=backup) if fm: hf = fm.hexfunc fl = fm.formatlist @@ -1807,6 +1805,9 @@ def clearrebased(ui, repo, destmap, stat changes[hf(oldn)] = fl([hf(n) for n in newn], name='node') nodechanges = fd(changes, key="oldnode", value="newnodes") fm.data(nodechanges=nodechanges) + if keepf: + replacements = {} + scmutil.cleanupnodes(repo, replacements, 'rebase', moves, backup=backup) def pullrebase(orig, ui, repo, *args, **opts): 'Call rebase after pull if the latter has been invoked with --rebase' 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 @@ -55,3 +55,30 @@ Getting the JSON output for nodechanges $ hg rebase -s 6 -d 4 -q -T "{nodechanges % '{oldnode}:{newnodes % ' {node} '}'}" d9d6773efc831c274eace04bc13e8e6412517139: f48cd65c6dc3d2acb55da54402a5b029546e546f (no-eol) + + $ hg log -G -T "{rev}:{node|short} {desc}" + o 7:f48cd65c6dc3 Added b + | + | @ 5:df21b32134ba Added d + |/ + o 4:849767420fd5 Added c + | + o 0:18d04c59bb5d Added a + + + + $ hg rebase -s 7 -d 5 -q --keep -T "{nodechanges % '{oldnode}:{newnodes % ' {node} '}'}" + f48cd65c6dc3d2acb55da54402a5b029546e546f: 6f7dda91e55e728fb798f3e44dbecf0ebaa83267 (no-eol) + + $ hg log -G -T "{rev}:{node|short} {desc}" + o 8:6f7dda91e55e Added b + | + | o 7:f48cd65c6dc3 Added b + | | + @ | 5:df21b32134ba Added d + |/ + o 4:849767420fd5 Added c + | + o 0:18d04c59bb5d Added a + +