mercurial/commands.py

14754:189a7562d72e

    ctx = scmutil.revsingle(repo, opts.get('rev'))
    node = ctx.node()

    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")
        elif node != parent:
            if util.any(repo.status()):
                hint = _("uncommitted changes, use --all to discard all"
                         " changes, or 'hg update %s' to update") % ctx.rev()
            else:
                hint = _("use --all to revert all files,"
                         " or 'hg update %s' to update") % ctx.rev()
        raise util.Abort(msg, hint=hint)

    mf = ctx.manifest()
    if node == parent:
        pmf = mf

14755:6ba51c81ff75

    ctx = scmutil.revsingle(repo, opts.get('rev'))
    node = ctx.node()

    if not pats and not opts.get('all'):
        msg = _("no files or directories specified")
        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)
        dirty = util.any(repo.status())
        if node != parent:
            if dirty:
                hint = _("uncommitted changes, use --all to discard all"
                         " changes, or 'hg update %s' to update") % ctx.rev()
            else:
                hint = _("use --all to revert all files,"
                         " or 'hg update %s' to update") % ctx.rev()
        elif dirty:
            hint = _("uncommitted changes, use --all to discard all changes")
        else:
            hint = _("use --all to revert all files")
        raise util.Abort(msg, hint=hint)

    mf = ctx.manifest()
    if node == parent:
        pmf = mf