diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -3023,6 +3023,7 @@ output = [hexrev] fm.data(id=hexrev) + @util.cachefunc def getbms(): bms = [] @@ -3033,17 +3034,17 @@ return sorted(bms) - bms = getbms() if bookmarks: - output.extend(bms) + output.extend(getbms()) elif default and not ui.quiet: # multiple bookmarks for a single parent separated by '/' - bm = '/'.join(bms) + bm = '/'.join(getbms()) if bm: output.append(bm) fm.data(node=hex(remoterev)) - fm.data(bookmarks=fm.formatlist(bms, name='bookmark')) + if 'bookmarks' in fm.datahint(): + fm.data(bookmarks=fm.formatlist(getbms(), name='bookmark')) else: if rev: repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')