comparison mercurial/merge.py @ 34548:b4955650eb57

merge: add merge action 'pr' to rename files during update

Add a new merge action to handle a path conflict by renaming the conflicting
file to a safe name.

The rename is just to avoid problems on the filesystem.  The conflict is still
considered unresolved until the user marks the original path as resolved.

Differential Revision: https://phab.mercurial-scm.org/D777

34547:81aebcc73beb

        s(_("resolve manually then use 'hg resolve --mark %s'\n") % f)
        ms.addpath(f, f1, fo)
        z += 1
        progress(_updating, z, item=f, total=numupdates, unit=_files)

    # remove in parallel (must come before getting)
    prog = worker.worker(repo.ui, 0.001, batchremove, (repo, wctx),
                         actions['r'])
    for i, item in prog:
        z += i
        progress(_updating, z, item=item, total=numupdates, unit=_files)
    removed = len(actions['r'])

    # We should flush before forking into worker processes, since those workers
    # flush when they complete, and we don't want to duplicate work.
    wctx.flushall()

            repo.dirstate.drop(f)

    # forget (must come first)
    for f, args, msg in actions.get('f', []):
        repo.dirstate.drop(f)

    # re-add
    for f, args, msg in actions.get('a', []):
        repo.dirstate.add(f)

            repo, wc, p2, pas, branchmerge, force, mergeancestor,
            followcopies, matcher=matcher, mergeforce=mergeforce)

        if updatecheck == 'noconflict':
            for f, (m, args, msg) in actionbyfile.iteritems():
                if m not in ('g', 'k', 'e', 'r'):
                    msg = _("conflicting changes")
                    hint = _("commit or update --clean to discard changes")
                    raise error.Abort(msg, hint=hint)

        # Prompt and create actions. Most of this is in the resolve phase

                else:
                    del actionbyfile[f]

        # Convert to dictionary-of-lists format
        actions = dict((m, [])
                       for m in 'a am f g cd dc r dm dg m e k p'.split())
        for f, (m, args, msg) in actionbyfile.iteritems():
            if m not in actions:
                actions[m] = []
            actions[m].append((f, args, msg))

34548:b4955650eb57

        s(_("resolve manually then use 'hg resolve --mark %s'\n") % f)
        ms.addpath(f, f1, fo)
        z += 1
        progress(_updating, z, item=f, total=numupdates, unit=_files)

    # remove in parallel (must come before resolving path conflicts and getting)
    prog = worker.worker(repo.ui, 0.001, batchremove, (repo, wctx),
                         actions['r'])
    for i, item in prog:
        z += i
        progress(_updating, z, item=item, total=numupdates, unit=_files)
    removed = len(actions['r'])

    # resolve path conflicts (must come before getting)
    for f, args, msg in actions['pr']:
        repo.ui.debug(" %s: %s -> pr\n" % (f, msg))
        f0, = args
        if wctx[f0].lexists():
            repo.ui.note(_("moving %s to %s\n") % (f0, f))
            wctx[f].audit()
            wctx[f].write(wctx.filectx(f0).data(), wctx.filectx(f0).flags())
            wctx[f0].remove()
        z += 1
        progress(_updating, z, item=f, total=numupdates, unit=_files)

    # We should flush before forking into worker processes, since those workers
    # flush when they complete, and we don't want to duplicate work.
    wctx.flushall()

            repo.dirstate.drop(f)

    # forget (must come first)
    for f, args, msg in actions.get('f', []):
        repo.dirstate.drop(f)

    # resolve path conflicts
    for f, args, msg in actions.get('pr', []):
        f0, = args
        origf0 = repo.dirstate.copied(f0) or f0
        repo.dirstate.add(f)
        repo.dirstate.copy(origf0, f)
        if f0 == origf0:
            repo.dirstate.remove(f0)
        else:
            repo.dirstate.drop(f0)

    # re-add
    for f, args, msg in actions.get('a', []):
        repo.dirstate.add(f)

            repo, wc, p2, pas, branchmerge, force, mergeancestor,
            followcopies, matcher=matcher, mergeforce=mergeforce)

        if updatecheck == 'noconflict':
            for f, (m, args, msg) in actionbyfile.iteritems():
                if m not in ('g', 'k', 'e', 'r', 'pr'):
                    msg = _("conflicting changes")
                    hint = _("commit or update --clean to discard changes")
                    raise error.Abort(msg, hint=hint)

        # Prompt and create actions. Most of this is in the resolve phase

                else:
                    del actionbyfile[f]

        # Convert to dictionary-of-lists format
        actions = dict((m, [])
                       for m in 'a am f g cd dc r dm dg m e k p pr'.split())
        for f, (m, args, msg) in actionbyfile.iteritems():
            if m not in actions:
                actions[m] = []
            actions[m].append((f, args, msg))