This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1173

rebase: add support to output nodechanges
ClosedPublic

Authored by pulkit on Oct 17 2017, 7:12 PM.

Details

Reviewers
dlax
durin42
Group Reviewers
hg-reviewers
Commits
rHGc858afe9c59b: rebase: add support to output nodechanges
rHGc2f4b3ab0e02: rebase: add support to output nodechanges
Summary

This patch adds support to rebase to show the changes in node once the rebase is
complete. This will be extremely helpful for automation purposes and editors
such as Nuclide.

The output is a dictionary of predecessor hash as key and a list of successors'
hashes. The successors one is a list as there can be many successors for a single
predecessor in case of split and it will good to have a generic output format.

This patch adds tests for the same. A new file is created for the patch as
existing files related to rebase has their own purpose and there will be more
formatter support coming for rebase in next cycle.

Thanks to Jun for suggesting to use fm.data().

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

pulkit created this revision.Oct 17 2017, 7:12 PM
dlax edited the summary of this revision. (Show Details)Oct 18 2017, 3:00 AM
dlax accepted this revision.
dlax added a subscriber: dlax.

Looks good to me, much nicer than the previous version.

durin42 added a subscriber: durin42.Oct 18 2017, 4:08 PM

Much improved, thanks.

durin42 accepted this revision.Oct 18 2017, 4:08 PM
This revision is now accepted and ready to land.Oct 18 2017, 4:08 PM
Closed by commit rHGc2f4b3ab0e02: rebase: add support to output nodechanges (authored by pulkit). · Explain WhyOct 18 2017, 4:27 PM
This revision was automatically updated to reflect the committed changes.
yuja added a subscriber: yuja.Oct 19 2017, 11:02 AM
yuja added inline comments.
hgext/rebase.py
597

I'm surprised that the rebase command does have -T and --style
options from the very start. No idea how they would work, though.

1549

fm.hexfunc() could be used.

1551

Needs to wrap dict/list by fm.formatdict()/fm.formatlist()
to support -T "{user template}".

Can you send a follow up after 4.4 release?

pulkit added inline comments.Oct 19 2017, 2:46 PM
hgext/rebase.py
597

I am also surprised by this.

1551

Yeah sure. I will.

Revision Contents
Changeset List

PathPackages
Mhgext/rebase.py (12 lines)
AMtests/test-rebase-templates.t (44 lines)

Diff 2995

hgext/rebase.py

from __future__ import absolute_import from __future__ import absolute_import
import errno import errno
import os import os
from mercurial.i18n import _ from mercurial.i18n import _
from mercurial.node import ( from mercurial.node import (
hex,
nullid, nullid,
nullrev, nullrev,
short, short,
) )
from mercurial import ( from mercurial import (
bookmarks, bookmarks,
cmdutil, cmdutil,
commands, commands,
ui.debug('next revision set to %s\n' % p1) ui.debug('next revision set to %s\n' % p1)
else: else:
ui.status(_('already rebased %s as %s\n') % ui.status(_('already rebased %s as %s\n') %
(desc, repo[self.state[rev]])) (desc, repo[self.state[rev]]))
return pos return pos
def _finishrebase(self): def _finishrebase(self):
repo, ui, opts = self.repo, self.ui, self.opts repo, ui, opts = self.repo, self.ui, self.opts
fm = ui.formatter('rebase', opts)
fm.startitem()
if self.collapsef and not self.keepopen: if self.collapsef and not self.keepopen:
p1, p2, _base = defineparents(repo, min(self.state), self.destmap, p1, p2, _base = defineparents(repo, min(self.state), self.destmap,
self.state, self.skipped, self.state, self.skipped,
self.obsoletenotrebased) self.obsoletenotrebased)
editopt = opts.get('edit') editopt = opts.get('edit')
editform = 'rebase.collapse' editform = 'rebase.collapse'
if self.collapsemsg: if self.collapsemsg:
commitmsg = self.collapsemsg commitmsg = self.collapsemsg
ui.note(_("update back to initial working directory parent\n")) ui.note(_("update back to initial working directory parent\n"))
hg.updaterepo(repo, newwd, False) hg.updaterepo(repo, newwd, False)
collapsedas = None collapsedas = None
if not self.keepf: if not self.keepf:
if self.collapsef: if self.collapsef:
collapsedas = newnode collapsedas = newnode
clearrebased(ui, repo, self.destmap, self.state, self.skipped, clearrebased(ui, repo, self.destmap, self.state, self.skipped,
collapsedas, self.keepf) collapsedas, self.keepf, fm=fm)
clearstatus(repo) clearstatus(repo)
clearcollapsemsg(repo) clearcollapsemsg(repo)
ui.note(_("rebase completed\n")) ui.note(_("rebase completed\n"))
util.unlinkpath(repo.sjoin('undo'), ignoremissing=True) util.unlinkpath(repo.sjoin('undo'), ignoremissing=True)
if self.skipped: if self.skipped:
skippedlen = len(self.skipped) skippedlen = len(self.skipped)
ui.note(_("%d revisions have been skipped\n") % skippedlen) ui.note(_("%d revisions have been skipped\n") % skippedlen)
fm.end()
if (self.activebookmark and self.activebookmark in repo._bookmarks and if (self.activebookmark and self.activebookmark in repo._bookmarks and
repo['.'].node() == repo._bookmarks[self.activebookmark]): repo['.'].node() == repo._bookmarks[self.activebookmark]):
bookmarks.activate(repo, self.activebookmark) bookmarks.activate(repo, self.activebookmark)
@command('rebase', @command('rebase',
[('s', 'source', '', [('s', 'source', '',
_('rebase the specified changeset and descendants'), _('REV')), _('rebase the specified changeset and descendants'), _('REV')),
_('read collapse commit message from file'), _('FILE')), _('read collapse commit message from file'), _('FILE')),
('k', 'keep', False, _('keep original changesets')), ('k', 'keep', False, _('keep original changesets')),
('', 'keepbranches', False, _('keep original branch names')), ('', 'keepbranches', False, _('keep original branch names')),
('D', 'detach', False, _('(DEPRECATED)')), ('D', 'detach', False, _('(DEPRECATED)')),
('i', 'interactive', False, _('(DEPRECATED)')), ('i', 'interactive', False, _('(DEPRECATED)')),
('t', 'tool', '', _('specify merge tool')), ('t', 'tool', '', _('specify merge tool')),
('c', 'continue', False, _('continue an interrupted rebase')), ('c', 'continue', False, _('continue an interrupted rebase')),
('a', 'abort', False, _('abort an interrupted rebase'))] + ('a', 'abort', False, _('abort an interrupted rebase'))] +
templateopts, templateopts,
yujaUnsubmitted
Not Done

I'm surprised that the rebase command does have -T and --style
options from the very start. No idea how they would work, though.

yuja: I'm surprised that the rebase command does have -T and --style options from the very start. No…
pulkitAuthorUnsubmitted
Not Done

I am also surprised by this.

pulkit: I am also surprised by this.
_('[-s REV | -b REV] [-d REV] [OPTION]')) _('[-s REV | -b REV] [-d REV] [OPTION]'))
def rebase(ui, repo, **opts): def rebase(ui, repo, **opts):
"""move changeset (and descendants) to a different branch """move changeset (and descendants) to a different branch
Rebase uses repeated merging to graft changesets from one part of Rebase uses repeated merging to graft changesets from one part of
history (the source) onto another (the destination). This can be history (the source) onto another (the destination). This can be
useful for linearizing *local* changes relative to a master useful for linearizing *local* changes relative to a master
development tree. development tree.
for rev in sorted(state): for rev in sorted(state):
parents = [p for p in repo.changelog.parentrevs(rev) if p != nullrev] parents = [p for p in repo.changelog.parentrevs(rev) if p != nullrev]
# if all parents of this revision are done, then so is this revision # if all parents of this revision are done, then so is this revision
if parents and all((state.get(p) == p for p in parents)): if parents and all((state.get(p) == p for p in parents)):
state[rev] = rev state[rev] = rev
return originalwd, destmap, state return originalwd, destmap, state
def clearrebased(ui, repo, destmap, state, skipped, collapsedas=None, def clearrebased(ui, repo, destmap, state, skipped, collapsedas=None,
keepf=False): keepf=False, fm=None):
"""dispose of rebased revision at the end of the rebase """dispose of rebased revision at the end of the rebase
If `collapsedas` is not None, the rebase was a collapse whose result if the If `collapsedas` is not None, the rebase was a collapse whose result if the
`collapsedas` node. `collapsedas` node.
If `keepf` is not True, the rebase has --keep set and no nodes should be If `keepf` is not True, the rebase has --keep set and no nodes should be
removed (but bookmarks still need to be moved). removed (but bookmarks still need to be moved).
""" """
tonode = repo.changelog.node tonode = repo.changelog.node
replacements = {} replacements = {}
moves = {} moves = {}
for rev, newrev in sorted(state.items()): for rev, newrev in sorted(state.items()):
if newrev >= 0 and newrev != rev: if newrev >= 0 and newrev != rev:
oldnode = tonode(rev) oldnode = tonode(rev)
newnode = collapsedas or tonode(newrev) newnode = collapsedas or tonode(newrev)
moves[oldnode] = newnode moves[oldnode] = newnode
if not keepf: if not keepf:
if rev in skipped: if rev in skipped:
succs = () succs = ()
else: else:
succs = (newnode,) succs = (newnode,)
replacements[oldnode] = succs replacements[oldnode] = succs
scmutil.cleanupnodes(repo, replacements, 'rebase', moves) scmutil.cleanupnodes(repo, replacements, 'rebase', moves)
if fm:
nodechanges = {hex(oldn): [hex(n) for n in newn]
yujaUnsubmitted
Not Done

fm.hexfunc() could be used.

yuja: fm.hexfunc() could be used.
for oldn, newn in replacements.iteritems()}
fm.data(nodechanges=nodechanges)
yujaUnsubmitted
Not Done

Needs to wrap dict/list by fm.formatdict()/fm.formatlist()
to support -T "{user template}".

Can you send a follow up after 4.4 release?

yuja: Needs to wrap dict/list by fm.formatdict()/fm.formatlist() to support -T "{user template}".
pulkitAuthorUnsubmitted
Not Done

Yeah sure. I will.

pulkit: Yeah sure. I will.
def pullrebase(orig, ui, repo, *args, **opts): def pullrebase(orig, ui, repo, *args, **opts):
'Call rebase after pull if the latter has been invoked with --rebase' 'Call rebase after pull if the latter has been invoked with --rebase'
ret = None ret = None
if opts.get('rebase'): if opts.get('rebase'):
if ui.configbool('commands', 'rebase.requiredest'): if ui.configbool('commands', 'rebase.requiredest'):
msg = _('rebase destination required by configuration') msg = _('rebase destination required by configuration')
hint = _('use hg pull followed by hg rebase -d DEST') hint = _('use hg pull followed by hg rebase -d DEST')

tests/test-rebase-templates.t

  • This file was added.
Testing templating for rebase command
Setup
$ cat >> $HGRCPATH <<EOF
> [extensions]
> rebase=
> [experimental]
> evolution=createmarkers
> EOF
$ hg init repo
$ cd repo
$ for ch in a b c d; do echo foo > $ch; hg commit -Aqm "Added "$ch; done
$ hg log -G -T "{rev}:{node|short} {desc}"
@ 3:62615734edd5 Added d
|
o 2:28ad74487de9 Added c
|
o 1:29becc82797a Added b
|
o 0:18d04c59bb5d Added a
Getting the JSON output for nodechanges
$ hg rebase -s 2 -d 0 -q -Tjson
[
{
"nodechanges": {"28ad74487de9599d00d81085be739c61fc340652": ["849767420fd5519cf0026232411a943ed03cc9fb"], "62615734edd52f06b6fb9c2beb429e4fe30d57b8": ["df21b32134ba85d86bca590cbe9b8b7cbc346c53"]}
}
]
$ hg log -G -T "{rev}:{node|short} {desc}"
@ 5:df21b32134ba Added d
|
o 4:849767420fd5 Added c
|
| o 1:29becc82797a Added b
|/
o 0:18d04c59bb5d Added a
$ hg rebase -s 1 -d 5 -q -T "{nodechanges|json}"
{"29becc82797a4bc11ec8880b58eaecd2ab3e7760": ["d9d6773efc831c274eace04bc13e8e6412517139"]} (no-eol)