equal
deleted
inserted
replaced
4425 opts.get('rev')) |
4425 opts.get('rev')) |
4426 |
4426 |
4427 pullopargs = {} |
4427 pullopargs = {} |
4428 |
4428 |
4429 nodes = None |
4429 nodes = None |
4430 if opts['bookmark'] or revs: |
4430 if opts.get('bookmark') or revs: |
4431 # The list of bookmark used here is the same used to actually update |
4431 # The list of bookmark used here is the same used to actually update |
4432 # the bookmark names, to avoid the race from issue 4689 and we do |
4432 # the bookmark names, to avoid the race from issue 4689 and we do |
4433 # all lookup and bookmark queries in one go so they see the same |
4433 # all lookup and bookmark queries in one go so they see the same |
4434 # version of the server state (issue 4700). |
4434 # version of the server state (issue 4700). |
4435 nodes = [] |
4435 nodes = [] |
4446 for r in revs: |
4446 for r in revs: |
4447 fnodes.append(e.callcommand('lookup', {'key': r})) |
4447 fnodes.append(e.callcommand('lookup', {'key': r})) |
4448 remotebookmarks = fremotebookmarks.result() |
4448 remotebookmarks = fremotebookmarks.result() |
4449 remotebookmarks = bookmarks.unhexlifybookmarks(remotebookmarks) |
4449 remotebookmarks = bookmarks.unhexlifybookmarks(remotebookmarks) |
4450 pullopargs['remotebookmarks'] = remotebookmarks |
4450 pullopargs['remotebookmarks'] = remotebookmarks |
4451 for b in opts['bookmark']: |
4451 for b in opts.get('bookmark', []): |
4452 b = repo._bookmarks.expandname(b) |
4452 b = repo._bookmarks.expandname(b) |
4453 if b not in remotebookmarks: |
4453 if b not in remotebookmarks: |
4454 raise error.Abort(_('remote bookmark %s not found!') % b) |
4454 raise error.Abort(_('remote bookmark %s not found!') % b) |
4455 nodes.append(remotebookmarks[b]) |
4455 nodes.append(remotebookmarks[b]) |
4456 for i, rev in enumerate(revs): |
4456 for i, rev in enumerate(revs): |