mercurial/commands.py

24125:18af6ebd4001

        raise util.Abort(_("can't specify --all and patterns"))
    if not (all or pats or show or mark or unmark):
        raise util.Abort(_('no files or directories specified'),
                         hint=('use --all to remerge all files'))

    wlock = repo.wlock()
    try:
        ms = mergemod.mergestate(repo)

        if not (ms.active() or repo.dirstate.p2() != nullid) and not show:
            raise util.Abort(
                _('resolve command not applicable when not merging'))

        m = scmutil.match(repo[None], pats, opts)
        ret = 0

            if not m(f):
                continue

            didwork = True

            if show:
                if nostatus:
                    ui.write("%s\n" % f)
                else:
                    ui.write("%s %s\n" % (ms[f].upper(), f),
                             label='resolve.' +
                             {'u': 'unresolved', 'r': 'resolved'}[ms[f]])
            elif mark:
                ms.mark(f, "r")
            elif unmark:
                ms.mark(f, "u")
            else:
                wctx = repo[None]

                # replace filemerge's .orig file with our resolve file
                util.rename(a + ".resolve", a + ".orig")

        ms.commit()

        if not didwork and pats and not show:
            ui.warn(_("arguments do not match paths that need resolving\n"))

    finally:
        wlock.release()

    # Nudge users into finishing an unfinished operation. We don't print
    # this with the list/show operation because we want list/show to remain
    # machine readable.
    if not list(ms.unresolved()) and not show:
        ui.status(_('(no more unresolved files)\n'))

    return ret

@command('revert',

24126:b4d21bbc2589

        raise util.Abort(_("can't specify --all and patterns"))
    if not (all or pats or show or mark or unmark):
        raise util.Abort(_('no files or directories specified'),
                         hint=('use --all to remerge all files'))

    if show:
        ms = mergemod.mergestate(repo)
        m = scmutil.match(repo[None], pats, opts)
        for f in ms:
            if not m(f):
                continue
            if nostatus:
                ui.write("%s\n" % f)
            else:
                ui.write("%s %s\n" % (ms[f].upper(), f),
                         label='resolve.' +
                         {'u': 'unresolved', 'r': 'resolved'}[ms[f]])
        return 0

    wlock = repo.wlock()
    try:
        ms = mergemod.mergestate(repo)

        if not (ms.active() or repo.dirstate.p2() != nullid):
            raise util.Abort(
                _('resolve command not applicable when not merging'))

        m = scmutil.match(repo[None], pats, opts)
        ret = 0

            if not m(f):
                continue

            didwork = True

            if mark:
                ms.mark(f, "r")
            elif unmark:
                ms.mark(f, "u")
            else:
                wctx = repo[None]

                # replace filemerge's .orig file with our resolve file
                util.rename(a + ".resolve", a + ".orig")

        ms.commit()

        if not didwork and pats:
            ui.warn(_("arguments do not match paths that need resolving\n"))

    finally:
        wlock.release()

    # Nudge users into finishing an unfinished operation
    if not list(ms.unresolved()):
        ui.status(_('(no more unresolved files)\n'))

    return ret

@command('revert',