Mercurial > public > mercurial-scm > hg
comparison mercurial/commands.py @ 715:938dd667ca21
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-----
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Sat, 16 Jul 2005 07:58:56 +0100 |
parents | 29fcd195e056 |
children | c6b912f8b5b2 8db4d406b3d3 d2422f10c136 |
comparison
equal
deleted
inserted
replaced
714:29fcd195e056 | 715:938dd667ca21 |
---|---|
334 bcache = {} | 334 bcache = {} |
335 opmap = [['user', getname], ['number', str], ['changeset', getnode]] | 335 opmap = [['user', getname], ['number', str], ['changeset', getnode]] |
336 if not opts['user'] and not opts['changeset']: | 336 if not opts['user'] and not opts['changeset']: |
337 opts['number'] = 1 | 337 opts['number'] = 1 |
338 | 338 |
339 if opts['revision']: | 339 if opts['rev']: |
340 node = repo.changelog.lookup(opts['revision']) | 340 node = repo.changelog.lookup(opts['rev']) |
341 else: | 341 else: |
342 node = repo.dirstate.parents()[0] | 342 node = repo.dirstate.parents()[0] |
343 change = repo.changelog.read(node) | 343 change = repo.changelog.read(node) |
344 mmap = repo.manifest.read(change[0]) | 344 mmap = repo.manifest.read(change[0]) |
345 for f in relpath(repo, (file1,) + files): | 345 for f in relpath(repo, (file1,) + files): |
1090 table = { | 1090 table = { |
1091 "^add": (add, [], "hg add FILE..."), | 1091 "^add": (add, [], "hg add FILE..."), |
1092 "addremove": (addremove, [], "hg addremove [FILE]..."), | 1092 "addremove": (addremove, [], "hg addremove [FILE]..."), |
1093 "^annotate": | 1093 "^annotate": |
1094 (annotate, | 1094 (annotate, |
1095 [('r', 'revision', '', 'revision'), | 1095 [('r', 'rev', '', 'revision'), |
1096 ('u', 'user', None, 'show user'), | 1096 ('u', 'user', None, 'show user'), |
1097 ('n', 'number', None, 'show revision number'), | 1097 ('n', 'number', None, 'show revision number'), |
1098 ('c', 'changeset', None, 'show changeset')], | 1098 ('c', 'changeset', None, 'show changeset')], |
1099 'hg annotate [-r REV] [-u] [-n] [-c] FILE...'), | 1099 'hg annotate [-r REV] [-u] [-n] [-c] FILE...'), |
1100 "cat": | 1100 "cat": |