mercurial/commands.py

14720:36283a7b6856

        opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])

    parent, p2 = repo.dirstate.parents()

    if not pats and not opts.get('all'):
        raise util.Abort(_('no files or directories specified'),
                         hint=_('use --all to discard all changes'))

    ctx = scmutil.revsingle(repo, opts.get('rev'))
    node = ctx.node()
    mf = ctx.manifest()
    if node == parent:

14721:4fcde634f5e0

        opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])

    parent, p2 = repo.dirstate.parents()

    if not pats and not opts.get('all'):
        msg = _("no files or directories specified")
        hint = _("use --all to discard all changes")
        if p2 != nullid:
            hint = _("uncommitted merge, use --all to discard all changes,"
                     " or 'hg update -C .' to abort the merge")
        raise util.Abort(msg, hint=hint)

    ctx = scmutil.revsingle(repo, opts.get('rev'))
    node = ctx.node()
    mf = ctx.manifest()
    if node == parent: