comparison hgext3rd/evolve/evolvecmd.py @ 4798:2e14a9386316

abort: added support for evolve to hg abort

This patch adds support of `hg evolve --abort` to `hg abort`
plan.

This involves creating a `hgabortevolve()` function under
`evolvecmd` which ensures abortion of evolve via `hg abort`.
This function is then registered using `addunfinished()` in
`__init__.py`.

Results are shown as tests.

4797:8c780c3eb116

                  % nodemod.hex(startnode)[:12])
    else:
        raise error.Abort(_("unable to abort interrupted evolve, use 'hg "
                            "evolve --stop' to stop evolve"))

def continueevolve(ui, repo, evolvestate):
    """logic for handling of `hg evolve --continue`"""

    ms = merge.mergestate.read(repo)
    mergeutil.checkunresolved(ms)

4798:2e14a9386316

                  % nodemod.hex(startnode)[:12])
    else:
        raise error.Abort(_("unable to abort interrupted evolve, use 'hg "
                            "evolve --stop' to stop evolve"))

def hgabortevolve(ui, repo):
    """logic for aborting evolve using 'hg abort'"""
    with repo.wlock(), repo.lock():
        evolvestate = state.cmdstate(repo)
        evolvestate.load()
        if evolvestate['command'] != 'evolve':
            pctx = repo['.']
            hg.updaterepo(repo, pctx.node(), True)
            ui.status(_('evolve aborted\n'))
            ui.status(_('working directory is now at %s\n')
                      % pctx.hex()[:12])
            evolvestate.delete()
            return 0
        return abortevolve(ui, repo, evolvestate)

def continueevolve(ui, repo, evolvestate):
    """logic for handling of `hg evolve --continue`"""

    ms = merge.mergestate.read(repo)
    mergeutil.checkunresolved(ms)