Show More
@@ -141,16 +141,16 b' def convert(ui, src, dest=None, revmapfi' | |||||
141 | The Mercurial source recognizes the following configuration |
|
141 | The Mercurial source recognizes the following configuration | |
142 | options, which you can set on the command line with ``--config``: |
|
142 | options, which you can set on the command line with ``--config``: | |
143 |
|
143 | |||
144 | :convert.hg.ignoreerrors: ignore integrity |
|
144 | :convert.hg.ignoreerrors: ignore integrity errors when reading. | |
145 |
|
|
145 | Use it to fix Mercurial repositories with missing revlogs, by | |
146 |
|
|
146 | converting from and to Mercurial. Default is False. | |
147 | is False. |
|
147 | ||
148 | :convert.hg.saverev: store original. |
|
148 | :convert.hg.saverev: store original. revision ID in changeset | |
149 |
|
|
149 | (forces target IDs to change). It takes and boolean argument | |
150 |
|
|
150 | and defaults to False. | |
151 | :convert.hg.startrev: convert |
|
151 | ||
152 | start revision and its descendants. It takes a hg revision identifier |
|
152 | :convert.hg.startrev: convert start revision and its descendants. | |
153 | and defaults to 0. |
|
153 | It takes a hg revision identifier and defaults to 0. | |
154 |
|
154 | |||
155 | CVS Source |
|
155 | CVS Source | |
156 | '''''''''' |
|
156 | '''''''''' | |
@@ -167,30 +167,37 b' def convert(ui, src, dest=None, revmapfi' | |||||
167 |
|
167 | |||
168 | The following options can be used with ``--config``: |
|
168 | The following options can be used with ``--config``: | |
169 |
|
169 | |||
170 | :convert.cvsps.cache: Set to False to disable |
|
170 | :convert.cvsps.cache: Set to False to disable remote log caching, | |
171 |
|
|
171 | for testing and debugging purposes. Default is True. | |
172 | :convert.cvsps.fuzz: Specify the maximum |
|
172 | ||
173 | time (in seconds) that is allowed between commits with identical user |
|
173 | :convert.cvsps.fuzz: Specify the maximum time (in seconds) that is | |
174 | and log message in a single changeset. When very large files were |
|
174 | allowed between commits with identical user and log message in | |
175 | checked in as part of a changeset then the default may not be long |
|
175 | a single changeset. When very large files were checked in as | |
176 | enough. The default is 60. |
|
176 | part of a changeset then the default may not be long enough. | |
177 | :convert.cvsps.mergeto: Specify a |
|
177 | The default is 60. | |
178 | regular expression to which commit log messages are matched. If a |
|
178 | ||
179 | match occurs, then the conversion process will insert a dummy |
|
179 | :convert.cvsps.mergeto: Specify a regular expression to which | |
180 | revision merging the branch on which this log message occurs to the |
|
180 | commit log messages are matched. If a match occurs, then the | |
181 | branch indicated in the regex. Default is ``{{mergetobranch ([-\\w]+)}}`` |
|
181 | conversion process will insert a dummy revision merging the | |
182 | :convert.cvsps.mergefrom: Specify a |
|
182 | branch on which this log message occurs to the branch | |
183 | regular expression to which commit log messages are matched. If a |
|
183 | indicated in the regex. Default is ``{{mergetobranch | |
184 | match occurs, then the conversion process will add the most recent |
|
184 | ([-\\w]+)}}`` | |
185 | revision on the branch indicated in the regex as the second parent of |
|
185 | ||
186 | the changeset. Default is ``{{mergefrombranch ([-\\w]+)}}`` |
|
186 | :convert.cvsps.mergefrom: Specify a regular expression to which | |
|
187 | commit log messages are matched. If a match occurs, then the | |||
|
188 | conversion process will add the most recent revision on the | |||
|
189 | branch indicated in the regex as the second parent of the | |||
|
190 | changeset. Default is ``{{mergefrombranch ([-\\w]+)}}`` | |||
|
191 | ||||
187 | :hook.cvslog: Specify a Python function to be called at the end of |
|
192 | :hook.cvslog: Specify a Python function to be called at the end of | |
188 |
gathering the CVS log. The function is passed a list with the |
|
193 | gathering the CVS log. The function is passed a list with the | |
189 |
entries, and can modify the entries in-place, or add or |
|
194 | log entries, and can modify the entries in-place, or add or | |
190 | :hook.cvschangesets: Specify a Python function to be called after the |
|
195 | delete them. | |
191 | changesets are calculated from the the CVS log. The function is passed |
|
196 | ||
192 | a list with the changeset entries, and can modify the changesets |
|
197 | :hook.cvschangesets: Specify a Python function to be called after | |
193 | in-place, or add or delete them. |
|
198 | the changesets are calculated from the the CVS log. The | |
|
199 | function is passed a list with the changeset entries, and can | |||
|
200 | modify the changesets in-place, or add or delete them. | |||
194 |
|
201 | |||
195 | An additional "debugcvsps" Mercurial command allows the builtin |
|
202 | An additional "debugcvsps" Mercurial command allows the builtin | |
196 | changeset merging code to be run without doing a conversion. Its |
|
203 | changeset merging code to be run without doing a conversion. Its | |
@@ -213,19 +220,21 b' def convert(ui, src, dest=None, revmapfi' | |||||
213 |
|
220 | |||
214 | The following options can be set with ``--config``: |
|
221 | The following options can be set with ``--config``: | |
215 |
|
222 | |||
216 | :convert.svn.branches: specify the directory |
|
223 | :convert.svn.branches: specify the directory containing branches. | |
217 |
|
|
224 | The defaults is branches. | |
218 | :convert.svn.tags: specify the directory |
|
225 | ||
219 | containing tags. The default is tags. |
|
226 | :convert.svn.tags: specify the directory containing tags. The | |
220 | :convert.svn.trunk: specify the name of |
|
227 | default is tags. | |
221 | the trunk branch The defauls is trunk. |
|
228 | ||
|
229 | :convert.svn.trunk: specify the name of the trunk branch The | |||
|
230 | defauls is trunk. | |||
222 |
|
231 | |||
223 | Source history can be retrieved starting at a specific revision, |
|
232 | Source history can be retrieved starting at a specific revision, | |
224 | instead of being integrally converted. Only single branch |
|
233 | instead of being integrally converted. Only single branch | |
225 | conversions are supported. |
|
234 | conversions are supported. | |
226 |
|
235 | |||
227 | :convert.svn.startrev: specify start |
|
236 | :convert.svn.startrev: specify start Subversion revision number. | |
228 |
|
|
237 | The default is 0. | |
229 |
|
238 | |||
230 | Perforce Source |
|
239 | Perforce Source | |
231 | ''''''''''''''' |
|
240 | ''''''''''''''' | |
@@ -240,20 +249,22 b' def convert(ui, src, dest=None, revmapfi' | |||||
240 | It is possible to limit the amount of source history to be |
|
249 | It is possible to limit the amount of source history to be | |
241 | converted by specifying an initial Perforce revision: |
|
250 | converted by specifying an initial Perforce revision: | |
242 |
|
251 | |||
243 | :convert.p4.startrev: specify |
|
252 | :convert.p4.startrev: specify initial Perforce revision, a | |
244 |
|
|
253 | Perforce changelist number). | |
245 |
|
254 | |||
246 | Mercurial Destination |
|
255 | Mercurial Destination | |
247 | ''''''''''''''''''''' |
|
256 | ''''''''''''''''''''' | |
248 |
|
257 | |||
249 | The following options are supported: |
|
258 | The following options are supported: | |
250 |
|
259 | |||
251 | :convert.hg.clonebranches: dispatch source |
|
260 | :convert.hg.clonebranches: dispatch source branches in separate | |
252 |
|
|
261 | clones. The default is False. | |
|
262 | ||||
253 | :convert.hg.tagsbranch: branch name for tag revisions, defaults to |
|
263 | :convert.hg.tagsbranch: branch name for tag revisions, defaults to | |
254 | ``default``. |
|
264 | ``default``. | |
255 | :convert.hg.usebranchnames: preserve branch names. The default is True |
|
|||
256 |
|
265 | |||
|
266 | :convert.hg.usebranchnames: preserve branch names. The default is | |||
|
267 | True | |||
257 | """ |
|
268 | """ | |
258 | return convcmd.convert(ui, src, dest, revmapfile, **opts) |
|
269 | return convcmd.convert(ui, src, dest, revmapfile, **opts) | |
259 |
|
270 |
General Comments 0
You need to be logged in to leave comments.
Login now