1546 unexpected_in_p1 = b"%s in state %s, but also in manifest1\n" |
1546 unexpected_in_p1 = b"%s in state %s, but also in manifest1\n" |
1547 missing_from_ps = b"%s in state %s, but not in either manifest\n" |
1547 missing_from_ps = b"%s in state %s, but not in either manifest\n" |
1548 missing_from_ds = b"%s in manifest1, but listed as state %s\n" |
1548 missing_from_ds = b"%s in manifest1, but listed as state %s\n" |
1549 for f, entry in self.items(): |
1549 for f, entry in self.items(): |
1550 state = entry.state |
1550 state = entry.state |
1551 if state in b"nr" and f not in m1: |
1551 if entry.p1_tracked: |
1552 yield (missing_from_p1, f, state) |
1552 if entry.modified and f not in m1 and f not in m2: |
1553 if state in b"a" and f in m1: |
1553 yield (missing_from_ps, f, state) |
|
1554 elif f not in m1: |
|
1555 yield (missing_from_p1, f, state) |
|
1556 if entry.added and f in m1: |
1554 yield (unexpected_in_p1, f, state) |
1557 yield (unexpected_in_p1, f, state) |
1555 if state in b"m" and f not in m1 and f not in m2: |
|
1556 yield (missing_from_ps, f, state) |
|
1557 for f in m1: |
1558 for f in m1: |
1558 state = self.get_entry(f).state |
1559 entry = self.get_entry(f) |
1559 if state not in b"nrm": |
1560 if not entry.p1_tracked: |
1560 yield (missing_from_ds, f, state) |
1561 yield (missing_from_ds, f, entry.state) |