Show More
@@ -935,6 +935,9 b' class dirstate:' | |||||
935 | def write(self, tr): |
|
935 | def write(self, tr): | |
936 | if not self._dirty: |
|
936 | if not self._dirty: | |
937 | return |
|
937 | return | |
|
938 | # make sure we don't request a write of invalidated content | |||
|
939 | # XXX move before the dirty check once `unlock` stop calling `write` | |||
|
940 | assert not self._invalidated_context | |||
938 |
|
941 | |||
939 | write_key = self._use_tracked_hint and self._dirty_tracked_set |
|
942 | write_key = self._use_tracked_hint and self._dirty_tracked_set | |
940 | if tr: |
|
943 | if tr: | |
@@ -990,6 +993,8 b' class dirstate:' | |||||
990 | self._plchangecallbacks[category] = callback |
|
993 | self._plchangecallbacks[category] = callback | |
991 |
|
994 | |||
992 | def _writedirstate(self, tr, st): |
|
995 | def _writedirstate(self, tr, st): | |
|
996 | # make sure we don't write invalidated content | |||
|
997 | assert not self._invalidated_context | |||
993 | # notify callbacks about parents change |
|
998 | # notify callbacks about parents change | |
994 | if self._origpl is not None and self._origpl != self._pl: |
|
999 | if self._origpl is not None and self._origpl != self._pl: | |
995 | for c, callback in sorted(self._plchangecallbacks.items()): |
|
1000 | for c, callback in sorted(self._plchangecallbacks.items()): |
General Comments 0
You need to be logged in to leave comments.
Login now