Mercurial > hg
comparison tests/test-convert.out @ 9103:9c7a5d70e72f
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.
| author | Martin Geisler <mg@lazybytes.net> |
|---|---|
| date | Thu, 09 Jul 2009 20:15:15 +0200 |
| parents | f459f09b4214 |
| children | 9261667e9b82 |
comparison
equal
deleted
inserted
replaced
| 9102:bbc78cb1bf15 | 9103:9c7a5d70e72f |
|---|---|
| 26 exist, it will be created. | 26 exist, it will be created. |
| 27 | 27 |
| 28 By default, all sources except Mercurial will use --branchsort. Mercurial | 28 By default, all sources except Mercurial will use --branchsort. Mercurial |
| 29 uses --sourcesort to preserve original revision numbers order. Sort modes | 29 uses --sourcesort to preserve original revision numbers order. Sort modes |
| 30 have the following effects: | 30 have the following effects: |
| 31 --branchsort: convert from parent to child revision when possible, which | 31 |
| 32 means branches are usually converted one after the other. It generates | 32 --branchsort: convert from parent to child revision when possible, which |
| 33 more compact repositories. | 33 means branches are usually converted one after the other. It generates |
| 34 --datesort: sort revisions by date. Converted repositories have | 34 more compact repositories. |
| 35 good-looking changelogs but are often an order of magnitude larger | 35 --datesort: sort revisions by date. Converted repositories have |
| 36 than the same ones generated by --branchsort. | 36 good-looking changelogs but are often an order of magnitude larger than |
| 37 --sourcesort: try to preserve source revisions order, only supported by | 37 the same ones generated by --branchsort. |
| 38 Mercurial sources. | 38 --sourcesort: try to preserve source revisions order, only supported by |
| 39 Mercurial sources. | |
| 39 | 40 |
| 40 If <REVMAP> isn't given, it will be put in a default location | 41 If <REVMAP> isn't given, it will be put in a default location |
| 41 (<dest>/.hg/shamap by default). The <REVMAP> is a simple text file that | 42 (<dest>/.hg/shamap by default). The <REVMAP> is a simple text file that |
| 42 maps each source commit ID to the destination ID for that revision, like | 43 maps each source commit ID to the destination ID for that revision, like |
| 43 so: | 44 so: |
| 117 Because CVS does not have changesets, it is necessary to collect | 118 Because CVS does not have changesets, it is necessary to collect |
| 118 individual commits to CVS and merge them into changesets. CVS source uses | 119 individual commits to CVS and merge them into changesets. CVS source uses |
| 119 its internal changeset merging code by default but can be configured to | 120 its internal changeset merging code by default but can be configured to |
| 120 call the external 'cvsps' program by setting: | 121 call the external 'cvsps' program by setting: |
| 121 | 122 |
| 122 --config convert.cvsps='cvsps -A -u --cvs-direct -q' | 123 --config convert.cvsps='cvsps -A -u --cvs-direct -q' |
| 123 | 124 |
| 124 This option is deprecated and will be removed in Mercurial 1.4. | 125 This option is deprecated and will be removed in Mercurial 1.4. |
| 125 | 126 |
| 126 The options shown are the defaults. | 127 The options shown are the defaults. |
| 127 | 128 |
| 128 Internal cvsps is selected by setting | 129 Internal cvsps is selected by setting |
| 129 | 130 |
| 130 --config convert.cvsps=builtin | 131 --config convert.cvsps=builtin |
| 131 | 132 |
| 132 and has a few more configurable options: | 133 and has a few more configurable options: |
| 133 --config convert.cvsps.cache=True (boolean) | 134 |
| 134 Set to False to disable remote log caching, for testing and | 135 --config convert.cvsps.cache=True (boolean) |
| 135 debugging purposes. | 136 Set to False to disable remote log caching, for testing and debugging |
| 136 --config convert.cvsps.fuzz=60 (integer) | 137 purposes. |
| 137 Specify the maximum time (in seconds) that is allowed between | 138 --config convert.cvsps.fuzz=60 (integer) |
| 138 commits with identical user and log message in a single changeset. | 139 Specify the maximum time (in seconds) that is allowed between commits |
| 139 When very large files were checked in as part of a changeset then | 140 with identical user and log message in a single changeset. When very |
| 140 the default may not be long enough. | 141 large files were checked in as part of a changeset then the default |
| 141 --config convert.cvsps.mergeto='{{mergetobranch ([-\w]+)}}' | 142 may not be long enough. |
| 142 Specify a regular expression to which commit log messages are | 143 --config convert.cvsps.mergeto='{{mergetobranch ([-\w]+)}}' |
| 143 matched. If a match occurs, then the conversion process will | 144 Specify a regular expression to which commit log messages are matched. |
| 144 insert a dummy revision merging the branch on which this log | 145 If a match occurs, then the conversion process will insert a dummy |
| 145 message occurs to the branch indicated in the regex. | 146 revision merging the branch on which this log message occurs to the |
| 146 --config convert.cvsps.mergefrom='{{mergefrombranch ([-\w]+)}}' | 147 branch indicated in the regex. |
| 147 Specify a regular expression to which commit log messages are | 148 --config convert.cvsps.mergefrom='{{mergefrombranch ([-\w]+)}}' |
| 148 matched. If a match occurs, then the conversion process will add | 149 Specify a regular expression to which commit log messages are matched. |
| 149 the most recent revision on the branch indicated in the regex as | 150 If a match occurs, then the conversion process will add the most |
| 150 the second parent of the changeset. | 151 recent revision on the branch indicated in the regex as the second |
| 152 parent of the changeset. | |
| 151 | 153 |
| 152 The hgext/convert/cvsps wrapper script allows the builtin changeset | 154 The hgext/convert/cvsps wrapper script allows the builtin changeset |
| 153 merging code to be run without doing a conversion. Its parameters and | 155 merging code to be run without doing a conversion. Its parameters and |
| 154 output are similar to that of cvsps 2.1. | 156 output are similar to that of cvsps 2.1. |
| 155 | 157 |
| 192 It is possible to limit the amount of source history to be converted by | 194 It is possible to limit the amount of source history to be converted by |
| 193 specifying an initial Perforce revision. | 195 specifying an initial Perforce revision. |
| 194 | 196 |
| 195 --config convert.p4.startrev=0 (perforce changelist number) | 197 --config convert.p4.startrev=0 (perforce changelist number) |
| 196 specify initial Perforce revision. | 198 specify initial Perforce revision. |
| 197 | |
| 198 | 199 |
| 199 Mercurial Destination | 200 Mercurial Destination |
| 200 --------------------- | 201 --------------------- |
| 201 | 202 |
| 202 --config convert.hg.clonebranches=False (boolean) | 203 --config convert.hg.clonebranches=False (boolean) |