Mercurial > hg

changeset 12613:f365aed7cc5b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
heads: mention STARTREV in synopsis and help for --rev Before this change, "hg help heads" said hg heads [-ac] [-r REV] [REV]... [...] If STARTREV is specified, only those heads that are descendants of STARTREV will be displayed. [...] -r --rev REV show only heads which are descendants of REV [...] which made little sense since there are two things called REV in the synopsis and nothing called STARTREV. A little digging reveals that the "[-r REV]" part of the synopsis was introduced in 8e503fa54d2d, changed to "[-r STARTREV]" in 2bcef677a6c3, and then changed back to "[-r REV]" in 4b02fc71bbba. The last change seems to be based on a patch[1] on our mailinglist that actually *inserted* STARTREV again in the help for the command line option itself. For some reason, the patch was changed to remove STARTREV from the synopsis. This change finally makes the help consistent by putting STARTREV back into the help in all places where it is needed: hg heads [-ac] [-r STARTREV] [REV]... [...] If STARTREV is specified, only those heads that are descendants of STARTREV will be displayed. [...] -r --rev STARTREV show only heads which are descendants of STARTREV [...] This was not possible until 40c06bbf58be, which introduced the possibility of naming the meta variables for each option. [1]: http://mercurial.markmail.org/message/qgc55gd4fam4ogvz
author Martin Geisler <mg@lazybytes.net>
date Fri, 01 Oct 2010 23:16:11 +0200
parents 03c5737a06a1
children 64db820c66a2
files mercurial/commands.py
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/commands.py	Fri Oct 01 10:29:33 2010 -0500
+++ b/mercurial/commands.py	Fri Oct 01 23:16:11 2010 +0200
@@ -4155,14 +4155,15 @@
     "heads":
         (heads,
          [('r', 'rev', '',
-           _('show only heads which are descendants of REV'), _('REV')),
+           _('show only heads which are descendants of STARTREV'),
+           _('STARTREV')),
           ('t', 'topo', False, _('show topological heads only')),
           ('a', 'active', False,
            _('show active branchheads only (DEPRECATED)')),
           ('c', 'closed', False,
            _('show normal and closed branch heads')),
          ] + templateopts,
-         _('[-ac] [-r REV] [REV]...')),
+         _('[-ac] [-r STARTREV] [REV]...')),
     "help": (help_, [], _('[TOPIC]')),
     "identify|id":
         (identify,