comparison hgext/rebase.py @ 38495:ba6d2c32f34a

rebase: add lock to cover whole dryrun process

Before this patch it is easy for another hg to interrupt
the dryrun. This patch make sure that dryrun will complete
without any interruption.

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

38494:d4be8ea8f22d

        userrevs = list(repo.revs(opts.get(r'auto_orphans')))
        opts[r'rev'] = [revsetlang.formatspec('%ld and orphan()', userrevs)]
        opts[r'dest'] = '_destautoorphanrebase(SRC)'

    if dryrun:
        leaveunfinished = True
        inmemory = True
        rbsrt = rebaseruntime(repo, ui, inmemory, pycompat.byteskwargs(opts))
        try:
            overrides = {('rebase', 'singletransaction'): True}
            with ui.configoverride(overrides, 'rebase'):
                _origrebase(ui, repo, inmemory=True, rbsrt=rbsrt,
                            leaveunfinished=leaveunfinished, **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:
            with repo.wlock(), repo.lock():
                rbsrt._prepareabortorcontinue(isabort=True)
    elif inmemory:
        try:
            # in-memory merge doesn't support conflicts, so if we hit any, abort
            # and re-run as an on-disk merge.

38495:ba6d2c32f34a

        userrevs = list(repo.revs(opts.get(r'auto_orphans')))
        opts[r'rev'] = [revsetlang.formatspec('%ld and orphan()', userrevs)]
        opts[r'dest'] = '_destautoorphanrebase(SRC)'

    if dryrun:
        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)
    elif inmemory:
        try:
            # in-memory merge doesn't support conflicts, so if we hit any, abort
            # and re-run as an on-disk merge.