mercurial/templatekw.py

44711:637eb7f7559b

    if wpnodes[1] == nullid:
        wpnodes = wpnodes[:1]
    if ctx.node() in wpnodes:
        return b'@'
    else:
        merge_nodes = cache.get(b'merge_nodes', ())
        if not merge_nodes:
            from . import merge

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

        if ctx.node() in merge_nodes:
            return b'%'
        return b''

44712:a825bfbf6642

    if wpnodes[1] == nullid:
        wpnodes = wpnodes[:1]
    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

        if ctx.node() in merge_nodes:
            return b'%'
        return b''