[PATCH 1 of 4 v2] help: different section separators

Erik Zielke ez at aragost.com
Tue Oct 19 07:03:41 CDT 2010


# HG changeset patch
# User Erik Zielke <ez at aragost.com>
# Date 1287488374 -7200
# Node ID 27dd9da7536f8c3efdcf8511b662447b4e73a2a7
# Parent  8ce6a16bf5acad1244427e981796ed1f2a4ea74b
help: different section separators

Changes the characters used as section separators, so different ones
are used for module docstring and command docstring.

This is done because the section from the docstring will be at
different levels in the restructured text output, therefore
different symbols have to be used.

diff -r 8ce6a16bf5ac -r 27dd9da7536f hgext/acl.py
--- a/hgext/acl.py	Tue Oct 19 13:16:36 2010 +0200
+++ b/hgext/acl.py	Tue Oct 19 13:39:34 2010 +0200
@@ -32,7 +32,7 @@
 The allow and deny sections take key-value pairs.
 
 Branch-based Access Control
----------------------------
+...........................
 
 Use the ``acl.deny.branches`` and ``acl.allow.branches`` sections to
 have branch-based access control. Keys in these sections can be
@@ -47,7 +47,7 @@
 - an asterisk, to match anyone;
 
 Path-based Access Control
--------------------------
+.........................
 
 Use the ``acl.deny`` and ``acl.allow`` sections to have path-based
 access control. Keys in these sections accept a subtree pattern (with
@@ -55,7 +55,7 @@
 syntax as the other sections above.
 
 Groups
-------
+......
 
 Group names must be prefixed with an ``@`` symbol. Specifying a group
 name has the same effect as specifying all the users in that group.
@@ -66,7 +66,7 @@
 Otherwise, an exception will be raised.
 
 Example Configuration
----------------------
+.....................
 
 ::
 
diff -r 8ce6a16bf5ac -r 27dd9da7536f hgext/convert/__init__.py
--- a/hgext/convert/__init__.py	Tue Oct 19 13:16:36 2010 +0200
+++ b/hgext/convert/__init__.py	Tue Oct 19 13:39:34 2010 +0200
@@ -136,7 +136,7 @@
     repository from "default" to a named branch.
 
     Mercurial Source
-    ----------------
+    ''''''''''''''''
 
     --config convert.hg.ignoreerrors=False    (boolean)
         ignore integrity errors when reading. Use it to fix Mercurial
@@ -149,7 +149,7 @@
         convert start revision and its descendants
 
     CVS Source
-    ----------
+    ''''''''''
 
     CVS source will use a sandbox (i.e. a checked-out copy) from CVS
     to indicate the starting point of what will be converted. Direct
@@ -197,7 +197,7 @@
     the command help for more details.
 
     Subversion Source
-    -----------------
+    '''''''''''''''''
 
     Subversion source detects classical trunk/branches/tags layouts.
     By default, the supplied "svn://repo/path/" source URL is
@@ -225,7 +225,7 @@
         specify start Subversion revision.
 
     Perforce Source
-    ---------------
+    '''''''''''''''
 
     The Perforce (P4) importer can be given a p4 depot path or a
     client specification as source. It will convert all files in the
@@ -241,7 +241,7 @@
         specify initial Perforce revision.
 
     Mercurial Destination
-    ---------------------
+    '''''''''''''''''''''
 
     --config convert.hg.clonebranches=False   (boolean)
         dispatch source branches in separate clones.
diff -r 8ce6a16bf5ac -r 27dd9da7536f mercurial/help/merge-tools.txt
--- a/mercurial/help/merge-tools.txt	Tue Oct 19 13:16:36 2010 +0200
+++ b/mercurial/help/merge-tools.txt	Tue Oct 19 13:39:34 2010 +0200
@@ -71,10 +71,10 @@
 
 7. The merge fails.
 
-Note: after selecting a merge program, hg will by default attempt
+Note: after selecting a merge program, Mercurial will by default attempt
 to merge the files using a simple merge algorithm first, to see if
 they can be merged without conflicts. Only if there are conflicting
-changes will hg actually execute the merge program. Whether to use the
+changes Mercurial will actually execute the merge program. Whether to use the
 simple merge algorithm first can be controlled be the premerge
 setting of the merge tool, which is enabled by default unless the
 file is binary or symlink.


More information about the Mercurial-devel mailing list