Mercurial > hg
comparison hgext/rebase.py @ 38680:70448ec995c2
rebase: remove unnecessary confirm block
Removed unnecessary 'if confirm:' block as that thing is now
handled at 'finally'.
Differential Revision: https://phab.mercurial-scm.org/D3945
author | Sushil khanchi <sushilkhanchi97@gmail.com> |
---|---|
date | Sat, 14 Jul 2018 23:00:22 +0530 |
parents | b3d0c97a0820 |
children | 8eeed92475d5 |
comparison
equal
deleted
inserted
replaced
38679:b3d0c97a0820 | 38680:70448ec995c2 |
---|---|
865 with ui.configoverride(overrides, 'rebase'): | 865 with ui.configoverride(overrides, 'rebase'): |
866 _origrebase(ui, repo, opts, rbsrt, inmemory=True, | 866 _origrebase(ui, repo, opts, rbsrt, inmemory=True, |
867 leaveunfinished=True) | 867 leaveunfinished=True) |
868 except error.InMemoryMergeConflictsError: | 868 except error.InMemoryMergeConflictsError: |
869 ui.status(_('hit a merge conflict\n')) | 869 ui.status(_('hit a merge conflict\n')) |
870 if confirm: | |
871 # abort as in-memory merge doesn't support conflict | |
872 rbsrt._prepareabortorcontinue(isabort=True, backup=False, | |
873 suppwarns=True) | |
874 needsabort = False | |
875 return 1 | 870 return 1 |
876 else: | 871 else: |
877 if confirm: | 872 if confirm: |
878 ui.status(_('rebase completed successfully\n')) | 873 ui.status(_('rebase completed successfully\n')) |
879 if not ui.promptchoice(_(b'apply changes (yn)?' | 874 if not ui.promptchoice(_(b'apply changes (yn)?' |