mercurial/commands.py
changeset 39991 a91398dc73ab
parent 39990 c9026e9297e3
child 40012 e66a3ae8211a
equal deleted inserted replaced
39990:c9026e9297e3 39991:a91398dc73ab
  3032                 bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems()
  3032                 bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems()
  3033                        if bmr == hexremoterev]
  3033                        if bmr == hexremoterev]
  3034 
  3034 
  3035             return sorted(bms)
  3035             return sorted(bms)
  3036 
  3036 
  3037         if bookmarks:
  3037         if fm.isplain():
  3038             output.extend(getbms())
  3038             if bookmarks:
  3039         elif default and not ui.quiet:
  3039                 output.extend(getbms())
  3040             # multiple bookmarks for a single parent separated by '/'
  3040             elif default and not ui.quiet:
  3041             bm = '/'.join(getbms())
  3041                 # multiple bookmarks for a single parent separated by '/'
  3042             if bm:
  3042                 bm = '/'.join(getbms())
  3043                 output.append(bm)
  3043                 if bm:
  3044 
  3044                     output.append(bm)
  3045         fm.data(node=hex(remoterev))
  3045         else:
  3046         if 'bookmarks' in fm.datahint():
  3046             fm.data(node=hex(remoterev))
  3047             fm.data(bookmarks=fm.formatlist(getbms(), name='bookmark'))
  3047             if 'bookmarks' in fm.datahint():
       
  3048                 fm.data(bookmarks=fm.formatlist(getbms(), name='bookmark'))
  3048     else:
  3049     else:
  3049         if rev:
  3050         if rev:
  3050             repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
  3051             repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
  3051         ctx = scmutil.revsingle(repo, rev, None)
  3052         ctx = scmutil.revsingle(repo, rev, None)
  3052 
  3053