This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1348

histedit: add support to output nodechanges using formatter
ClosedPublic

Authored by pulkit on Nov 8 2017, 3:08 PM.

Details

Reviewers
durin42
dlax
yuja
Group Reviewers
hg-reviewers
Commits
rHGa9cc233de513: histedit: add support to output nodechanges using formatter
Summary

The JSON output of nodechanges will help in automation and to improve editor
integrations such as for Nuclide.

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.Nov 8 2017, 3:08 PM
dlax requested changes to this revision.Nov 10 2017, 2:43 PM
dlax added a subscriber: dlax.
dlax added inline comments.
hgext/histedit.py
921

formatteropts should be enought (you don't need --style I guess)

This revision now requires changes to proceed.Nov 10 2017, 2:43 PM
pulkit updated this revision to Diff 3420.Nov 11 2017, 8:48 AM
pulkit marked an inline comment as done.Nov 11 2017, 8:50 AM
dlax accepted this revision.Nov 11 2017, 12:56 PM
yuja requested changes to this revision.Nov 13 2017, 9:05 AM
yuja added a subscriber: yuja.
yuja added inline comments.
hgext/histedit.py
1208

Can you fix the formatter issue in rebase.py first so we won't
have to apply the same change again on histedit.py?

Probably we wouldn't want to call hf(oldn) and fl([hf(n)...]) as {key} and {value} in template respectively. I think something
like {oldnode} and {newnodes} would be better, but I don't
know what are the correct terms here.

This revision now requires changes to proceed.Nov 13 2017, 9:05 AM
pulkit updated this revision to Diff 3783.Nov 22 2017, 6:28 PM
yuja accepted this revision.Nov 24 2017, 10:01 PM

Queued, thanks.

This revision is now accepted and ready to land.Nov 24 2017, 10:01 PM
Closed by commit rHGa9cc233de513: histedit: add support to output nodechanges using formatter (authored by pulkit). · Explain WhyNov 24 2017, 11:30 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/histedit.py (17 lines)
AMtests/test-histedit-templates.t (54 lines)

Diff 3854

hgext/histedit.py

('c', 'continue', False, _('continue an edit already in progress')), ('c', 'continue', False, _('continue an edit already in progress')),
('', 'edit-plan', False, _('edit remaining actions list')), ('', 'edit-plan', False, _('edit remaining actions list')),
('k', 'keep', False, ('k', 'keep', False,
_("don't strip old nodes after edit is complete")), _("don't strip old nodes after edit is complete")),
('', 'abort', False, _('abort an edit in progress')), ('', 'abort', False, _('abort an edit in progress')),
('o', 'outgoing', False, _('changesets not found in destination')), ('o', 'outgoing', False, _('changesets not found in destination')),
('f', 'force', False, ('f', 'force', False,
_('force outgoing even for unrelated repositories')), _('force outgoing even for unrelated repositories')),
('r', 'rev', [], _('first revision to be edited'), _('REV'))], ('r', 'rev', [], _('first revision to be edited'), _('REV'))] +
cmdutil.formatteropts,
dlaxUnsubmitted
Done

formatteropts should be enought (you don't need --style I guess)

dlax: `formatteropts` should be enought (you don't need `--style` I guess)
_("[OPTIONS] ([ANCESTOR] | --outgoing [URL])")) _("[OPTIONS] ([ANCESTOR] | --outgoing [URL])"))
def histedit(ui, repo, *freeargs, **opts): def histedit(ui, repo, *freeargs, **opts):
"""interactively edit changeset history """interactively edit changeset history
This command lets you edit a linear series of changesets (up to This command lets you edit a linear series of changesets (up to
and including the working directory, which should be clean). and including the working directory, which should be clean).
You can: You can:
revs.append(defaultrev) revs.append(defaultrev)
if len(revs) != 1: if len(revs) != 1:
raise error.Abort( raise error.Abort(
_('histedit requires exactly one ancestor revision')) _('histedit requires exactly one ancestor revision'))
def _histedit(ui, repo, state, *freeargs, **opts): def _histedit(ui, repo, state, *freeargs, **opts):
opts = pycompat.byteskwargs(opts) opts = pycompat.byteskwargs(opts)
fm = ui.formatter('histedit', opts)
fm.startitem()
goal = _getgoal(opts) goal = _getgoal(opts)
revs = opts.get('rev', []) revs = opts.get('rev', [])
rules = opts.get('commands', '') rules = opts.get('commands', '')
state.keep = opts.get('keep', False) state.keep = opts.get('keep', False)
_validateargs(ui, repo, state, freeargs, opts, goal, rules, revs) _validateargs(ui, repo, state, freeargs, opts, goal, rules, revs)
# rebuild state # rebuild state
if goal == goalcontinue: if goal == goalcontinue:
state.read() state.read()
state = bootstrapcontinue(ui, state, opts) state = bootstrapcontinue(ui, state, opts)
elif goal == goaleditplan: elif goal == goaleditplan:
_edithisteditplan(ui, repo, state, rules) _edithisteditplan(ui, repo, state, rules)
return return
elif goal == goalabort: elif goal == goalabort:
_aborthistedit(ui, repo, state) _aborthistedit(ui, repo, state)
return return
else: else:
# goal == goalnew # goal == goalnew
_newhistedit(ui, repo, state, revs, freeargs, opts) _newhistedit(ui, repo, state, revs, freeargs, opts)
_continuehistedit(ui, repo, state) _continuehistedit(ui, repo, state)
_finishhistedit(ui, repo, state) _finishhistedit(ui, repo, state, fm)
fm.end()
def _continuehistedit(ui, repo, state): def _continuehistedit(ui, repo, state):
"""This function runs after either: """This function runs after either:
- bootstrapcontinue (if the goal is 'continue') - bootstrapcontinue (if the goal is 'continue')
- _newhistedit (if the goal is 'new') - _newhistedit (if the goal is 'new')
""" """
# preprocess rules so that we can hide inner folds from the user # preprocess rules so that we can hide inner folds from the user
# and only show one editor # and only show one editor
parentctx, replacement_ = actobj.run() parentctx, replacement_ = actobj.run()
state.parentctxnode = parentctx.node() state.parentctxnode = parentctx.node()
state.replacements.extend(replacement_) state.replacements.extend(replacement_)
state.actions.pop(0) state.actions.pop(0)
state.write() state.write()
ui.progress(_("editing"), None) ui.progress(_("editing"), None)
def _finishhistedit(ui, repo, state): def _finishhistedit(ui, repo, state, fm):
"""This action runs when histedit is finishing its session""" """This action runs when histedit is finishing its session"""
repo.ui.pushbuffer() repo.ui.pushbuffer()
hg.update(repo, state.parentctxnode, quietempty=True) hg.update(repo, state.parentctxnode, quietempty=True)
repo.ui.popbuffer() repo.ui.popbuffer()
mapping, tmpnodes, created, ntm = processreplacement(state) mapping, tmpnodes, created, ntm = processreplacement(state)
if mapping: if mapping:
for prec, succs in mapping.iteritems(): for prec, succs in mapping.iteritems():
for n in tmpnodes: for n in tmpnodes:
mapping[n] = () mapping[n] = ()
# remove entries about unknown nodes # remove entries about unknown nodes
nodemap = repo.unfiltered().changelog.nodemap nodemap = repo.unfiltered().changelog.nodemap
mapping = {k: v for k, v in mapping.items() mapping = {k: v for k, v in mapping.items()
if k in nodemap and all(n in nodemap for n in v)} if k in nodemap and all(n in nodemap for n in v)}
scmutil.cleanupnodes(repo, mapping, 'histedit') scmutil.cleanupnodes(repo, mapping, 'histedit')
hf = fm.hexfunc
fl = fm.formatlist
fd = fm.formatdict
nodechanges = fd({hf(oldn): fl([hf(n) for n in newn], name='node')
yujaUnsubmitted
Not Done

Can you fix the formatter issue in rebase.py first so we won't
have to apply the same change again on histedit.py?

Probably we wouldn't want to call hf(oldn) and fl([hf(n)...]) as {key} and {value} in template respectively. I think something
like {oldnode} and {newnodes} would be better, but I don't
know what are the correct terms here.

yuja: Can you fix the formatter issue in rebase.py first so we won't have to apply the same change…
for oldn, newn in mapping.iteritems()},
key="oldnode", value="newnodes")
fm.data(nodechanges=nodechanges)
state.clear() state.clear()
if os.path.exists(repo.sjoin('undo')): if os.path.exists(repo.sjoin('undo')):
os.unlink(repo.sjoin('undo')) os.unlink(repo.sjoin('undo'))
if repo.vfs.exists('histedit-last-edit.txt'): if repo.vfs.exists('histedit-last-edit.txt'):
repo.vfs.unlink('histedit-last-edit.txt') repo.vfs.unlink('histedit-last-edit.txt')
def _aborthistedit(ui, repo, state): def _aborthistedit(ui, repo, state):

tests/test-histedit-templates.t

  • This file was added.
Testing templating for histedit command
Setup
$ cat >> $HGRCPATH <<EOF
> [extensions]
> histedit=
> [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 histedit -Tjson --commands - 2>&1 <<EOF
> pick 28ad74487de9 Added c
> pick 62615734edd5 Added d
> pick 18d04c59bb5d Added a
> pick 29becc82797a Added b
> EOF
[
{
"nodechanges": {"18d04c59bb5d2d4090ad9a5b59bd6274adb63add": ["109f8ec895447f81b380ba8d4d8b66539ccdcb94"], "28ad74487de9599d00d81085be739c61fc340652": ["bff9e07c1807942b161dab768aa793b48e9a7f9d"], "29becc82797a4bc11ec8880b58eaecd2ab3e7760": ["f5dcf3b4db23f31f1aacf46c33d1393de303d26f"], "62615734edd52f06b6fb9c2beb429e4fe30d57b8": ["201423b441c84d9e6858daed653e0d22485c1cfa"]}
}
]
$ hg log -G -T "{rev}:{node|short} {desc}"
@ 7:f5dcf3b4db23 Added b
|
o 6:109f8ec89544 Added a
|
o 5:201423b441c8 Added d
|
o 4:bff9e07c1807 Added c
$ hg histedit -T "{nodechanges|json}" --commands - 2>&1 <<EOF
> pick bff9e07c1807 Added c
> pick 201423b441c8 Added d
> pick 109f8ec89544 Added a
> roll f5dcf3b4db23 Added b
> EOF
{"109f8ec895447f81b380ba8d4d8b66539ccdcb94": ["8d01470bfeab64d3de13c49adb79d88790d38396"], "f3ec56a374bdbdf1953cacca505161442c6f3a3e": [], "f5dcf3b4db23f31f1aacf46c33d1393de303d26f": ["8d01470bfeab64d3de13c49adb79d88790d38396"]} (no-eol)