This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3938

rebase: make sure we don't loose the return code in --confirm option
ClosedPublic

Authored by khanchi97 on Jul 12 2018, 1:14 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGa50482254b0a: rebase: make sure we don't loose the return code in --confirm option
Summary

return _dorebase() to make sure it returns 'return code'.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

PathPackages
Mhgext/rebase.py (2 lines)

Diff 9586

hgext/rebase.py

ui.status(_('hit a merge conflict\n')) ui.status(_('hit a merge conflict\n'))
if confirm: if confirm:
# abort as in-memory merge doesn't support conflict # abort as in-memory merge doesn't support conflict
rbsrt._prepareabortorcontinue(isabort=True, backup=False, rbsrt._prepareabortorcontinue(isabort=True, backup=False,
suppwarns=True) suppwarns=True)
needsabort = False needsabort = False
if not ui.promptchoice(_(b'apply changes (yn)?' if not ui.promptchoice(_(b'apply changes (yn)?'
b'$$ &Yes $$ &No')): b'$$ &Yes $$ &No')):
_dorebase(ui, repo, opts, inmemory=False) return _dorebase(ui, repo, opts, inmemory=False)
return 1 return 1
else: else:
if confirm: if confirm:
ui.status(_('rebase completed successfully\n')) ui.status(_('rebase completed successfully\n'))
if not ui.promptchoice(_(b'apply changes (yn)?' if not ui.promptchoice(_(b'apply changes (yn)?'
b'$$ &Yes $$ &No')): b'$$ &Yes $$ &No')):
# finish unfinished rebase # finish unfinished rebase
rbsrt._finishrebase() rbsrt._finishrebase()