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

38679:b3d0c97a0820

            with ui.configoverride(overrides, 'rebase'):
                _origrebase(ui, repo, opts, rbsrt, inmemory=True,
                            leaveunfinished=True)
        except error.InMemoryMergeConflictsError:
            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
        else:
            if confirm:
                ui.status(_('rebase completed successfully\n'))
                if not ui.promptchoice(_(b'apply changes (yn)?'

38680:70448ec995c2

            with ui.configoverride(overrides, 'rebase'):
                _origrebase(ui, repo, opts, rbsrt, inmemory=True,
                            leaveunfinished=True)
        except error.InMemoryMergeConflictsError:
            ui.status(_('hit a merge conflict\n'))
            return 1
        else:
            if confirm:
                ui.status(_('rebase completed successfully\n'))
                if not ui.promptchoice(_(b'apply changes (yn)?'