Show More
@@ -431,9 +431,6 b' class mercurial_sink(converter_sink):' | |||||
431 | class mercurial_source(converter_source): |
|
431 | class mercurial_source(converter_source): | |
432 | def __init__(self, ui, path, revs=None): |
|
432 | def __init__(self, ui, path, revs=None): | |
433 | converter_source.__init__(self, ui, path, revs) |
|
433 | converter_source.__init__(self, ui, path, revs) | |
434 | if revs and len(revs) > 1: |
|
|||
435 | raise util.Abort(_("mercurial source does not support specifying " |
|
|||
436 | "multiple revisions")) |
|
|||
437 | self.ignoreerrors = ui.configbool('convert', 'hg.ignoreerrors', False) |
|
434 | self.ignoreerrors = ui.configbool('convert', 'hg.ignoreerrors', False) | |
438 | self.ignored = set() |
|
435 | self.ignored = set() | |
439 | self.saverev = ui.configbool('convert', 'hg.saverev', False) |
|
436 | self.saverev = ui.configbool('convert', 'hg.saverev', False) | |
@@ -468,7 +465,7 b' class mercurial_source(converter_source)' | |||||
468 | else: |
|
465 | else: | |
469 | self.keep = util.always |
|
466 | self.keep = util.always | |
470 | if revs: |
|
467 | if revs: | |
471 |
self._heads = [self.repo[r |
|
468 | self._heads = [self.repo[r].node() for r in revs] | |
472 | else: |
|
469 | else: | |
473 | self._heads = self.repo.heads() |
|
470 | self._heads = self.repo.heads() | |
474 | else: |
|
471 | else: |
@@ -201,4 +201,23 b' Convert from revset in convert.hg.revs' | |||||
201 | | |
|
201 | | | |
202 | o 0 "0: add a b f" files: a b f |
|
202 | o 0 "0: add a b f" files: a b f | |
203 |
|
203 | |||
204 | $ cd .. |
|
204 | Convert from specified revs | |
|
205 | ||||
|
206 | $ hg convert --rev 3 --rev 2 source multiplerevs | |||
|
207 | initializing destination multiplerevs repository | |||
|
208 | scanning source... | |||
|
209 | sorting... | |||
|
210 | converting... | |||
|
211 | 3 0: add a b f | |||
|
212 | 2 1: add c, move f to d | |||
|
213 | 1 2: copy e from a, change b | |||
|
214 | 0 3: change a | |||
|
215 | $ glog multiplerevs | |||
|
216 | o 3 "3: change a" files: a | |||
|
217 | | | |||
|
218 | | o 2 "2: copy e from a, change b" files: b e | |||
|
219 | | | | |||
|
220 | | o 1 "1: add c, move f to d" files: c d f | |||
|
221 | |/ | |||
|
222 | o 0 "0: add a b f" files: a b f | |||
|
223 |
General Comments 0
You need to be logged in to leave comments.
Login now