Show More
@@ -618,7 +618,11 b' class localrepository(object):' | |||
|
618 | 618 | del mf[fn] |
|
619 | 619 | return mf |
|
620 | 620 | |
|
621 | if node1: | |
|
621 | compareworking = False | |
|
622 | if not node1 or node1 == self.dirstate.parents()[0]: | |
|
623 | compareworking = True | |
|
624 | ||
|
625 | if not compareworking: | |
|
622 | 626 | # read the manifest from node1 before the manifest from node2, |
|
623 | 627 | # so that we'll hit the manifest cache if we're going through |
|
624 | 628 | # all the revisions in parent->child order. |
@@ -635,7 +639,7 b' class localrepository(object):' | |||
|
635 | 639 | self.dirstate.changes(files, match, show_ignored)) |
|
636 | 640 | |
|
637 | 641 | # are we comparing working dir against its parent? |
|
638 |
if |
|
|
642 | if compareworking: | |
|
639 | 643 | if lookup: |
|
640 | 644 | # do a full compare of any files that might have changed |
|
641 | 645 | mf2 = mfmatches(self.dirstate.parents()[0]) |
@@ -658,11 +662,15 b' class localrepository(object):' | |||
|
658 | 662 | deleted, unknown, ignored = [], [], [] |
|
659 | 663 | mf2 = mfmatches(node2) |
|
660 | 664 | |
|
661 |
if no |
|
|
665 | if not compareworking: | |
|
662 | 666 | # flush lists from dirstate before comparing manifests |
|
663 | 667 | modified, added = [], [] |
|
664 | 668 | |
|
665 | for fn in mf2: | |
|
669 | # make sure to sort the files so we talk to the disk in a | |
|
670 | # reasonable order | |
|
671 | mf2keys = mf2.keys() | |
|
672 | mf2keys.sort() | |
|
673 | for fn in mf2keys: | |
|
666 | 674 | if mf1.has_key(fn): |
|
667 | 675 | if mf1[fn] != mf2[fn] and (mf2[fn] != "" or fcmp(fn, mf1)): |
|
668 | 676 | modified.append(fn) |
General Comments 0
You need to be logged in to leave comments.
Login now