equal
deleted
inserted
replaced
5072 newbranch=opts.get('new_branch'), |
5072 newbranch=opts.get('new_branch'), |
5073 bookmarks=opts.get('bookmark', ())) |
5073 bookmarks=opts.get('bookmark', ())) |
5074 |
5074 |
5075 result = not pushop.cgresult |
5075 result = not pushop.cgresult |
5076 |
5076 |
5077 if opts.get('bookmark'): |
5077 if pushop.bkresult is not None: |
5078 bresult = bookmarks.pushtoremote(ui, repo, other, opts['bookmark']) |
5078 if pushop.bkresult == 2: |
5079 if bresult == 2: |
|
5080 result = 2 |
5079 result = 2 |
5081 elif not result and bresult: |
5080 elif not result and pushop.bkresult: |
5082 result = 2 |
5081 result = 2 |
5083 |
5082 |
5084 return result |
5083 return result |
5085 |
5084 |
5086 @command('recover', []) |
5085 @command('recover', []) |