comparison mercurial/merge.py @ 15894:44fa047cef57

merge: report all files in _checkunknown

When doing hg up, if there is a file conflict with untracked files,
currently only the first such conflict is reported. With this patch,
all of them are listed.

With this patch error message is now reported as

    a: untracked file differs
    b: untracked file differs
    abort: untracked files in working directory conflict with files in
    requested revision

instead of

    abort: untracked file in working directory differs from file in
    requested revision: 'a'

This is a follow up to an old attempt to do this here:

    http://selenic.com/pipermail/mercurial-devel/2011-August/033625.html

15893:eb6867b98223

    else:
        foldf = lambda fn: fn
    folded = {}
    for fn in mctx:
        folded[foldf(fn)] = fn
    for fn in wctx.unknown():
        f = foldf(fn)
        if f in folded and mctx[folded[f]].cmp(wctx[f]):
            raise util.Abort(_("untracked file in working directory differs"
                               " from file in requested revision: '%s'") % fn)

def _checkcollision(mctx, wctx):
    "check for case folding collisions in the destination context"
    folded = {}
    for fn in mctx:

15894:44fa047cef57

    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):
    "check for case folding collisions in the destination context"
    folded = {}
    for fn in mctx: