Show More
@@ -80,7 +80,7 b' def requires_changing_parents(func):' | |||||
80 | return wrap |
|
80 | return wrap | |
81 |
|
81 | |||
82 |
|
82 | |||
83 |
def requires_no_parents |
|
83 | def requires_not_changing_parents(func): | |
84 | def wrap(self, *args, **kwargs): |
|
84 | def wrap(self, *args, **kwargs): | |
85 | if self.pendingparentchange(): |
|
85 | if self.pendingparentchange(): | |
86 | msg = 'calling `%s` inside of a changing_parents context' |
|
86 | msg = 'calling `%s` inside of a changing_parents context' | |
@@ -478,7 +478,7 b' class dirstate:' | |||||
478 | def copies(self): |
|
478 | def copies(self): | |
479 | return self._map.copymap |
|
479 | return self._map.copymap | |
480 |
|
480 | |||
481 |
@requires_no_parents |
|
481 | @requires_not_changing_parents | |
482 | def set_tracked(self, filename, reset_copy=False): |
|
482 | def set_tracked(self, filename, reset_copy=False): | |
483 | """a "public" method for generic code to mark a file as tracked |
|
483 | """a "public" method for generic code to mark a file as tracked | |
484 |
|
484 | |||
@@ -500,7 +500,7 b' class dirstate:' | |||||
500 | self._dirty_tracked_set = True |
|
500 | self._dirty_tracked_set = True | |
501 | return pre_tracked |
|
501 | return pre_tracked | |
502 |
|
502 | |||
503 |
@requires_no_parents |
|
503 | @requires_not_changing_parents | |
504 | def set_untracked(self, filename): |
|
504 | def set_untracked(self, filename): | |
505 | """a "public" method for generic code to mark a file as untracked |
|
505 | """a "public" method for generic code to mark a file as untracked | |
506 |
|
506 | |||
@@ -515,7 +515,7 b' class dirstate:' | |||||
515 | self._dirty_tracked_set = True |
|
515 | self._dirty_tracked_set = True | |
516 | return ret |
|
516 | return ret | |
517 |
|
517 | |||
518 |
@requires_no_parents |
|
518 | @requires_not_changing_parents | |
519 | def set_clean(self, filename, parentfiledata): |
|
519 | def set_clean(self, filename, parentfiledata): | |
520 | """record that the current state of the file on disk is known to be clean""" |
|
520 | """record that the current state of the file on disk is known to be clean""" | |
521 | self._dirty = True |
|
521 | self._dirty = True | |
@@ -524,7 +524,7 b' class dirstate:' | |||||
524 | (mode, size, mtime) = parentfiledata |
|
524 | (mode, size, mtime) = parentfiledata | |
525 | self._map.set_clean(filename, mode, size, mtime) |
|
525 | self._map.set_clean(filename, mode, size, mtime) | |
526 |
|
526 | |||
527 |
@requires_no_parents |
|
527 | @requires_not_changing_parents | |
528 | def set_possibly_dirty(self, filename): |
|
528 | def set_possibly_dirty(self, filename): | |
529 | """record that the current state of the file on disk is unknown""" |
|
529 | """record that the current state of the file on disk is unknown""" | |
530 | self._dirty = True |
|
530 | self._dirty = True |
General Comments 0
You need to be logged in to leave comments.
Login now