hgext/rebase.py

37024:7c18798fc24d

            retcode = rbsrt._prepareabortorcontinue(abortf)
            if retcode is not None:
                return retcode
        else:
            destmap = _definedestmap(ui, repo, rbsrt, destf, srcf, basef, revf,
                                     destspace=destspace)
            retcode = rbsrt._preparenewrebase(destmap)
            if retcode is not None:
                return retcode
            storecollapsemsg(repo, rbsrt.collapsemsg)

                dsguard = dirstateguard.dirstateguard(repo, 'rebase')
            with util.acceptintervention(dsguard):
                rbsrt._performrebase(tr)
                rbsrt._finishrebase()

def _definedestmap(ui, repo, rbsrt, destf=None, srcf=None, basef=None,
                   revf=None, destspace=None):
    """use revisions argument to define destmap {srcrev: destrev}"""
    if revf is None:
        revf = []

    if revf and basef:
        raise error.Abort(_('cannot specify both a revision and a base'))
    if revf and srcf:
        raise error.Abort(_('cannot specify both a revision and a source'))

    if not rbsrt.inmemory:
        cmdutil.checkunfinished(repo)
        cmdutil.bailifchanged(repo)

    if ui.configbool('commands', 'rebase.requiredest') and not destf:
        raise error.Abort(_('you must specify a destination'),

                          ('+'.join(bytes(repo[r]) for r in base), dest))
            return None

    rebasingwcp = repo['.'].rev() in rebaseset
    ui.log("rebase", "", rebase_rebasing_wcp=rebasingwcp)
    if rbsrt.inmemory and rebasingwcp:
        # Check these since we did not before.
        cmdutil.checkunfinished(repo)
        cmdutil.bailifchanged(repo)

    if not destf:

37025:0782ac132a41

            retcode = rbsrt._prepareabortorcontinue(abortf)
            if retcode is not None:
                return retcode
        else:
            destmap = _definedestmap(ui, repo, inmemory, destf, srcf, basef,
                                     revf, destspace=destspace)
            retcode = rbsrt._preparenewrebase(destmap)
            if retcode is not None:
                return retcode
            storecollapsemsg(repo, rbsrt.collapsemsg)

                dsguard = dirstateguard.dirstateguard(repo, 'rebase')
            with util.acceptintervention(dsguard):
                rbsrt._performrebase(tr)
                rbsrt._finishrebase()

def _definedestmap(ui, repo, inmemory, destf=None, srcf=None, basef=None,
                   revf=None, destspace=None):
    """use revisions argument to define destmap {srcrev: destrev}"""
    if revf is None:
        revf = []

    if revf and basef:
        raise error.Abort(_('cannot specify both a revision and a base'))
    if revf and srcf:
        raise error.Abort(_('cannot specify both a revision and a source'))

    if not inmemory:
        cmdutil.checkunfinished(repo)
        cmdutil.bailifchanged(repo)

    if ui.configbool('commands', 'rebase.requiredest') and not destf:
        raise error.Abort(_('you must specify a destination'),

                          ('+'.join(bytes(repo[r]) for r in base), dest))
            return None

    rebasingwcp = repo['.'].rev() in rebaseset
    ui.log("rebase", "", rebase_rebasing_wcp=rebasingwcp)
    if inmemory and rebasingwcp:
        # Check these since we did not before.
        cmdutil.checkunfinished(repo)
        cmdutil.bailifchanged(repo)

    if not destf: