Show More
@@ -881,9 +881,9 b' class localrepository(repo.repository):' | |||
|
881 | 881 | If node2 is None, compare node1 with working directory. |
|
882 | 882 | """ |
|
883 | 883 | |
|
884 |
def fcmp(fn, |
|
|
884 | def fcmp(fn, getnode): | |
|
885 | 885 | t1 = self.wread(fn) |
|
886 |
return self.file(fn).cmp( |
|
|
886 | return self.file(fn).cmp(getnode(fn), t1) | |
|
887 | 887 | |
|
888 | 888 | def mfmatches(node): |
|
889 | 889 | change = self.changelog.read(node) |
@@ -922,8 +922,9 b' class localrepository(repo.repository):' | |||
|
922 | 922 | if lookup: |
|
923 | 923 | # do a full compare of any files that might have changed |
|
924 | 924 | mf2 = mfmatches(self.dirstate.parents()[0]) |
|
925 | getnode = lambda fn: mf2.get(fn, nullid) | |
|
925 | 926 | for f in lookup: |
|
926 |
if fcmp(f, |
|
|
927 | if fcmp(f, getnode): | |
|
927 | 928 | modified.append(f) |
|
928 | 929 | else: |
|
929 | 930 | clean.append(f) |
@@ -954,10 +955,12 b' class localrepository(repo.repository):' | |||
|
954 | 955 | # reasonable order |
|
955 | 956 | mf2keys = mf2.keys() |
|
956 | 957 | mf2keys.sort() |
|
958 | getnode = lambda fn: mf1.get(fn, nullid) | |
|
957 | 959 | for fn in mf2keys: |
|
958 | 960 | if mf1.has_key(fn): |
|
959 | 961 | if mf1.flags(fn) != mf2.flags(fn) or \ |
|
960 |
(mf1[fn] != mf2[fn] and (mf2[fn] != "" or |
|
|
962 | (mf1[fn] != mf2[fn] and (mf2[fn] != "" or | |
|
963 | fcmp(fn, getnode))): | |
|
961 | 964 | modified.append(fn) |
|
962 | 965 | elif list_clean: |
|
963 | 966 | clean.append(fn) |
General Comments 0
You need to be logged in to leave comments.
Login now