mercurial/dirstate.py
changeset 47719 1168e54b727c
parent 47704 8a50fb0784a9
child 47720 b0314d8deee1
equal deleted inserted replaced
47718:03ef0c8fa7d5 47719:1168e54b727c
   502     @requires_no_parents_change
   502     @requires_no_parents_change
   503     def set_clean(self, filename, parentfiledata=None):
   503     def set_clean(self, filename, parentfiledata=None):
   504         """record that the current state of the file on disk is known to be clean"""
   504         """record that the current state of the file on disk is known to be clean"""
   505         self._dirty = True
   505         self._dirty = True
   506         self._updatedfiles.add(filename)
   506         self._updatedfiles.add(filename)
   507         self.normal(filename, parentfiledata=parentfiledata)
   507         self._normal(filename, parentfiledata=parentfiledata)
   508 
   508 
   509     @requires_parents_change
   509     @requires_parents_change
   510     def update_file_p1(
   510     def update_file_p1(
   511         self,
   511         self,
   512         filename,
   512         filename,
   700         parentfiledata should be computed from memory (for mode,
   700         parentfiledata should be computed from memory (for mode,
   701         size), as or close as possible from the point where we
   701         size), as or close as possible from the point where we
   702         determined the file was clean, to limit the risk of the
   702         determined the file was clean, to limit the risk of the
   703         file having been changed by an external process between the
   703         file having been changed by an external process between the
   704         moment where the file was determined to be clean and now."""
   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         if parentfiledata:
   722         if parentfiledata:
   706             (mode, size, mtime) = parentfiledata
   723             (mode, size, mtime) = parentfiledata
   707         else:
   724         else:
   708             (mode, size, mtime) = self._get_filedata(f)
   725             (mode, size, mtime) = self._get_filedata(f)
   709         self._addpath(f, mode=mode, size=size, mtime=mtime)
   726         self._addpath(f, mode=mode, size=size, mtime=mtime)