comparison mercurial/revset.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

    """The local side of the merge, if currently in an unresolved merge.

    "merge" here includes merge conflicts from e.g. 'hg rebase' or 'hg graft'.
    """
    getargs(x, 0, 0, _(b"conflictlocal takes no arguments"))
    from . import merge

    mergestate = merge.mergestate.read(repo)
    if mergestate.active() and repo.changelog.hasnode(mergestate.local):
        return subset & {repo.changelog.rev(mergestate.local)}

    return baseset()

    """The other side of the merge, if currently in an unresolved merge.

    "merge" here includes merge conflicts from e.g. 'hg rebase' or 'hg graft'.
    """
    getargs(x, 0, 0, _(b"conflictother takes no arguments"))
    from . import merge

    mergestate = merge.mergestate.read(repo)
    if mergestate.active() and repo.changelog.hasnode(mergestate.other):
        return subset & {repo.changelog.rev(mergestate.other)}

    return baseset()

44856:b7808443ed6a

    """The local side of the merge, if currently in an unresolved merge.

    "merge" here includes merge conflicts from e.g. 'hg rebase' or 'hg graft'.
    """
    getargs(x, 0, 0, _(b"conflictlocal takes no arguments"))
    from . import mergestate as mergestatemod

    mergestate = mergestatemod.mergestate.read(repo)
    if mergestate.active() and repo.changelog.hasnode(mergestate.local):
        return subset & {repo.changelog.rev(mergestate.local)}

    return baseset()

    """The other side of the merge, if currently in an unresolved merge.

    "merge" here includes merge conflicts from e.g. 'hg rebase' or 'hg graft'.
    """
    getargs(x, 0, 0, _(b"conflictother takes no arguments"))
    from . import mergestate as mergestatemod

    mergestate = mergestatemod.mergestate.read(repo)
    if mergestate.active() and repo.changelog.hasnode(mergestate.other):
        return subset & {repo.changelog.rev(mergestate.other)}

    return baseset()