comparison mercurial/commands.py @ 38793:6c8e3c847977

resolve: add option to warn/abort on -m with unresolved conflict markers

When a user is dropped out of Mercurial to a terminal to resolve files, we emit
messages like:

    conflicts while merging file1! (edit, then use 'hg resolve --mark')
    conflicts while merging file2! (edit, then use 'hg resolve --mark')

We don't mention a file name in the hint, so some users might do something like
`$EDITOR file1; hg resolve --mark`, see that it says "(no more unresolved
files)" and forget to deal with file2 before running the next command.

Even if we did mention a file name in the hint, it's too easy to forget it
(maybe the merge spans a couple days or something). This option lets us inform
the user that they might have missed something.

In the scenario above, the output would be something like:

    warning: the following files still have conflict markers:
      file2
    (no more unresolved files)

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

38792:afb442f58cbf

    discovery,
    encoding,
    error,
    exchange,
    extensions,
    formatter,
    graphmod,
    hbisect,
    help,
    hg,

        ret = 0
        didwork = False
        runconclude = False

        tocomplete = []
        for f in ms:
            if not m(f):
                continue

            didwork = True

                    ui.warn(_('%s: path conflict must be resolved manually\n')
                            % f)
                continue

            if mark:
                ms.mark(f, mergemod.MERGE_RECORD_RESOLVED)
            elif unmark:
                ms.mark(f, mergemod.MERGE_RECORD_UNRESOLVED)
            else:
                # backup pre-resolve (merge uses .orig for its own purposes)

                        util.rename(a + ".resolve",
                                    scmutil.origpath(ui, repo, a))
                    except OSError as inst:
                        if inst.errno != errno.ENOENT:
                            raise

        for f in tocomplete:
            try:
                # resolve file
                overrides = {('ui', 'forcemerge'): opts.get('tool', '')}

38793:6c8e3c847977

    discovery,
    encoding,
    error,
    exchange,
    extensions,
    filemerge,
    formatter,
    graphmod,
    hbisect,
    help,
    hg,

        ret = 0
        didwork = False
        runconclude = False

        tocomplete = []
        hasconflictmarkers = []
        if mark:
            markcheck = ui.config('experimental', 'resolve.mark-check')
        for f in ms:
            if not m(f):
                continue

            didwork = True

                    ui.warn(_('%s: path conflict must be resolved manually\n')
                            % f)
                continue

            if mark:
                if markcheck:
                    with repo.wvfs(f) as fobj:
                        fdata = fobj.read()
                    if filemerge.hasconflictmarkers(fdata) and \
                        ms[f] != mergemod.MERGE_RECORD_RESOLVED:
                        hasconflictmarkers.append(f)
                ms.mark(f, mergemod.MERGE_RECORD_RESOLVED)
            elif unmark:
                ms.mark(f, mergemod.MERGE_RECORD_UNRESOLVED)
            else:
                # backup pre-resolve (merge uses .orig for its own purposes)

                        util.rename(a + ".resolve",
                                    scmutil.origpath(ui, repo, a))
                    except OSError as inst:
                        if inst.errno != errno.ENOENT:
                            raise

        if hasconflictmarkers:
            ui.warn(_('warning: the following files still have conflict '
                      'markers:\n  ') + '\n  '.join(hasconflictmarkers) + '\n')
            if markcheck == 'abort' and not all:
                raise error.Abort(_('conflict markers detected'),
                                  hint=_('use --all to mark anyway'))

        for f in tocomplete:
            try:
                # resolve file
                overrides = {('ui', 'forcemerge'): opts.get('tool', '')}