comparison mercurial/commands.py @ 45743:3b23cec4953f

revert: leverage cmdutil.check_incompatible_arguments()

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

45742:b5e0746e272b

    Returns 0 on success.
    """

    opts = pycompat.byteskwargs(opts)
    if opts.get(b"date"):
        if opts.get(b"rev"):
            raise error.Abort(_(b"you can't specify a revision and a date"))
        opts[b"rev"] = cmdutil.finddate(ui, repo, opts[b"date"])

    parent, p2 = repo.dirstate.parents()
    if not opts.get(b'rev') and p2 != nullid:
        # revert after merge is a trap for new users (issue2915)

45743:3b23cec4953f

    Returns 0 on success.
    """

    opts = pycompat.byteskwargs(opts)
    if opts.get(b"date"):
        cmdutil.check_incompatible_arguments(opts, b'date', [b'rev'])
        opts[b"rev"] = cmdutil.finddate(ui, repo, opts[b"date"])

    parent, p2 = repo.dirstate.parents()
    if not opts.get(b'rev') and p2 != nullid:
        # revert after merge is a trap for new users (issue2915)