Show More
@@ -504,7 +504,7 b' class dirstate(object):' | |||
|
504 | 504 | """record that the current state of the file on disk is known to be clean""" |
|
505 | 505 | self._dirty = True |
|
506 | 506 | self._updatedfiles.add(filename) |
|
507 | self.normal(filename, parentfiledata=parentfiledata) | |
|
507 | self._normal(filename, parentfiledata=parentfiledata) | |
|
508 | 508 | |
|
509 | 509 | @requires_parents_change |
|
510 | 510 | def update_file_p1( |
@@ -702,6 +702,23 b' class dirstate(object):' | |||
|
702 | 702 | determined the file was clean, to limit the risk of the |
|
703 | 703 | file having been changed by an external process between the |
|
704 | 704 | moment where the file was determined to be clean and now.""" |
|
705 | if self.pendingparentchange(): | |
|
706 | util.nouideprecwarn( | |
|
707 | b"do not use `normal` inside of update/merge context." | |
|
708 | b" Use `update_file` or `update_file_p1`", | |
|
709 | b'6.0', | |
|
710 | stacklevel=2, | |
|
711 | ) | |
|
712 | else: | |
|
713 | util.nouideprecwarn( | |
|
714 | b"do not use `normal` outside of update/merge context." | |
|
715 | b" Use `set_tracked`", | |
|
716 | b'6.0', | |
|
717 | stacklevel=2, | |
|
718 | ) | |
|
719 | self._normal(f, parentfiledata=parentfiledata) | |
|
720 | ||
|
721 | def _normal(self, f, parentfiledata=None): | |
|
705 | 722 | if parentfiledata: |
|
706 | 723 | (mode, size, mtime) = parentfiledata |
|
707 | 724 | else: |
General Comments 0
You need to be logged in to leave comments.
Login now