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

    if ctx.node() in wpnodes:
        return b'@'
    else:
        merge_nodes = cache.get(b'merge_nodes')
        if merge_nodes is None:
            from . import merge

            mergestate = merge.mergestate.read(repo)
            if mergestate.active():
                merge_nodes = (mergestate.local, mergestate.other)
            else:
                merge_nodes = ()
            cache[b'merge_nodes'] = merge_nodes

44856:b7808443ed6a

    if ctx.node() in wpnodes:
        return b'@'
    else:
        merge_nodes = cache.get(b'merge_nodes')
        if merge_nodes is None:
            from . import mergestate as mergestatemod

            mergestate = mergestatemod.mergestate.read(repo)
            if mergestate.active():
                merge_nodes = (mergestate.local, mergestate.other)
            else:
                merge_nodes = ()
            cache[b'merge_nodes'] = merge_nodes