comparison mercurial/merge.py @ 16093:7e30f5f2285f

merge: refactor unknown file conflict checking

Previously, we would do a full working directory walk including
unknown files to perform a merge. In many cases, this was painful
because unknown files greatly outnumbered tracked files and generally
had no useful effect on the merge.

Here we instead wait until we find a file in the destination that's
not tracked locally and detect if it exists and is not ignored. This
is usually cheaper but can be -more- expensive in the case where we're
adding a huge number of files. On the other hand, the cost of statting
the new files should be dwarfed by the cost of eventually writing
them.

In this version, case collisions are detected implicitly by
os.path.exists and wctx[f] lookup.

16092:914bc95e227b

            del self._state[dfile]
        elif not r:
            self.mark(dfile, 'r')
        return r

def _checkunknown(wctx, mctx, folding):
    "check for collisions between unknown files and files in mctx"
    if folding:
        foldf = util.normcase
    else:
        foldf = lambda fn: fn
    folded = {}
    for fn in mctx:
        folded[foldf(fn)] = fn

    error = False
    for fn in wctx.unknown():
        f = foldf(fn)
        if f in folded and mctx[folded[f]].cmp(wctx[f]):
            error = True
            wctx._repo.ui.warn(_("%s: untracked file differs\n") % fn)
    if error:
        raise util.Abort(_("untracked files in working directory differ "
                           "from files in requested revision"))

def _checkcollision(mctx, wctx):

        ### calculate phase
        action = []
        wc.status(unknown=True) # prime cache
        folding = not util.checkcase(repo.path)
        if not force:
            _checkunknown(wc, p2, folding)
        if folding:
            _checkcollision(p2, branchmerge and p1)
        action += _forgetremoved(wc, p2, branchmerge)
        action += manifestmerge(repo, wc, p2, pa, overwrite, partial)

16093:7e30f5f2285f

            del self._state[dfile]
        elif not r:
            self.mark(dfile, 'r')
        return r

def _checkunknownfile(repo, wctx, mctx, f):
    return (not repo.dirstate._ignore(f)
        and os.path.exists(repo.wjoin(f))
        and mctx[f].cmp(wctx[f]))

def _checkunknown(repo, wctx, mctx):
    "check for collisions between unknown files and files in mctx"

    error = False
    for f in mctx:
        if f not in wctx and _checkunknownfile(repo, wctx, mctx, f):
            error = True
            wctx._repo.ui.warn(_("%s: untracked file differs\n") % f)
    if error:
        raise util.Abort(_("untracked files in working directory differ "
                           "from files in requested revision"))

def _checkcollision(mctx, wctx):

        ### calculate phase
        action = []
        wc.status(unknown=True) # prime cache
        folding = not util.checkcase(repo.path)
        if not force:
            _checkunknown(repo, wc, p2)
        if folding:
            _checkcollision(p2, branchmerge and p1)
        action += _forgetremoved(wc, p2, branchmerge)
        action += manifestmerge(repo, wc, p2, pa, overwrite, partial)