mercurial/simplemerge.py

44946:fb2936c5f6dc

def _bytes_to_set(b):
    """turns a multiple bytes (usually flags) into a set of individual byte"""
    return set(b[x : x + 1] for x in range(len(b)))


def is_null(ctx):
    if not util.safehasattr(ctx, "node"):
        return False
    return ctx.node() != nodemod.nullid

    # merge flags if necessary
    flags = localctx.flags()
    localflags = _bytes_to_set(flags)
    otherflags = _bytes_to_set(otherctx.flags())
    if is_null(basectx) and localflags != otherflags:
        baseflags = _bytes_to_set(basectx.flags())
        flags = localflags & otherflags
        for f in localflags.symmetric_difference(otherflags):
            if f not in baseflags:
                flags.add(f)

44947:ad6971e6740c

def _bytes_to_set(b):
    """turns a multiple bytes (usually flags) into a set of individual byte"""
    return set(b[x : x + 1] for x in range(len(b)))


def is_not_null(ctx):
    if not util.safehasattr(ctx, "node"):
        return False
    return ctx.node() != nodemod.nullid

    # merge flags if necessary
    flags = localctx.flags()
    localflags = _bytes_to_set(flags)
    otherflags = _bytes_to_set(otherctx.flags())
    if is_not_null(basectx) and localflags != otherflags:
        baseflags = _bytes_to_set(basectx.flags())
        flags = localflags & otherflags
        for f in localflags.symmetric_difference(otherflags):
            if f not in baseflags:
                flags.add(f)