comparison hgext/rebase.py @ 42108:1b5cec8b6a1e

rebase: fix bug that prevented dry-run rebases from printing failures

As far as I can tell it should be fine to unconditionally skip
_prepareabortorcontinue if we're in the process of raising an Abort
here.

Differential Revision: https://phab.mercurial-scm.org/D6226

42107:8890fce7c13d

                _origrebase(ui, repo, action, 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)?'
                                         b'$$ &Yes $$ &No')):

42108:1b5cec8b6a1e

                _origrebase(ui, repo, action, opts, rbsrt, inmemory=True,
                            leaveunfinished=True)
        except error.InMemoryMergeConflictsError:
            ui.status(_('hit a merge conflict\n'))
            return 1
        except error.Abort:
            needsabort = False
            raise
        else:
            if confirm:
                ui.status(_('rebase completed successfully\n'))
                if not ui.promptchoice(_(b'apply changes (yn)?'
                                         b'$$ &Yes $$ &No')):