Show More
@@ -188,13 +188,18 b' class convert_svn(converter_source):' | |||||
188 | entries = [] |
|
188 | entries = [] | |
189 | rev = self.revid(revnum) |
|
189 | rev = self.revid(revnum) | |
190 | parents = [] |
|
190 | parents = [] | |
|
191 | ||||
|
192 | # branch log might return entries for a parent we already have | |||
|
193 | if rev in self.commits: | |||
|
194 | return | |||
|
195 | ||||
191 | try: |
|
196 | try: | |
192 | branch = self.module.split("/")[-1] |
|
197 | branch = self.module.split("/")[-1] | |
193 | if branch == 'trunk': |
|
198 | if branch == 'trunk': | |
194 | branch = '' |
|
199 | branch = '' | |
195 | except IndexError: |
|
200 | except IndexError: | |
196 | branch = None |
|
201 | branch = None | |
197 |
|
202 | |||
198 | for path in sorted(orig_paths): |
|
203 | for path in sorted(orig_paths): | |
199 | # self.ui.write("path %s\n" % path) |
|
204 | # self.ui.write("path %s\n" % path) | |
200 | if path == self.module: # Follow branching back in history |
|
205 | if path == self.module: # Follow branching back in history | |
@@ -487,6 +492,8 b' class convert_svn(converter_source):' | |||||
487 | files = self.files[rev] |
|
492 | files = self.files[rev] | |
488 | cl = files |
|
493 | cl = files | |
489 | cl.sort() |
|
494 | cl.sort() | |
|
495 | # caller caches the result, so free it here to release memory | |||
|
496 | del self.files[rev] | |||
490 | return cl |
|
497 | return cl | |
491 |
|
498 | |||
492 | def getcommit(self, rev): |
|
499 | def getcommit(self, rev): | |
@@ -496,7 +503,10 b' class convert_svn(converter_source):' | |||||
496 | self.reparent(module) |
|
503 | self.reparent(module) | |
497 | stop = self.lastrevs.get(module, 0) |
|
504 | stop = self.lastrevs.get(module, 0) | |
498 | self._fetch_revisions(from_revnum=revnum, to_revnum=stop) |
|
505 | self._fetch_revisions(from_revnum=revnum, to_revnum=stop) | |
499 |
|
|
506 | commit = self.commits[rev] | |
|
507 | # caller caches the result, so free it here to release memory | |||
|
508 | del self.commits[rev] | |||
|
509 | return commit | |||
500 |
|
510 | |||
501 | def gettags(self): |
|
511 | def gettags(self): | |
502 | tags = {} |
|
512 | tags = {} |
General Comments 0
You need to be logged in to leave comments.
Login now