This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4872

identify: show remote bookmarks in `hg id url -Tjson -B`
ClosedPublic

Authored by valentin.gatienbaron on Oct 3 2018, 6:19 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGfcad7fdc6474: identify: show remote bookmarks in `hg id url -Tjson -B`
Summary

I didn't display bookmarks when default and not ui.quiet: it seems
strange for templates to depend on --id or -q, and it would take more
code for hg id url -T {node} to not request remote bookmarks.

An alternative I thought of was providing lazy data to the formatter,
fm.data(bookmarks=lambda: fm.formatlist(getbms(), name='bookmark')).
The plainformatter would naturally not compute it, the
templateformatter would compute only what it needs, and the other ones
would compute everything, but that's not supported (or I don't see
how), so I abandoned this idea.

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

Closed by commit rHGfcad7fdc6474: identify: show remote bookmarks in `hg id url -Tjson -B` (authored by valentin.gatienbaron). · Explain WhyOct 4 2018, 8:31 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (2 lines)

Diff 11672

mercurial/commands.py

output.extend(getbms()) output.extend(getbms())
elif default and not ui.quiet: elif default and not ui.quiet:
# multiple bookmarks for a single parent separated by '/' # multiple bookmarks for a single parent separated by '/'
bm = '/'.join(getbms()) bm = '/'.join(getbms())
if bm: if bm:
output.append(bm) output.append(bm)
else: else:
fm.data(node=hex(remoterev)) fm.data(node=hex(remoterev))
if 'bookmarks' in fm.datahint(): if bookmarks or 'bookmarks' in fm.datahint():
fm.data(bookmarks=fm.formatlist(getbms(), name='bookmark')) fm.data(bookmarks=fm.formatlist(getbms(), name='bookmark'))
else: else:
if rev: if rev:
repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn') repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
ctx = scmutil.revsingle(repo, rev, None) ctx = scmutil.revsingle(repo, rev, None)
if ctx.rev() is None: if ctx.rev() is None:
ctx = repo[None] ctx = repo[None]