mercurial/commands.py
changeset 22617 1625770c2ce1
parent 22594 1257cc6c1a2f
child 22621 76a43e0db516
equal deleted inserted replaced
22616:cda85cfc8252 22617:1625770c2ce1
  5066             result = c.sub(s).push(opts)
  5066             result = c.sub(s).push(opts)
  5067             if result == 0:
  5067             if result == 0:
  5068                 return not result
  5068                 return not result
  5069     finally:
  5069     finally:
  5070         del repo._subtoppath
  5070         del repo._subtoppath
  5071     result = repo.push(other, opts.get('force'), revs=revs,
  5071     pushop = exchange.push(repo, other, opts.get('force'), revs=revs,
  5072                        newbranch=opts.get('new_branch'))
  5072                            newbranch=opts.get('new_branch'))
  5073 
  5073 
  5074     result = not result
  5074     result = not pushop.cgresult
  5075 
  5075 
  5076     if opts.get('bookmark'):
  5076     if opts.get('bookmark'):
  5077         bresult = bookmarks.pushtoremote(ui, repo, other, opts['bookmark'])
  5077         bresult = bookmarks.pushtoremote(ui, repo, other, opts['bookmark'])
  5078         if bresult == 2:
  5078         if bresult == 2:
  5079             return 2
  5079             return 2