comparison hgext/rebase.py @ 38497:9c3b48fb7ac5

rebase: split _origrebase() for conveniece in dryrun

This patch split _origrebase() method by extracting rbsrt part
from that to make it easy to implement dryrun in more elegant way
than before.

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

38496:c92fdc27cbdd

        try:
            # in-memory merge doesn't support conflicts, so if we hit any, abort
            # and re-run as an on-disk merge.
            overrides = {('rebase', 'singletransaction'): True}
            with ui.configoverride(overrides, 'rebase'):
                return _origrebase(ui, repo, inmemory=inmemory, **opts)
        except error.InMemoryMergeConflictsError:
            ui.warn(_('hit merge conflicts; re-running rebase without in-memory'
                      ' merge\n'))
            _origrebase(ui, repo, abort=True)
            return _origrebase(ui, repo, inmemory=False, **opts)
    else:
        return _origrebase(ui, repo, **opts)

def _dryrunrebase(ui, repo, **opts):
    rbsrt = rebaseruntime(repo, ui, inmemory=True,
                          opts=pycompat.byteskwargs(opts))
    with repo.wlock(), repo.lock():
        try:
            overrides = {('rebase', 'singletransaction'): True}
            with ui.configoverride(overrides, 'rebase'):
                _origrebase(ui, repo, inmemory=True, rbsrt=rbsrt,
                            leaveunfinished=True, **opts)
        except error.InMemoryMergeConflictsError:
            ui.status(_('hit a merge conflict\n'))
            return 1
        else:
            ui.status(_('there will be no conflict, you can rebase\n'))
            return 0
        finally:
            rbsrt._prepareabortorcontinue(isabort=True)

def _origrebase(ui, repo, inmemory=False, leaveunfinished=False, rbsrt=None,
                **opts):
    opts = pycompat.byteskwargs(opts)
    if not rbsrt:
        rbsrt = rebaseruntime(repo, ui, inmemory, opts)

    with repo.wlock(), repo.lock():
        # Validate input and define rebasing points
        destf = opts.get('dest', None)
        srcf = opts.get('source', None)
        basef = opts.get('base', None)

38497:9c3b48fb7ac5

        try:
            # in-memory merge doesn't support conflicts, so if we hit any, abort
            # and re-run as an on-disk merge.
            overrides = {('rebase', 'singletransaction'): True}
            with ui.configoverride(overrides, 'rebase'):
                return _dorebase(ui, repo, inmemory=inmemory, **opts)
        except error.InMemoryMergeConflictsError:
            ui.warn(_('hit merge conflicts; re-running rebase without in-memory'
                      ' merge\n'))
            _dorebase(ui, repo, abort=True)
            return _dorebase(ui, repo, inmemory=False, **opts)
    else:
        return _dorebase(ui, repo, **opts)

def _dryrunrebase(ui, repo, **opts):
    rbsrt = rebaseruntime(repo, ui, inmemory=True,
                          opts=pycompat.byteskwargs(opts))
    with repo.wlock(), repo.lock():
        try:
            overrides = {('rebase', 'singletransaction'): True}
            with ui.configoverride(overrides, 'rebase'):
                _origrebase(ui, repo, rbsrt, inmemory=True,
                            leaveunfinished=True, **opts)
        except error.InMemoryMergeConflictsError:
            ui.status(_('hit a merge conflict\n'))
            return 1
        else:
            ui.status(_('there will be no conflict, you can rebase\n'))
            return 0
        finally:
            rbsrt._prepareabortorcontinue(isabort=True)

def _dorebase(ui, repo, inmemory=False, **opts):
    rbsrt = rebaseruntime(repo, ui, inmemory, pycompat.byteskwargs(opts))
    return _origrebase(ui, repo, rbsrt, inmemory=inmemory, **opts)

def _origrebase(ui, repo, rbsrt, inmemory=False, leaveunfinished=False, **opts):
    opts = pycompat.byteskwargs(opts)
    with repo.wlock(), repo.lock():
        # Validate input and define rebasing points
        destf = opts.get('dest', None)
        srcf = opts.get('source', None)
        basef = opts.get('base', None)