Show More
@@ -377,20 +377,22 b' class convert_svn(converter_source):' | |||||
377 |
|
377 | |||
378 | orig_paths = orig_paths.items() |
|
378 | orig_paths = orig_paths.items() | |
379 | orig_paths.sort() |
|
379 | orig_paths.sort() | |
|
380 | ||||
|
381 | # check whether this revision is the start of a branch | |||
|
382 | path, ent = orig_paths and orig_paths[0] or (None, None) | |||
|
383 | if ent and path == self.module: | |||
|
384 | if ent.copyfrom_path: | |||
|
385 | # ent.copyfrom_rev may not be the actual last revision | |||
|
386 | prev = self.latest(ent.copyfrom_path, ent.copyfrom_rev) | |||
|
387 | self.modulemap[prev] = ent.copyfrom_path | |||
|
388 | parents = [self.revid(prev, ent.copyfrom_path)] | |||
|
389 | self.ui.note('found parent of branch %s at %d: %s\n' % \ | |||
|
390 | (self.module, prev, ent.copyfrom_path)) | |||
|
391 | else: | |||
|
392 | self.ui.debug("No copyfrom path, don't know what to do.\n") | |||
|
393 | ||||
380 | for path, ent in orig_paths: |
|
394 | for path, ent in orig_paths: | |
381 | # self.ui.write("path %s\n" % path) |
|
395 | # self.ui.write("path %s\n" % path) | |
382 | if path == self.module: # Follow branching back in history |
|
|||
383 | if ent: |
|
|||
384 | if ent.copyfrom_path: |
|
|||
385 | # ent.copyfrom_rev may not be the actual last revision |
|
|||
386 | prev = self.latest(ent.copyfrom_path, ent.copyfrom_rev) |
|
|||
387 | self.modulemap[prev] = ent.copyfrom_path |
|
|||
388 | parents = [self.revid(prev, ent.copyfrom_path)] |
|
|||
389 | self.ui.note('found parent of branch %s at %d: %s\n' % \ |
|
|||
390 | (self.module, prev, ent.copyfrom_path)) |
|
|||
391 | else: |
|
|||
392 | self.ui.debug("No copyfrom path, don't know what to do.\n") |
|
|||
393 | # Maybe it was added and there is no more history. |
|
|||
394 | entrypath = get_entry_from_path(path, module=self.module) |
|
396 | entrypath = get_entry_from_path(path, module=self.module) | |
395 | # self.ui.write("entrypath %s\n" % entrypath) |
|
397 | # self.ui.write("entrypath %s\n" % entrypath) | |
396 | if entrypath is None: |
|
398 | if entrypath is None: |
General Comments 0
You need to be logged in to leave comments.
Login now