Show More
@@ -507,6 +507,10 b' class mercurial_source(converter_source)' | |||
|
507 | 507 | except error.LookupError: |
|
508 | 508 | return None, None |
|
509 | 509 | |
|
510 | def _changedfiles(self, ctx1, ctx2): | |
|
511 | m, a, r = ctx1.status(ctx2)[:3] | |
|
512 | return (m + a, r) | |
|
513 | ||
|
510 | 514 | def getchanges(self, rev, full): |
|
511 | 515 | ctx = self._changectx(rev) |
|
512 | 516 | parents = self._parents(ctx) |
@@ -514,12 +518,12 b' class mercurial_source(converter_source)' | |||
|
514 | 518 | files = copyfiles = ctx.manifest() |
|
515 | 519 | if parents: |
|
516 | 520 | if self._changescache[0] == rev: |
|
517 |
m |
|
|
521 | ma, r = self._changescache[1] | |
|
518 | 522 | else: |
|
519 |
m |
|
|
523 | ma, r = self._changedfiles(parents[0], ctx) | |
|
520 | 524 | if not full: |
|
521 |
files = m |
|
|
522 |
copyfiles = m |
|
|
525 | files = ma + r | |
|
526 | copyfiles = ma | |
|
523 | 527 | # _getcopies() is also run for roots and before filtering so missing |
|
524 | 528 | # revlogs are detected early |
|
525 | 529 | copies = self._getcopies(ctx, parents, copyfiles) |
@@ -582,16 +586,16 b' class mercurial_source(converter_source)' | |||
|
582 | 586 | parents = self._parents(ctx) |
|
583 | 587 | if not parents and i is None: |
|
584 | 588 | i = 0 |
|
585 |
|
|
|
589 | ma, r = ctx.manifest().keys(), [] | |
|
586 | 590 | else: |
|
587 | 591 | i = i or 0 |
|
588 |
|
|
|
589 |
|
|
|
592 | ma, r = self._changedfiles(parents[i], ctx) | |
|
593 | ma, r = [[f for f in l if f not in self.ignored] for l in (ma, r)] | |
|
590 | 594 | |
|
591 | 595 | if i == 0: |
|
592 |
self._changescache = (rev, |
|
|
596 | self._changescache = (rev, (ma, r)) | |
|
593 | 597 | |
|
594 | return changes[0] + changes[1] + changes[2] | |
|
598 | return ma + r | |
|
595 | 599 | |
|
596 | 600 | def converted(self, rev, destrev): |
|
597 | 601 | if self.convertfp is None: |
General Comments 0
You need to be logged in to leave comments.
Login now