[PATCH 4 of 4] help: move "revision syntax" help topics into online help

[Johannes Stezenbach]

3 files changed, 54 insertions(+), 52 deletions(-)
doc/hg.1.txt             |   52 ----------------------------------------------
mercurial/help.py        |   52 ++++++++++++++++++++++++++++++++++++++++++++++
tests/test-extension.out |    2 +


# HG changeset patch
# User Johannes Stezenbach <js at sig21.net>
# Date 1212520852 -7200
# Node ID 0b7d0d156c0218a41eb9708ca9d1005d81f2221c
# Parent  063a31138cde7910e79800d823a134b087017f0c
help: move "revision syntax" help topics into online help

Move the "Specifying Single Revisions" and "Specifying Multiple
Revisions" help topics from the manual page into the helptable
so they are available both online and in the manual page.

diff -r 063a31138cde -r 0b7d0d156c02 doc/hg.1.txt
--- a/doc/hg.1.txt	Tue Jun 03 21:03:51 2008 +0200
+++ b/doc/hg.1.txt	Tue Jun 03 21:20:52 2008 +0200
@@ -36,58 +36,6 @@
 
 
 include::hg.1.gendoc.txt[]
-
-SPECIFYING SINGLE REVISIONS
----------------------------
-
-    Mercurial accepts several notations for identifying individual
-    revisions.
-
-    A plain integer is treated as a revision number. Negative
-    integers are treated as offsets from the tip, with -1 denoting the
-    tip.
-
-    A 40-digit hexadecimal string is treated as a unique revision
-    identifier.
-
-    A hexadecimal string less than 40 characters long is treated as a
-    unique revision identifier, and referred to as a short-form
-    identifier. A short-form identifier is only valid if it is the
-    prefix of one full-length identifier.
-
-    Any other string is treated as a tag name, which is a symbolic
-    name associated with a revision identifier. Tag names may not
-    contain the ":" character.
-
-    The reserved name "tip" is a special tag that always identifies
-    the most recent revision.
-
-    The reserved name "null" indicates the null revision. This is the
-    revision of an empty repository, and the parent of revision 0.
-
-    The reserved name "." indicates the working directory parent. If
-    no working directory is checked out, it is equivalent to null.
-    If an uncommitted merge is in progress, "." is the revision of
-    the first parent.
-
-SPECIFYING MULTIPLE REVISIONS
------------------------------
-
-    When Mercurial accepts more than one revision, they may be
-    specified individually, or provided as a continuous range,
-    separated by the ":" character.
-
-    The syntax of range notation is [BEGIN]:[END], where BEGIN and END
-    are revision identifiers. Both BEGIN and END are optional. If
-    BEGIN is not specified, it defaults to revision number 0. If END
-    is not specified, it defaults to the tip. The range ":" thus
-    means "all revisions".
-
-    If BEGIN is greater than END, revisions are treated in reverse
-    order.
-
-    A range acts as a closed interval. This means that a range of 3:5
-    gives 3, 4 and 5. Similarly, a range of 4:2 gives 4, 3, and 2.
 
 FILES
 -----
diff -r 063a31138cde -r 0b7d0d156c02 mercurial/help.py
--- a/mercurial/help.py	Tue Jun 03 21:03:51 2008 +0200
+++ b/mercurial/help.py	Tue Jun 03 21:20:52 2008 +0200
@@ -161,4 +161,56 @@
     This is used by Python to find imported modules and may need to be set
     appropriately if Mercurial is not installed system-wide.
     '''),
+
+    ('revs|revisions|Specifying Single Revisions',
+    r'''
+    Mercurial accepts several notations for identifying individual
+    revisions.
+
+    A plain integer is treated as a revision number. Negative
+    integers are treated as offsets from the tip, with -1 denoting the
+    tip.
+
+    A 40-digit hexadecimal string is treated as a unique revision
+    identifier.
+
+    A hexadecimal string less than 40 characters long is treated as a
+    unique revision identifier, and referred to as a short-form
+    identifier. A short-form identifier is only valid if it is the
+    prefix of one full-length identifier.
+
+    Any other string is treated as a tag name, which is a symbolic
+    name associated with a revision identifier. Tag names may not
+    contain the ":" character.
+
+    The reserved name "tip" is a special tag that always identifies
+    the most recent revision.
+
+    The reserved name "null" indicates the null revision. This is the
+    revision of an empty repository, and the parent of revision 0.
+
+    The reserved name "." indicates the working directory parent. If
+    no working directory is checked out, it is equivalent to null.
+    If an uncommitted merge is in progress, "." is the revision of
+    the first parent.
+    '''),
+
+    ('mrevs|multirevs|Specifying Multiple Revisions',
+    r'''
+    When Mercurial accepts more than one revision, they may be
+    specified individually, or provided as a continuous range,
+    separated by the ":" character.
+
+    The syntax of range notation is [BEGIN]:[END], where BEGIN and END
+    are revision identifiers. Both BEGIN and END are optional. If
+    BEGIN is not specified, it defaults to revision number 0. If END
+    is not specified, it defaults to the tip. The range ":" thus
+    means "all revisions".
+
+    If BEGIN is greater than END, revisions are treated in reverse
+    order.
+
+    A range acts as a closed interval. This means that a range of 3:5
+    gives 3, 4 and 5. Similarly, a range of 4:2 gives 4, 3, and 2.
+    '''),
 )
diff -r 063a31138cde -r 0b7d0d156c02 tests/test-extension.out
--- a/tests/test-extension.out	Tue Jun 03 21:03:51 2008 +0200
+++ b/tests/test-extension.out	Tue Jun 03 21:20:52 2008 +0200
@@ -37,6 +37,8 @@
  dates             Date Formats
  patterns          File Name Patterns
  environment, env  Environment Variables
+ revs, revisions   Specifying Single Revisions
+ mrevs, multirevs  Specifying Multiple Revisions
 
 global options:
  -R --repository      repository root directory or symbolic path name