comparison hgext/fix.py @ 44856:b7808443ed6a

mergestate: split out merge state handling code from main merge module

There's already some pretty reasonable encapsulation here, but I want
to make the mergestate storage a property of the context so memctx
instances can do a reasonable thing. This is the first step in a
reshuffle to make that easier.

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

44855:1d2d353e5c4a

    copies,
    error,
    match as matchmod,
    mdiff,
    merge,
    pycompat,
    registrar,
    rewriteutil,
    scmutil,
    util,

        checkfixablectx(ui, repo, repo[rev])
    # Allow fixing only wdir() even if there's an unfinished operation
    if not (len(revs) == 1 and wdirrev in revs):
        cmdutil.checkunfinished(repo)
        rewriteutil.precheck(repo, revs, b'fix')
    if wdirrev in revs and list(merge.mergestate.read(repo).unresolved()):
        raise error.Abort(b'unresolved conflicts', hint=b"use 'hg resolve'")
    if not revs:
        raise error.Abort(
            b'no changesets specified', hint=b'use --rev or --working-dir'
        )

44856:b7808443ed6a

    copies,
    error,
    match as matchmod,
    mdiff,
    merge,
    mergestate as mergestatemod,
    pycompat,
    registrar,
    rewriteutil,
    scmutil,
    util,

        checkfixablectx(ui, repo, repo[rev])
    # Allow fixing only wdir() even if there's an unfinished operation
    if not (len(revs) == 1 and wdirrev in revs):
        cmdutil.checkunfinished(repo)
        rewriteutil.precheck(repo, revs, b'fix')
    if wdirrev in revs and list(
        mergestatemod.mergestate.read(repo).unresolved()
    ):
        raise error.Abort(b'unresolved conflicts', hint=b"use 'hg resolve'")
    if not revs:
        raise error.Abort(
            b'no changesets specified', hint=b'use --rev or --working-dir'
        )