equal
deleted
inserted
replaced
2020 return sorted(f for f in ds.matches(match) if ds[f] != b'r') |
2020 return sorted(f for f in ds.matches(match) if ds[f] != b'r') |
2021 |
2021 |
2022 def markcommitted(self, node): |
2022 def markcommitted(self, node): |
2023 with self._repo.dirstate.parentchange(): |
2023 with self._repo.dirstate.parentchange(): |
2024 for f in self.modified() + self.added(): |
2024 for f in self.modified() + self.added(): |
2025 self._repo.dirstate.normal(f) |
2025 self._repo.dirstate.update_file( |
|
2026 f, p1_tracked=True, wc_tracked=True |
|
2027 ) |
2026 for f in self.removed(): |
2028 for f in self.removed(): |
2027 self._repo.dirstate.drop(f) |
2029 self._repo.dirstate.drop(f) |
2028 self._repo.dirstate.setparents(node) |
2030 self._repo.dirstate.setparents(node) |
2029 self._repo._quick_access_changeid_invalidate() |
2031 self._repo._quick_access_changeid_invalidate() |
2030 |
2032 |