comparison mercurial/merge.py @ 3295:72d1e521da77

merge: use contexts for manifestmerge

- take ma, backwards, and copy out of update
- move findcopies call inside manifestmerge
- pass repo rather than ui

3294:a2d93b186a0e

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

    return copy

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

    def fmerge(f, f2=None, fa=None):
        """merge executable flags"""
        if not f2:
            f2 = f

        return ((a^b) | (a^c)) ^ a

    action = []

    def act(msg, f, m, *args):
        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

                else: # case 4,21 A/B/B
                    act("local moved",
                        f, "c", f2, f, m1[f], m2[f2], fmerge(f, f2, f2), False)
        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"):
                    act("prompt delete", f, "r")
            else:
                act("other deleted", f, "r")

                f2, "c", f, f, m1[f2], m2[f], fmerge(f2, f, f2), False)
        elif f in ma:
            if overwrite or backwards:
                act("recreating", f, "g", m2.execf(f), n)
            elif n != ma[f]:
                if ui.prompt(
                    (_("remote changed %s which local deleted\n") % f) +
                    _("(k)eep or (d)elete?"), _("[kd]"), _("k")) == _("k"):
                    act("prompt recreating", f, "g", m2.execf(f), n)
        else:
            act("remote created", f, "g", m2.execf(f), n)

        raise util.Abort(_("outstanding uncommitted merges"))

    p1, p2 = pl[0], repo.changectx(node)
    pa = p1.ancestor(p2)

    # are we going backwards?
    backwards = (pa == p2)

    # is there a linear path from p1 to p2?
    if pa == p1 or pa == p2:
        if branchmerge:
            raise util.Abort(_("there is nothing to merge, just use "
                               "'hg update' or look at 'hg heads'"))

        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(_(" overwrite %s branchmerge %s partial %s\n") %
                  (overwrite, branchmerge, bool(partial)))
    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, copy,
                            overwrite, backwards, partial)

    ### apply phase

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

3295:72d1e521da77

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

    return copy

def manifestmerge(repo, p1, p2, pa, overwrite, partial):
    """
    Merge manifest m1 with m2 using ancestor ma and generate merge action list
    """

    m1 = p1.manifest()
    m2 = p2.manifest()
    ma = pa.manifest()
    backwards = (pa == p2)

    def fmerge(f, f2=None, fa=None):
        """merge executable flags"""
        if not f2:
            f2 = f

        return ((a^b) | (a^c)) ^ a

    action = []

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

    copy = {}
    if not (backwards or overwrite):
        copy = findcopies(repo, m1, m2, pa.rev())

    # Compare manifests
    for f, n in m1.iteritems():
        if partial and not partial(f):
            continue

                else: # case 4,21 A/B/B
                    act("local moved",
                        f, "c", f2, f, m1[f], m2[f2], fmerge(f, f2, f2), False)
        elif f in ma:
            if n != ma[f] and not overwrite:
                if repo.ui.prompt(
                    (_(" local changed %s which remote deleted\n") % f) +
                    _("(k)eep or (d)elete?"), _("[kd]"), _("k")) == _("d"):
                    act("prompt delete", f, "r")
            else:
                act("other deleted", f, "r")

                f2, "c", f, f, m1[f2], m2[f], fmerge(f2, f, f2), False)
        elif f in ma:
            if overwrite or backwards:
                act("recreating", f, "g", m2.execf(f), n)
            elif n != ma[f]:
                if repo.ui.prompt(
                    (_("remote changed %s which local deleted\n") % f) +
                    _("(k)eep or (d)elete?"), _("[kd]"), _("k")) == _("k"):
                    act("prompt recreating", f, "g", m2.execf(f), n)
        else:
            act("remote created", f, "g", m2.execf(f), n)

        raise util.Abort(_("outstanding uncommitted merges"))

    p1, p2 = pl[0], repo.changectx(node)
    pa = p1.ancestor(p2)

    # is there a linear path from p1 to p2?
    if pa == p1 or pa == p2:
        if branchmerge:
            raise util.Abort(_("there is nothing to merge, just use "
                               "'hg update' or look at 'hg heads'"))

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

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

    # resolve the manifest to determine which files
    # we care about merging
    repo.ui.note(_("resolving manifests\n"))
    repo.ui.debug(_(" overwrite %s branchmerge %s partial %s\n") %
                  (overwrite, branchmerge, bool(partial)))
    repo.ui.debug(_(" ancestor %s local %s remote %s\n") % (p1, p2, pa))

    action = []

    if not force:
        checkunknown(repo, m2, wc)
    if not branchmerge:
        action += forgetremoved(m2, wc)

    action += manifestmerge(repo, wc, p2, pa, overwrite, partial)

    ### apply phase

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