comparison mercurial/merge.py @ 3248:751840e739a1

merge: reduce manifest copying

3247:7a0d70b69d74

                for mf in match[of]:
                    checkpair(c, mf, m1)

    return copy

def filtermanifest(man, partial):
    if partial:
        for k in man.keys():
            if not partial(k): del man[k]

def manifestmerge(ui, m1, m2, ma, overwrite, backwards):
    """
    Merge manifest m1 with m2 using ancestor ma and generate merge action list
    """

    def fmerge(f):

        ui.debug(" %s: %s -> %s\n" % (f, msg, m))
        action.append((f, m) + args)

    # Compare manifests
    for f, n in m1.iteritems():
        if f in m2:
            # are files different?
            if n != m2[f]:
                a = ma.get(f, nullid)
                # are both different from the ancestor?

                    act("update permissions", f, "e", m2.execf(f))
            # contents same, check mode bits
            elif m1.execf(f) != m2.execf(f):
                if overwrite or fmerge(f) != m1.execf(f):
                    act("update permissions", f, "e", m2.execf(f))
            del m2[f]
        elif f in ma:
            if n != ma[f] and not overwrite:
                if ui.prompt(
                    (_(" local changed %s which remote deleted\n") % f) +
                    _("(k)eep or (d)elete?"), _("[kd]"), _("k")) == _("d"):

            # file is created on branch or in working directory
            if (overwrite and n[20:] != "u") or (backwards and not n[20:]):
                act("remote deleted", f, "r")

    for f, n in m2.iteritems():
        if f in ma:
            if overwrite or backwards:
                act("recreating", f, "g", m2.execf(f), n)
            elif n != ma[f]:
                if ui.prompt(

    if branchmerge and not forcemerge:
        if wc.modified() or wc.added() or wc.removed():
            raise util.Abort(_("outstanding uncommitted changes"))

    m1 = wc.manifest().copy()
    m2 = p2.manifest().copy()
    ma = pa.manifest()

    # resolve the manifest to determine which files
    # we care about merging
    repo.ui.note(_("resolving manifests\n"))

    repo.ui.debug(_(" ancestor %s local %s remote %s\n") % (p1, p2, pa))

    action = []
    copy = {}

    filtermanifest(m1, partial)
    filtermanifest(m2, partial)

    if not force:
        checkunknown(repo, m2, wc)
    if not branchmerge:
        action += forgetremoved(m2, wc)
    if not (backwards or overwrite):
        copy = findcopies(repo, m1, m2, pa.rev())

    action += manifestmerge(repo.ui, m1, m2, ma, overwrite, backwards)
    del m1, m2, ma

    ### apply phase

    if not branchmerge:
        # we don't need to do any magic, just jump to the new rev

3248:751840e739a1

                for mf in match[of]:
                    checkpair(c, mf, m1)

    return copy

def manifestmerge(ui, m1, m2, ma, overwrite, backwards, partial):
    """
    Merge manifest m1 with m2 using ancestor ma and generate merge action list
    """

    def fmerge(f):

        ui.debug(" %s: %s -> %s\n" % (f, msg, m))
        action.append((f, m) + args)

    # Compare manifests
    for f, n in m1.iteritems():
        if partial and not partial(f):
            continue
        if f in m2:
            # are files different?
            if n != m2[f]:
                a = ma.get(f, nullid)
                # are both different from the ancestor?

                    act("update permissions", f, "e", m2.execf(f))
            # contents same, check mode bits
            elif m1.execf(f) != m2.execf(f):
                if overwrite or fmerge(f) != m1.execf(f):
                    act("update permissions", f, "e", m2.execf(f))
        elif f in ma:
            if n != ma[f] and not overwrite:
                if ui.prompt(
                    (_(" local changed %s which remote deleted\n") % f) +
                    _("(k)eep or (d)elete?"), _("[kd]"), _("k")) == _("d"):

            # file is created on branch or in working directory
            if (overwrite and n[20:] != "u") or (backwards and not n[20:]):
                act("remote deleted", f, "r")

    for f, n in m2.iteritems():
        if partial and not partial(f):
            continue
        if f in m1:
            continue
        if f in ma:
            if overwrite or backwards:
                act("recreating", f, "g", m2.execf(f), n)
            elif n != ma[f]:
                if ui.prompt(

    if branchmerge and not forcemerge:
        if wc.modified() or wc.added() or wc.removed():
            raise util.Abort(_("outstanding uncommitted changes"))

    m1 = wc.manifest()
    m2 = p2.manifest()
    ma = pa.manifest()

    # resolve the manifest to determine which files
    # we care about merging
    repo.ui.note(_("resolving manifests\n"))

    repo.ui.debug(_(" ancestor %s local %s remote %s\n") % (p1, p2, pa))

    action = []
    copy = {}

    if not force:
        checkunknown(repo, m2, wc)
    if not branchmerge:
        action += forgetremoved(m2, wc)
    if not (backwards or overwrite):
        copy = findcopies(repo, m1, m2, pa.rev())

    action += manifestmerge(repo.ui, m1, m2, ma, overwrite, backwards, partial)

    ### apply phase

    if not branchmerge:
        # we don't need to do any magic, just jump to the new rev