equal
deleted
inserted
replaced
21 newnodeid, |
21 newnodeid, |
22 nullid, |
22 nullid, |
23 nullrev, |
23 nullrev, |
24 short, |
24 short, |
25 wdirid, |
25 wdirid, |
|
26 wdirnodes, |
26 ) |
27 ) |
27 from . import ( |
28 from . import ( |
28 encoding, |
29 encoding, |
29 error, |
30 error, |
30 fileset, |
31 fileset, |
138 added.append(fn) |
139 added.append(fn) |
139 elif node2 is None: |
140 elif node2 is None: |
140 removed.append(fn) |
141 removed.append(fn) |
141 elif flag1 != flag2: |
142 elif flag1 != flag2: |
142 modified.append(fn) |
143 modified.append(fn) |
143 elif node2 != newnodeid: |
144 elif node2 not in wdirnodes: |
144 # When comparing files between two commits, we save time by |
145 # When comparing files between two commits, we save time by |
145 # not comparing the file contents when the nodeids differ. |
146 # not comparing the file contents when the nodeids differ. |
146 # Note that this means we incorrectly report a reverted change |
147 # Note that this means we incorrectly report a reverted change |
147 # to a file as a modification. |
148 # to a file as a modification. |
148 modified.append(fn) |
149 modified.append(fn) |