mercurial/commands.py
changeset 22694 21d5416b8a8a
parent 22677 cbb4414a5603
child 22701 cb28d2b3db0b
equal deleted inserted replaced
22693:68439b154063 22694:21d5416b8a8a
  4958             except error.CapabilityError:
  4958             except error.CapabilityError:
  4959                 err = _("other repository doesn't support revision lookup, "
  4959                 err = _("other repository doesn't support revision lookup, "
  4960                         "so a rev cannot be specified.")
  4960                         "so a rev cannot be specified.")
  4961                 raise util.Abort(err)
  4961                 raise util.Abort(err)
  4962 
  4962 
  4963         modheads = repo.pull(other, heads=revs, force=opts.get('force'),
  4963         modheads = exchange.pull(repo, other, heads=revs,
  4964                              bookmarks=opts.get('bookmark', ()))
  4964                                  force=opts.get('force'),
       
  4965                                  bookmarks=opts.get('bookmark', ())).cgresult
  4965         if checkout:
  4966         if checkout:
  4966             checkout = str(repo.changelog.rev(other.lookup(checkout)))
  4967             checkout = str(repo.changelog.rev(other.lookup(checkout)))
  4967         repo._subtoppath = source
  4968         repo._subtoppath = source
  4968         try:
  4969         try:
  4969             ret = postincoming(ui, repo, modheads, opts.get('update'), checkout)
  4970             ret = postincoming(ui, repo, modheads, opts.get('update'), checkout)