comparison hgext/histedit.py @ 32057:e5ffc91a2276 stable

histedit: make check for unresolved conflicts explicit (issue5545)

Previously, we'd rely on the implicit check that `localrepo.commit` did.
The problem is that that check only happened when the working copy was
dirty. With a "clean" working copy but unresolved conflicts we'd get
into a broken state.

To fix that, do what rebase does and check for unresolved conflicts at
the start of histedit --continue.

32056:59afb0750aec

    exchange,
    extensions,
    hg,
    lock,
    merge as mergemod,
    node,
    obsolete,
    repair,
    scmutil,
    util,

        summary = summary.splitlines()[0]
    return summary

def bootstrapcontinue(ui, state, opts):
    repo = state.repo
    if state.actions:
        actobj = state.actions.pop(0)

        if _isdirtywc(repo):
            actobj.continuedirty()

32057:e5ffc91a2276

    exchange,
    extensions,
    hg,
    lock,
    merge as mergemod,
    mergeutil,
    node,
    obsolete,
    repair,
    scmutil,
    util,

        summary = summary.splitlines()[0]
    return summary

def bootstrapcontinue(ui, state, opts):
    repo = state.repo

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

    if state.actions:
        actobj = state.actions.pop(0)

        if _isdirtywc(repo):
            actobj.continuedirty()