This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3945

rebase: remove unnecessary confirm block
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG70448ec995c2: rebase: remove unnecessary confirm block
Summary

Removed unnecessary 'if confirm:' block as that thing is now
handled at 'finally'.

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.

Event Timeline

khanchi97 created this revision.Jul 14 2018, 1:32 PM
Closed by commit rHG70448ec995c2: rebase: remove unnecessary confirm block (authored by khanchi97). · Explain WhyJul 15 2018, 9:29 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/rebase.py (5 lines)

Diff 9598

hgext/rebase.py

needsabort = True needsabort = True
try: try:
overrides = {('rebase', 'singletransaction'): True} overrides = {('rebase', 'singletransaction'): True}
with ui.configoverride(overrides, 'rebase'): with ui.configoverride(overrides, 'rebase'):
_origrebase(ui, repo, opts, rbsrt, inmemory=True, _origrebase(ui, repo, opts, rbsrt, inmemory=True,
leaveunfinished=True) leaveunfinished=True)
except error.InMemoryMergeConflictsError: except error.InMemoryMergeConflictsError:
ui.status(_('hit a merge conflict\n')) ui.status(_('hit a merge conflict\n'))
if confirm:
# abort as in-memory merge doesn't support conflict
rbsrt._prepareabortorcontinue(isabort=True, backup=False,
suppwarns=True)
needsabort = 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()