mercurial/commands.py
changeset 29376 113d0b23321a
parent 29266 b3a677c82a35
child 29384 c75c8ea2f573
equal deleted inserted replaced
29375:fcaf20175b1b 29376:113d0b23321a
  5803             # not ending up with the name of the bookmark because of a race
  5803             # not ending up with the name of the bookmark because of a race
  5804             # condition on the server. (See issue 4689 for details)
  5804             # condition on the server. (See issue 4689 for details)
  5805             remotebookmarks = other.listkeys('bookmarks')
  5805             remotebookmarks = other.listkeys('bookmarks')
  5806             pullopargs['remotebookmarks'] = remotebookmarks
  5806             pullopargs['remotebookmarks'] = remotebookmarks
  5807             for b in opts['bookmark']:
  5807             for b in opts['bookmark']:
       
  5808                 b = repo._bookmarks.expandname(b)
  5808                 if b not in remotebookmarks:
  5809                 if b not in remotebookmarks:
  5809                     raise error.Abort(_('remote bookmark %s not found!') % b)
  5810                     raise error.Abort(_('remote bookmark %s not found!') % b)
  5810                 revs.append(remotebookmarks[b])
  5811                 revs.append(remotebookmarks[b])
  5811 
  5812 
  5812         if revs:
  5813         if revs: