D4839: identify: when using -T, avoid unnecessary remote bookmarks query
valentin.gatienbaron (Valentin Gatien-Baron)
phabricator at mercurial-scm.org
Wed Oct 3 08:29:46 EDT 2018
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGa91398dc73ab: identify: when using -T, avoid unnecessary remote bookmarks query (authored by valentin.gatienbaron, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D4839?vs=11565&id=11596
REVISION DETAIL
https://phab.mercurial-scm.org/D4839
AFFECTED FILES
mercurial/commands.py
CHANGE DETAILS
diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -3034,17 +3034,18 @@
return sorted(bms)
- if bookmarks:
- output.extend(getbms())
- elif default and not ui.quiet:
- # multiple bookmarks for a single parent separated by '/'
- bm = '/'.join(getbms())
- if bm:
- output.append(bm)
-
- fm.data(node=hex(remoterev))
- if 'bookmarks' in fm.datahint():
- fm.data(bookmarks=fm.formatlist(getbms(), name='bookmark'))
+ if fm.isplain():
+ if bookmarks:
+ output.extend(getbms())
+ elif default and not ui.quiet:
+ # multiple bookmarks for a single parent separated by '/'
+ bm = '/'.join(getbms())
+ if bm:
+ output.append(bm)
+ else:
+ fm.data(node=hex(remoterev))
+ if 'bookmarks' in fm.datahint():
+ fm.data(bookmarks=fm.formatlist(getbms(), name='bookmark'))
else:
if rev:
repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
To: valentin.gatienbaron, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list