equal
deleted
inserted
replaced
244 |
244 |
245 for f, (n12, fl12) in diff12.iteritems(): |
245 for f, (n12, fl12) in diff12.iteritems(): |
246 if n12: |
246 if n12: |
247 n1, n2 = n12 |
247 n1, n2 = n12 |
248 else: # file contents didn't change, but flags did |
248 else: # file contents didn't change, but flags did |
249 n1 = n2 = m1[f] |
249 n1 = n2 = m1.get(f, None) |
|
250 if n1 is None: |
|
251 # Since n1 == n2, the file isn't present in m2 either. This |
|
252 # means that the file was removed or deleted locally and |
|
253 # removed remotely, but that residual entries remain in flags. |
|
254 # This can happen in manifests generated by workingctx. |
|
255 continue |
250 if fl12: |
256 if fl12: |
251 fl1, fl2 = fl12 |
257 fl1, fl2 = fl12 |
252 else: # flags didn't change, file contents did |
258 else: # flags didn't change, file contents did |
253 fl1 = fl2 = m1.flags(f) |
259 fl1 = fl2 = m1.flags(f) |
254 |
260 |