Show More
@@ -70,10 +70,10 b' def convert(ui, src, dest=None, revmapfi' | |||
|
70 | 70 | updated on each commit copied, so :hg:`convert` can be interrupted |
|
71 | 71 | and can be run repeatedly to copy new commits. |
|
72 | 72 | |
|
73 |
The |
|
|
74 |
|
|
|
75 |
|
|
|
76 |
|
|
|
73 | The authormap is a simple text file that maps each source commit | |
|
74 | author to a destination commit author. It is handy for source SCMs | |
|
75 | that use unix logins to identify authors (eg: CVS). One line per | |
|
76 | author mapping and the line format is:: | |
|
77 | 77 | |
|
78 | 78 | source author = destination author |
|
79 | 79 | |
@@ -275,13 +275,16 b' cmdtable = {' | |||
|
275 | 275 | "convert": |
|
276 | 276 | (convert, |
|
277 | 277 | [('A', 'authors', '', |
|
278 |
_('username mapping filename'), |
|
|
278 | _('username mapping filename (DEPRECATED, use --authormap instead)'), | |
|
279 | _('FILE')), | |
|
279 | 280 | ('s', 'source-type', '', |
|
280 | 281 | _('source repository type'), _('TYPE')), |
|
281 | 282 | ('d', 'dest-type', '', |
|
282 | 283 | _('destination repository type'), _('TYPE')), |
|
283 | 284 | ('r', 'rev', '', |
|
284 | 285 | _('import up to target revision REV'), _('REV')), |
|
286 | ('', 'authormap', '', | |
|
287 | _('remap usernames using this file'), _('FILE')), | |
|
285 | 288 | ('', 'filemap', '', |
|
286 | 289 | _('remap file names using contents of file'), _('FILE')), |
|
287 | 290 | ('', 'splicemap', '', |
@@ -112,8 +112,8 b' class converter(object):' | |||
|
112 | 112 | if authorfile and os.path.exists(authorfile): |
|
113 | 113 | self.readauthormap(authorfile) |
|
114 | 114 | # Extend/Override with new author map if necessary |
|
115 |
if opts.get('author |
|
|
116 |
self.readauthormap(opts.get('author |
|
|
115 | if opts.get('authormap'): | |
|
116 | self.readauthormap(opts.get('authormap')) | |
|
117 | 117 | self.authorfile = self.dest.authorfile() |
|
118 | 118 | |
|
119 | 119 | self.splicemap = mapfile(ui, opts.get('splicemap')) |
@@ -392,6 +392,10 b' def convert(ui, src, dest=None, revmapfi' | |||
|
392 | 392 | orig_encoding = encoding.encoding |
|
393 | 393 | encoding.encoding = 'UTF-8' |
|
394 | 394 | |
|
395 | # support --authors as an alias for --authormap | |
|
396 | if not opts.get('authormap'): | |
|
397 | opts['authormap'] = opts.get('authors') | |
|
398 | ||
|
395 | 399 | if not dest: |
|
396 | 400 | dest = hg.defaultdest(src) + "-hg" |
|
397 | 401 | ui.status(_("assuming destination %s\n") % dest) |
@@ -51,10 +51,10 b' convert a foreign SCM repository to a Me' | |||
|
51 | 51 | each commit copied, so "hg convert" can be interrupted and can be run |
|
52 | 52 | repeatedly to copy new commits. |
|
53 | 53 | |
|
54 |
The |
|
|
55 |
|
|
|
56 |
|
|
|
57 |
|
|
|
54 | The authormap is a simple text file that maps each source commit author to | |
|
55 | a destination commit author. It is handy for source SCMs that use unix | |
|
56 | logins to identify authors (eg: CVS). One line per author mapping and the | |
|
57 | line format is: | |
|
58 | 58 | |
|
59 | 59 | source author = destination author |
|
60 | 60 | |
@@ -236,10 +236,10 b' convert a foreign SCM repository to a Me' | |||
|
236 | 236 | |
|
237 | 237 | options: |
|
238 | 238 | |
|
239 | -A --authors FILE username mapping filename | |
|
240 | 239 | -s --source-type TYPE source repository type |
|
241 | 240 | -d --dest-type TYPE destination repository type |
|
242 | 241 | -r --rev REV import up to target revision REV |
|
242 | --authormap FILE remap usernames using this file | |
|
243 | 243 | --filemap FILE remap file names using contents of file |
|
244 | 244 | --splicemap FILE splice synthesized history into place |
|
245 | 245 | --branchmap FILE change branch names while converting |
General Comments 0
You need to be logged in to leave comments.
Login now