convert: fix inconsistent indentation in help text
The sort modes flags and convert.cvsps options were indented while the
convert.hg, convert.svn, and convert.p4 options were not. I've now
un-indented all of them.
--- a/hgext/convert/__init__.py Thu Jul 09 19:49:02 2009 -0500
+++ b/hgext/convert/__init__.py Thu Jul 09 20:15:15 2009 +0200
@@ -44,14 +44,15 @@
By default, all sources except Mercurial will use --branchsort. Mercurial
uses --sourcesort to preserve original revision numbers order. Sort modes
have the following effects:
- --branchsort: convert from parent to child revision when possible, which
- means branches are usually converted one after the other. It generates
- more compact repositories.
- --datesort: sort revisions by date. Converted repositories have
- good-looking changelogs but are often an order of magnitude larger
- than the same ones generated by --branchsort.
- --sourcesort: try to preserve source revisions order, only supported by
- Mercurial sources.
+
+ --branchsort: convert from parent to child revision when possible, which
+ means branches are usually converted one after the other. It generates
+ more compact repositories.
+ --datesort: sort revisions by date. Converted repositories have
+ good-looking changelogs but are often an order of magnitude larger than
+ the same ones generated by --branchsort.
+ --sourcesort: try to preserve source revisions order, only supported by
+ Mercurial sources.
If <REVMAP> isn't given, it will be put in a default location
(<dest>/.hg/shamap by default). The <REVMAP> is a simple text file that
@@ -135,7 +136,7 @@
its internal changeset merging code by default but can be configured to
call the external 'cvsps' program by setting:
- --config convert.cvsps='cvsps -A -u --cvs-direct -q'
+ --config convert.cvsps='cvsps -A -u --cvs-direct -q'
This option is deprecated and will be removed in Mercurial 1.4.
@@ -143,27 +144,28 @@
Internal cvsps is selected by setting
- --config convert.cvsps=builtin
+ --config convert.cvsps=builtin
and has a few more configurable options:
- --config convert.cvsps.cache=True (boolean)
- Set to False to disable remote log caching, for testing and
- debugging purposes.
- --config convert.cvsps.fuzz=60 (integer)
- Specify the maximum time (in seconds) that is allowed between
- commits with identical user and log message in a single changeset.
- When very large files were checked in as part of a changeset then
- the default may not be long enough.
- --config convert.cvsps.mergeto='{{mergetobranch ([-\\w]+)}}'
- Specify a regular expression to which commit log messages are
- matched. If a match occurs, then the conversion process will
- insert a dummy revision merging the branch on which this log
- message occurs to the branch indicated in the regex.
- --config convert.cvsps.mergefrom='{{mergefrombranch ([-\\w]+)}}'
- Specify a regular expression to which commit log messages are
- matched. If a match occurs, then the conversion process will add
- the most recent revision on the branch indicated in the regex as
- the second parent of the changeset.
+
+ --config convert.cvsps.cache=True (boolean)
+ Set to False to disable remote log caching, for testing and debugging
+ purposes.
+ --config convert.cvsps.fuzz=60 (integer)
+ Specify the maximum time (in seconds) that is allowed between commits
+ with identical user and log message in a single changeset. When very
+ large files were checked in as part of a changeset then the default
+ may not be long enough.
+ --config convert.cvsps.mergeto='{{mergetobranch ([-\\w]+)}}'
+ Specify a regular expression to which commit log messages are matched.
+ If a match occurs, then the conversion process will insert a dummy
+ revision merging the branch on which this log message occurs to the
+ branch indicated in the regex.
+ --config convert.cvsps.mergefrom='{{mergefrombranch ([-\\w]+)}}'
+ Specify a regular expression to which commit log messages are matched.
+ If a match occurs, then the conversion process will add the most
+ recent revision on the branch indicated in the regex as the second
+ parent of the changeset.
The hgext/convert/cvsps wrapper script allows the builtin changeset
merging code to be run without doing a conversion. Its parameters and
@@ -211,7 +213,6 @@
--config convert.p4.startrev=0 (perforce changelist number)
specify initial Perforce revision.
-
Mercurial Destination
---------------------
--- a/tests/test-convert.out Thu Jul 09 19:49:02 2009 -0500
+++ b/tests/test-convert.out Thu Jul 09 20:15:15 2009 +0200
@@ -28,14 +28,15 @@
By default, all sources except Mercurial will use --branchsort. Mercurial
uses --sourcesort to preserve original revision numbers order. Sort modes
have the following effects:
- --branchsort: convert from parent to child revision when possible, which
- means branches are usually converted one after the other. It generates
- more compact repositories.
- --datesort: sort revisions by date. Converted repositories have
- good-looking changelogs but are often an order of magnitude larger
- than the same ones generated by --branchsort.
- --sourcesort: try to preserve source revisions order, only supported by
- Mercurial sources.
+
+ --branchsort: convert from parent to child revision when possible, which
+ means branches are usually converted one after the other. It generates
+ more compact repositories.
+ --datesort: sort revisions by date. Converted repositories have
+ good-looking changelogs but are often an order of magnitude larger than
+ the same ones generated by --branchsort.
+ --sourcesort: try to preserve source revisions order, only supported by
+ Mercurial sources.
If <REVMAP> isn't given, it will be put in a default location
(<dest>/.hg/shamap by default). The <REVMAP> is a simple text file that
@@ -119,7 +120,7 @@
its internal changeset merging code by default but can be configured to
call the external 'cvsps' program by setting:
- --config convert.cvsps='cvsps -A -u --cvs-direct -q'
+ --config convert.cvsps='cvsps -A -u --cvs-direct -q'
This option is deprecated and will be removed in Mercurial 1.4.
@@ -127,27 +128,28 @@
Internal cvsps is selected by setting
- --config convert.cvsps=builtin
+ --config convert.cvsps=builtin
and has a few more configurable options:
- --config convert.cvsps.cache=True (boolean)
- Set to False to disable remote log caching, for testing and
- debugging purposes.
- --config convert.cvsps.fuzz=60 (integer)
- Specify the maximum time (in seconds) that is allowed between
- commits with identical user and log message in a single changeset.
- When very large files were checked in as part of a changeset then
- the default may not be long enough.
- --config convert.cvsps.mergeto='{{mergetobranch ([-\w]+)}}'
- Specify a regular expression to which commit log messages are
- matched. If a match occurs, then the conversion process will
- insert a dummy revision merging the branch on which this log
- message occurs to the branch indicated in the regex.
- --config convert.cvsps.mergefrom='{{mergefrombranch ([-\w]+)}}'
- Specify a regular expression to which commit log messages are
- matched. If a match occurs, then the conversion process will add
- the most recent revision on the branch indicated in the regex as
- the second parent of the changeset.
+
+ --config convert.cvsps.cache=True (boolean)
+ Set to False to disable remote log caching, for testing and debugging
+ purposes.
+ --config convert.cvsps.fuzz=60 (integer)
+ Specify the maximum time (in seconds) that is allowed between commits
+ with identical user and log message in a single changeset. When very
+ large files were checked in as part of a changeset then the default
+ may not be long enough.
+ --config convert.cvsps.mergeto='{{mergetobranch ([-\w]+)}}'
+ Specify a regular expression to which commit log messages are matched.
+ If a match occurs, then the conversion process will insert a dummy
+ revision merging the branch on which this log message occurs to the
+ branch indicated in the regex.
+ --config convert.cvsps.mergefrom='{{mergefrombranch ([-\w]+)}}'
+ Specify a regular expression to which commit log messages are matched.
+ If a match occurs, then the conversion process will add the most
+ recent revision on the branch indicated in the regex as the second
+ parent of the changeset.
The hgext/convert/cvsps wrapper script allows the builtin changeset
merging code to be run without doing a conversion. Its parameters and
@@ -195,7 +197,6 @@
--config convert.p4.startrev=0 (perforce changelist number)
specify initial Perforce revision.
-
Mercurial Destination
---------------------