Show More
@@ -18,7 +18,6 b' from mercurial.pycompat import (' | |||||
18 | from mercurial import ( |
|
18 | from mercurial import ( | |
19 | encoding, |
|
19 | encoding, | |
20 | error, |
|
20 | error, | |
21 | pycompat, |
|
|||
22 | util, |
|
21 | util, | |
23 | ) |
|
22 | ) | |
24 | from mercurial.utils import ( |
|
23 | from mercurial.utils import ( | |
@@ -316,7 +315,7 b' class convert_cvs(converter_source):' | |||||
316 | if full: |
|
315 | if full: | |
317 | raise error.Abort(_(b"convert from cvs does not support --full")) |
|
316 | raise error.Abort(_(b"convert from cvs does not support --full")) | |
318 | self._parse() |
|
317 | self._parse() | |
319 |
return sorted |
|
318 | return sorted(self.files[rev].items()), {}, set() | |
320 |
|
319 | |||
321 | def getcommit(self, rev): |
|
320 | def getcommit(self, rev): | |
322 | self._parse() |
|
321 | self._parse() |
@@ -39,7 +39,6 b' from mercurial import (' | |||||
39 | merge as mergemod, |
|
39 | merge as mergemod, | |
40 | mergestate, |
|
40 | mergestate, | |
41 | phases, |
|
41 | phases, | |
42 | pycompat, |
|
|||
43 | util, |
|
42 | util, | |
44 | ) |
|
43 | ) | |
45 | from mercurial.utils import dateutil |
|
44 | from mercurial.utils import dateutil | |
@@ -423,7 +422,7 b' class mercurial_sink(common.converter_si' | |||||
423 | tagparent = tagparent or self.repo.nullid |
|
422 | tagparent = tagparent or self.repo.nullid | |
424 |
|
423 | |||
425 | oldlines = set() |
|
424 | oldlines = set() | |
426 |
for branch, heads in |
|
425 | for branch, heads in self.repo.branchmap().items(): | |
427 | for h in heads: |
|
426 | for h in heads: | |
428 | if b'.hgtags' in self.repo[h]: |
|
427 | if b'.hgtags' in self.repo[h]: | |
429 | oldlines.update( |
|
428 | oldlines.update( |
General Comments 0
You need to be logged in to leave comments.
Login now