Mercurial > hg
comparison hgext/convert/__init__.py @ 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 |
|---|---|
| 42 exist, it will be created. | 42 exist, it will be created. |
| 43 | 43 |
| 44 By default, all sources except Mercurial will use --branchsort. Mercurial | 44 By default, all sources except Mercurial will use --branchsort. Mercurial |
| 45 uses --sourcesort to preserve original revision numbers order. Sort modes | 45 uses --sourcesort to preserve original revision numbers order. Sort modes |
| 46 have the following effects: | 46 have the following effects: |
| 47 --branchsort: convert from parent to child revision when possible, which | 47 |
| 48 means branches are usually converted one after the other. It generates | 48 --branchsort: convert from parent to child revision when possible, which |
| 49 more compact repositories. | 49 means branches are usually converted one after the other. It generates |
| 50 --datesort: sort revisions by date. Converted repositories have | 50 more compact repositories. |
| 51 good-looking changelogs but are often an order of magnitude larger | 51 --datesort: sort revisions by date. Converted repositories have |
| 52 than the same ones generated by --branchsort. | 52 good-looking changelogs but are often an order of magnitude larger than |
| 53 --sourcesort: try to preserve source revisions order, only supported by | 53 the same ones generated by --branchsort. |
| 54 Mercurial sources. | 54 --sourcesort: try to preserve source revisions order, only supported by |
| 55 Mercurial sources. | |
| 55 | 56 |
| 56 If <REVMAP> isn't given, it will be put in a default location | 57 If <REVMAP> isn't given, it will be put in a default location |
| 57 (<dest>/.hg/shamap by default). The <REVMAP> is a simple text file that | 58 (<dest>/.hg/shamap by default). The <REVMAP> is a simple text file that |
| 58 maps each source commit ID to the destination ID for that revision, like | 59 maps each source commit ID to the destination ID for that revision, like |
| 59 so: | 60 so: |
| 133 Because CVS does not have changesets, it is necessary to collect | 134 Because CVS does not have changesets, it is necessary to collect |
| 134 individual commits to CVS and merge them into changesets. CVS source uses | 135 individual commits to CVS and merge them into changesets. CVS source uses |
| 135 its internal changeset merging code by default but can be configured to | 136 its internal changeset merging code by default but can be configured to |
| 136 call the external 'cvsps' program by setting: | 137 call the external 'cvsps' program by setting: |
| 137 | 138 |
| 138 --config convert.cvsps='cvsps -A -u --cvs-direct -q' | 139 --config convert.cvsps='cvsps -A -u --cvs-direct -q' |
| 139 | 140 |
| 140 This option is deprecated and will be removed in Mercurial 1.4. | 141 This option is deprecated and will be removed in Mercurial 1.4. |
| 141 | 142 |
| 142 The options shown are the defaults. | 143 The options shown are the defaults. |
| 143 | 144 |
| 144 Internal cvsps is selected by setting | 145 Internal cvsps is selected by setting |
| 145 | 146 |
| 146 --config convert.cvsps=builtin | 147 --config convert.cvsps=builtin |
| 147 | 148 |
| 148 and has a few more configurable options: | 149 and has a few more configurable options: |
| 149 --config convert.cvsps.cache=True (boolean) | 150 |
| 150 Set to False to disable remote log caching, for testing and | 151 --config convert.cvsps.cache=True (boolean) |
| 151 debugging purposes. | 152 Set to False to disable remote log caching, for testing and debugging |
| 152 --config convert.cvsps.fuzz=60 (integer) | 153 purposes. |
| 153 Specify the maximum time (in seconds) that is allowed between | 154 --config convert.cvsps.fuzz=60 (integer) |
| 154 commits with identical user and log message in a single changeset. | 155 Specify the maximum time (in seconds) that is allowed between commits |
| 155 When very large files were checked in as part of a changeset then | 156 with identical user and log message in a single changeset. When very |
| 156 the default may not be long enough. | 157 large files were checked in as part of a changeset then the default |
| 157 --config convert.cvsps.mergeto='{{mergetobranch ([-\\w]+)}}' | 158 may not be long enough. |
| 158 Specify a regular expression to which commit log messages are | 159 --config convert.cvsps.mergeto='{{mergetobranch ([-\\w]+)}}' |
| 159 matched. If a match occurs, then the conversion process will | 160 Specify a regular expression to which commit log messages are matched. |
| 160 insert a dummy revision merging the branch on which this log | 161 If a match occurs, then the conversion process will insert a dummy |
| 161 message occurs to the branch indicated in the regex. | 162 revision merging the branch on which this log message occurs to the |
| 162 --config convert.cvsps.mergefrom='{{mergefrombranch ([-\\w]+)}}' | 163 branch indicated in the regex. |
| 163 Specify a regular expression to which commit log messages are | 164 --config convert.cvsps.mergefrom='{{mergefrombranch ([-\\w]+)}}' |
| 164 matched. If a match occurs, then the conversion process will add | 165 Specify a regular expression to which commit log messages are matched. |
| 165 the most recent revision on the branch indicated in the regex as | 166 If a match occurs, then the conversion process will add the most |
| 166 the second parent of the changeset. | 167 recent revision on the branch indicated in the regex as the second |
| 168 parent of the changeset. | |
| 167 | 169 |
| 168 The hgext/convert/cvsps wrapper script allows the builtin changeset | 170 The hgext/convert/cvsps wrapper script allows the builtin changeset |
| 169 merging code to be run without doing a conversion. Its parameters and | 171 merging code to be run without doing a conversion. Its parameters and |
| 170 output are similar to that of cvsps 2.1. | 172 output are similar to that of cvsps 2.1. |
| 171 | 173 |
| 208 It is possible to limit the amount of source history to be converted by | 210 It is possible to limit the amount of source history to be converted by |
| 209 specifying an initial Perforce revision. | 211 specifying an initial Perforce revision. |
| 210 | 212 |
| 211 --config convert.p4.startrev=0 (perforce changelist number) | 213 --config convert.p4.startrev=0 (perforce changelist number) |
| 212 specify initial Perforce revision. | 214 specify initial Perforce revision. |
| 213 | |
| 214 | 215 |
| 215 Mercurial Destination | 216 Mercurial Destination |
| 216 --------------------- | 217 --------------------- |
| 217 | 218 |
| 218 --config convert.hg.clonebranches=False (boolean) | 219 --config convert.hg.clonebranches=False (boolean) |