equal
deleted
inserted
replaced
19 import errno |
19 import errno |
20 import os |
20 import os |
21 |
21 |
22 from mercurial.i18n import _ |
22 from mercurial.i18n import _ |
23 from mercurial.node import ( |
23 from mercurial.node import ( |
24 hex, |
|
25 nullid, |
24 nullid, |
26 nullrev, |
25 nullrev, |
27 short, |
26 short, |
28 ) |
27 ) |
29 from mercurial import ( |
28 from mercurial import ( |
1561 else: |
1560 else: |
1562 succs = (newnode,) |
1561 succs = (newnode,) |
1563 replacements[oldnode] = succs |
1562 replacements[oldnode] = succs |
1564 scmutil.cleanupnodes(repo, replacements, 'rebase', moves) |
1563 scmutil.cleanupnodes(repo, replacements, 'rebase', moves) |
1565 if fm: |
1564 if fm: |
1566 nodechanges = {hex(oldn): [hex(n) for n in newn] |
1565 hf = fm.hexfunc |
1567 for oldn, newn in replacements.iteritems()} |
1566 fl = fm.formatlist |
|
1567 fd = fm.formatdict |
|
1568 nodechanges = fd({hf(oldn): fl([hf(n) for n in newn], name='node') |
|
1569 for oldn, newn in replacements.iteritems()}, |
|
1570 key="oldnode", value="newnodes") |
1568 fm.data(nodechanges=nodechanges) |
1571 fm.data(nodechanges=nodechanges) |
1569 |
1572 |
1570 def pullrebase(orig, ui, repo, *args, **opts): |
1573 def pullrebase(orig, ui, repo, *args, **opts): |
1571 'Call rebase after pull if the latter has been invoked with --rebase' |
1574 'Call rebase after pull if the latter has been invoked with --rebase' |
1572 ret = None |
1575 ret = None |