This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1293

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

Authored by pulkit on Nov 2 2017, 4:23 PM.

Details

Reviewers
yuja
Group Reviewers
hg-reviewers
Commits
rHGf56a30b844aa: rebase: use fm.formatlist() and fm.formatdict() to support user template
Summary

Thanks to Yuya for suggesting this in D1173.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

pulkit created this revision.Nov 2 2017, 4:23 PM
yuja requested changes to this revision.Nov 4 2017, 3:50 AM
yuja added a subscriber: yuja.

Can you add a test that should be fixed by this patch?
Perhaps that will show we'll probably want to set the name of dict item pair
other than the default 'key'/'value'.

hgext/rebase.py
1568

The name argument is for each item, not for the list. Perhaps,
it should be name='node' (or name ='succ').

This revision now requires changes to proceed.Nov 4 2017, 3:50 AM
pulkit added a comment.Nov 8 2017, 12:03 PM
In D1293#21761, @yuja wrote:

Can you add a test that should be fixed by this patch?
Perhaps that will show we'll probably want to set the name of dict item pair
other than the default 'key'/'value'.

Sorry but I am unable to understand the test part. Can you point me to an example?

yuja added a comment.Nov 9 2017, 7:12 AM

Something like this:

-T '{nodechanges % ": {value % ...}"}'

pulkit updated this revision to Diff 3670.Nov 20 2017, 2:04 PM
pulkit updated this revision to Diff 3705.Nov 20 2017, 8:04 PM
pulkit added a comment.Nov 20 2017, 8:41 PM
In D1293#22323, @yuja wrote:

Something like this:
-T '{nodechanges % ": {value % ...}"}'

I have added a test. I am not sure whether that was what you wanted.

(Fun fact: I was trying various permutations of {nodechanges % ":{value % ...}"} and gave up last night. When I quoted your comment to say I am unable to come up with a case, I saw you had {key} in your comment too which was invisible. )

yuja added a comment.Nov 21 2017, 7:38 AM

I am not sure whether that was what you wanted.

It's getting closer, thanks. What I meant is {key} and {value} wouldn't be good
keyword names because the they are actually an old node and a list of new nodes
respectively.

I think a template should be expressed something like this:

`{oldnode}: {newnodes % '{node} '}`
pulkit updated this revision to Diff 3725.Nov 21 2017, 11:54 AM
yuja accepted this revision.Nov 22 2017, 8:18 AM
This revision is now accepted and ready to land.Nov 22 2017, 8:18 AM
yuja added a comment.Nov 22 2017, 8:18 AM

Queued the series, many thanks.

Closed by commit rHGf56a30b844aa: rebase: use fm.formatlist() and fm.formatdict() to support user template (authored by pulkit). · Explain WhyNov 22 2017, 8:38 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/rebase.py (8 lines)
Mtests/test-rebase-templates.t (3 lines)

Diff 3705

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,
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: if fm:
nodechanges = {hex(oldn): [hex(n) for n in newn] hf = fm.hexfunc
for oldn, newn in replacements.iteritems()} fl = fm.formatlist
fd = fm.formatdict
nodechanges = fd({hf(oldn): fl([hf(n) for n in newn], 'succ')
yujaUnsubmitted
Not Done

The name argument is for each item, not for the list. Perhaps,
it should be name='node' (or name ='succ').

yuja: The name argument is for each item, not for the list. Perhaps, it should be name='node' (or…
for oldn, newn in replacements.iteritems()})
fm.data(nodechanges=nodechanges) fm.data(nodechanges=nodechanges)
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(r'rebase'): if opts.get(r'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')

tests/test-rebase-templates.t

@ 5:df21b32134ba Added d @ 5:df21b32134ba Added d
| |
o 4:849767420fd5 Added c o 4:849767420fd5 Added c
| |
o 0:18d04c59bb5d Added a o 0:18d04c59bb5d Added a
$ hg rebase -s 6 -d 4 -q -T "{nodechanges % '{key}:{value}'}" $ hg rebase -s 6 -d 4 -q -T "{nodechanges % '{key}:{value}'}"
d9d6773efc831c274eace04bc13e8e6412517139:f48cd65c6dc3d2acb55da54402a5b029546e546f (no-eol) (false !) d9d6773efc831c274eace04bc13e8e6412517139:f48cd65c6dc3d2acb55da54402a5b029546e546f (no-eol)
d9d6773efc831c274eace04bc13e8e6412517139 (no-eol) (true !)