comparison mercurial/merge.py @ 6272:dd9bd227ae9a

merge: simplify some helpers

6271:01aed23355e9

from i18n import _
import errno, util, os, heapq, filemerge

def _checkunknown(wctx, mctx):
    "check for collisions between unknown files and files in mctx"
    man = mctx.manifest()
    for f in wctx.unknown():
        if f in man:
            if mctx.filectx(f).cmp(wctx.filectx(f).data()):
                raise util.Abort(_("untracked file in working directory differs"
                                   " from file in requested revision: '%s'")
                                 % f)

def _checkcollision(mctx):
    "check for case folding collisions in the destination context"
    folded = {}
    for fn in mctx.manifest():
        fold = fn.lower()
        if fold in folded:
            raise util.Abort(_("case-folding collision between %s and %s")
                             % (fn, folded[fold]))
        folded[fold] = fn

    that is not present in the working directory, we need to mark it
    as removed.
    """

    action = []
    man = mctx.manifest()
    state = branchmerge and 'r' or 'f'
    for f in wctx.deleted():
        if f not in man:
            action.append((f, state))

    if not branchmerge:
        for f in wctx.removed():
            if f not in man:
                action.append((f, "f"))

    return action

def _nonoverlap(d1, d2, d3):

6272:dd9bd227ae9a

from i18n import _
import errno, util, os, heapq, filemerge

def _checkunknown(wctx, mctx):
    "check for collisions between unknown files and files in mctx"
    for f in wctx.unknown():
        if f in mctx and mctx[f].cmp(wctx[f].data()):
            raise util.Abort(_("untracked file in working directory differs"
                               " from file in requested revision: '%s'") % f)

def _checkcollision(mctx):
    "check for case folding collisions in the destination context"
    folded = {}
    for fn in mctx:
        fold = fn.lower()
        if fold in folded:
            raise util.Abort(_("case-folding collision between %s and %s")
                             % (fn, folded[fold]))
        folded[fold] = fn

    that is not present in the working directory, we need to mark it
    as removed.
    """

    action = []
    state = branchmerge and 'r' or 'f'
    for f in wctx.deleted():
        if f not in mctx:
            action.append((f, state))

    if not branchmerge:
        for f in wctx.removed():
            if f not in mctx:
                action.append((f, "f"))

    return action

def _nonoverlap(d1, d2, d3):