Mercurial > hg
diff mercurial/commands.py @ 33051:15a79ac823e8
identify: add template support
This is based on a patch proposed last year by Mathias De Maré[1], with a few
changes.
- Tags and bookmarks are now formatted lists, for more flexible queries.
- The templater is populated whether or not [-nibtB] is specified. (Plain
output is unchanged.) This seems more consistent with other templated
commands.
- The 'id' property is a string, instead of a list.
- The parents of 'wdir()' have their own list of attributes.
I left 'id' as a string because it seems very useful for generating version
info. It's also a bit strange because the value and meaning changes depending
on whether or not --debug is passed (short vs full hash), whether the revision
is a merge or not (one hash or two, separated by a '+'), the working directory
or not (node vs p1node), and local or not (remote defaults to tip, and never has
'+'). The equivalent string built with {rev} seems much less useful, and I
couldn't think of a reasonable name, so I left it out.
The discussion seemed to be pointing towards having a list of nodes, with more
than one entry for a merge. It seems simpler to give the nodes a name, and use
{node} for the actual commit probed, especially now that there is a virtual node
for 'wdir()'.
Yuya mentioned using fm.nested() in that thread, so I did for the parent nodes.
I'm not sure if the plan is to fill in all of the context attributes in these
items, or if these nested items should simply be made {p1node} and {p1rev}.
I used ':' as the tag separator for consistency with {tags} in the log
templater. Likewise, bookmarks are separated by a space for consistency with
the corresponding log template.
[1] https://www.mercurial-scm.org/pipermail/mercurial-devel/2016-August/087039.html
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Sat, 24 Jun 2017 23:09:21 -0400 |
parents | 18c2489ac96d |
children | a49ab7f5e7e7 |
line wrap: on
line diff
--- a/mercurial/commands.py Sat Jun 24 15:11:05 2017 -0700 +++ b/mercurial/commands.py Sat Jun 24 23:09:21 2017 -0400 @@ -2667,7 +2667,7 @@ ('b', 'branch', None, _('show branch')), ('t', 'tags', None, _('show tags')), ('B', 'bookmarks', None, _('show bookmarks')), - ] + remoteopts, + ] + remoteopts + formatteropts, _('[-nibtB] [-r REV] [SOURCE]'), optionalrepo=True) def identify(ui, repo, source=None, rev=None, @@ -2726,6 +2726,9 @@ repo = peer.local() revs, checkout = hg.addbranchrevs(repo, peer, branches, None) + fm = ui.formatter('identify', opts) + fm.startitem() + if not repo: if num or branch or tags: raise error.Abort( @@ -2736,8 +2739,10 @@ rev = "tip" remoterev = peer.lookup(rev) + hexrev = hexfunc(remoterev) if default or id: - output = [hexfunc(remoterev)] + output = [hexrev] + fm.data(id=hexrev) def getbms(): bms = [] @@ -2749,13 +2754,17 @@ return sorted(bms) + bms = getbms() if bookmarks: - output.extend(getbms()) + output.extend(bms) elif default and not ui.quiet: # multiple bookmarks for a single parent separated by '/' - bm = '/'.join(getbms()) + bm = '/'.join(bms) if bm: output.append(bm) + + fm.data(node=hex(remoterev)) + fm.data(bookmarks=fm.formatlist(bms, name='bookmark')) else: ctx = scmutil.revsingle(repo, rev, None) @@ -2767,19 +2776,32 @@ taglist.extend(p.tags()) changed = "" - if default or id or num: - if (any(repo.status()) - or any(ctx.sub(s).dirty() for s in ctx.substate)): - changed = '+' + if (any(repo.status()) + or any(ctx.sub(s).dirty() for s in ctx.substate)): + changed = '+' + fm.data(changed=changed) + + hexoutput = [hexfunc(p.node()) for p in parents] if default or id: - output = ["%s%s" % - ('+'.join([hexfunc(p.node()) for p in parents]), changed)] + output = ["%s%s" % ('+'.join(hexoutput), changed)] + fm.data(id="%s%s" % ('+'.join(hexoutput), changed)) + if num: - output.append("%s%s" % - ('+'.join(["%d" % p.rev() for p in parents]), changed)) + numoutput = ["%d" % p.rev() for p in parents] + output.append("%s%s" % ('+'.join(numoutput), changed)) + + for i, p in enumerate(parents): + fn = fm.nested('p%d' % (i + 1)) + fn.startitem() + fn.data(rev=p.rev()) + fn.data(node=p.hex()) + fn.end() else: + hexoutput = hexfunc(ctx.node()) if default or id: - output = [hexfunc(ctx.node())] + output = [hexoutput] + fm.data(id=hexoutput) + if num: output.append(pycompat.bytestr(ctx.rev())) taglist = ctx.tags() @@ -2808,7 +2830,13 @@ if bookmarks: output.extend(ctx.bookmarks()) - ui.write("%s\n" % ' '.join(output)) + fm.data(node=ctx.hex()) + fm.data(branch=ctx.branch()) + fm.data(tags=fm.formatlist(taglist, name='tag', sep=':')) + fm.data(bookmarks=fm.formatlist(ctx.bookmarks(), name='bookmark')) + + fm.plain("%s\n" % ' '.join(output)) + fm.end() @command('import|patch', [('p', 'strip', 1,