# HG changeset patch
# User Thomas Arendsen Hein <thomas@intevation.de>
# Date 1121497136 -3600
# Node ID 938dd667ca213149e1d72d2ac994b0e76ddb7bde
# Parent  29fcd195e056c23ff5e87481087279f0eb5596eb
Make annotate use option --rev instead od --revision like other commands.

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Make annotate use option --rev instead od --revision like other commands.

manifest hash: fe9c9cd9d42657f60d302b557f1f33640fd51199
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)

iD8DBQFC2LAwW7P1GVgWeRoRAqYKAJ4tiLIVTRN0Ot6bjrEZRc9VFrk3zwCdGx/C
PhOGWMHVlNYGZxmdXridIc4=
=J7Cn
-----END PGP SIGNATURE-----


diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -336,8 +336,8 @@ def annotate(ui, repo, file1, *files, **
     if not opts['user'] and not opts['changeset']:
         opts['number'] = 1
 
-    if opts['revision']:
-        node = repo.changelog.lookup(opts['revision'])
+    if opts['rev']:
+        node = repo.changelog.lookup(opts['rev'])
     else:
         node = repo.dirstate.parents()[0]
     change = repo.changelog.read(node)
@@ -1092,7 +1092,7 @@ table = {
     "addremove": (addremove, [], "hg addremove [FILE]..."),
     "^annotate":
         (annotate,
-         [('r', 'revision', '', 'revision'),
+         [('r', 'rev', '', 'revision'),
           ('u', 'user', None, 'show user'),
           ('n', 'number', None, 'show revision number'),
           ('c', 'changeset', None, 'show changeset')],