comparison mercurial/merge.py @ 3297:69b9471f26bb

merge: pass contexts to applyupdates

3296:20087b4bc6f9

from node import *
from i18n import gettext as _
from demandload import *
demandload(globals(), "errno util os tempfile")

def filemerge(repo, fw, fo, fd, my, other, p1, p2, move):
    """perform a 3-way merge in the working directory

    fw = filename in the working directory and first parent
    fo = filename in other parent
    fd = destination filename
    my = fileid in first parent
    other = fileid in second parent
    p1, p2 = hex changeset ids for merge command
    move = whether to move or copy the file to the destination

    TODO:
      if fw is copied in the working directory, we get confused
      implement move and fd

    cmd = (os.environ.get("HGMERGE") or repo.ui.config("ui", "merge")
           or "hgmerge")
    r = util.system('%s "%s" "%s" "%s"' % (cmd, a, b, c), cwd=repo.root,
                    environ={'HG_FILE': fw,
                             'HG_MY_NODE': p1,
                             'HG_OTHER_NODE': p2})
    if r:
        repo.ui.warn(_("merging %s failed!\n") % fw)
    else:
        if fd != fw:
            repo.ui.debug(_("copying %s to %s\n") % (fw, fd))

        else:
            act("remote created", f, "g", m2.execf(f), n)

    return action

def applyupdates(repo, action, xp1, xp2):
    updated, merged, removed, unresolved = 0, 0, 0, 0
    action.sort()
    for a in action:
        f, m = a[:2]
        if f[0] == "/":

                                 (f, inst.strerror))
            removed +=1
        elif m == "c": # copy
            f2, fd, my, other, flag, move = a[2:]
            repo.ui.status(_("merging %s and %s to %s\n") % (f, f2, fd))
            if filemerge(repo, f, f2, fd, my, other, xp1, xp2, move):
                unresolved += 1
            util.set_exec(repo.wjoin(fd), flag)
            merged += 1
        elif m == "m": # merge
            flag, my, other = a[2:]
            repo.ui.status(_("merging %s\n") % f)
            if filemerge(repo, f, f, f, my, other, xp1, xp2, False):
                unresolved += 1
            util.set_exec(repo.wjoin(f), flag)
            merged += 1
        elif m == "g": # get
            flag, node = a[2:]

        fp1, fp2, xp1, xp2 = p1.node(), p2.node(), str(p1), str(p2)

    if not partial:
        repo.hook('preupdate', throw=True, parent1=xp1, parent2=xp2)

    updated, merged, removed, unresolved = applyupdates(repo, action, xp1, xp2)

    # update dirstate
    if not partial:
        recordupdates(repo, action, branchmerge)
        repo.dirstate.setparents(fp1, fp2)

3297:69b9471f26bb

from node import *
from i18n import gettext as _
from demandload import *
demandload(globals(), "errno util os tempfile")

def filemerge(repo, fw, fo, fd, my, other, wctx, mctx, move):
    """perform a 3-way merge in the working directory

    fw = filename in the working directory and first parent
    fo = filename in other parent
    fd = destination filename
    my = fileid in first parent
    other = fileid in second parent
    wctx, mctx = working and merge changecontexts
    move = whether to move or copy the file to the destination

    TODO:
      if fw is copied in the working directory, we get confused
      implement move and fd

    cmd = (os.environ.get("HGMERGE") or repo.ui.config("ui", "merge")
           or "hgmerge")
    r = util.system('%s "%s" "%s" "%s"' % (cmd, a, b, c), cwd=repo.root,
                    environ={'HG_FILE': fw,
                             'HG_MY_NODE': str(wctx.parents()[0]),
                             'HG_OTHER_NODE': str(mctx)})
    if r:
        repo.ui.warn(_("merging %s failed!\n") % fw)
    else:
        if fd != fw:
            repo.ui.debug(_("copying %s to %s\n") % (fw, fd))

        else:
            act("remote created", f, "g", m2.execf(f), n)

    return action

def applyupdates(repo, action, wctx, mctx):
    updated, merged, removed, unresolved = 0, 0, 0, 0
    action.sort()
    for a in action:
        f, m = a[:2]
        if f[0] == "/":

                                 (f, inst.strerror))
            removed +=1
        elif m == "c": # copy
            f2, fd, my, other, flag, move = a[2:]
            repo.ui.status(_("merging %s and %s to %s\n") % (f, f2, fd))
            if filemerge(repo, f, f2, fd, my, other, wctx, mctx, move):
                unresolved += 1
            util.set_exec(repo.wjoin(fd), flag)
            merged += 1
        elif m == "m": # merge
            flag, my, other = a[2:]
            repo.ui.status(_("merging %s\n") % f)
            if filemerge(repo, f, f, f, my, other, wctx, mctx, False):
                unresolved += 1
            util.set_exec(repo.wjoin(f), flag)
            merged += 1
        elif m == "g": # get
            flag, node = a[2:]

        fp1, fp2, xp1, xp2 = p1.node(), p2.node(), str(p1), str(p2)

    if not partial:
        repo.hook('preupdate', throw=True, parent1=xp1, parent2=xp2)

    updated, merged, removed, unresolved = applyupdates(repo, action, wc, p2)

    # update dirstate
    if not partial:
        recordupdates(repo, action, branchmerge)
        repo.dirstate.setparents(fp1, fp2)