mercurial/dirstate.py
changeset 48145 180e8fa345cc
parent 48144 6f54afb094bd
child 48146 de0977ec2d25
equal deleted inserted replaced
48144:6f54afb094bd 48145:180e8fa345cc
   580         )
   580         )
   581 
   581 
   582         # this mean we are doing call for file we do not really care about the
   582         # this mean we are doing call for file we do not really care about the
   583         # data (eg: added or removed), however this should be a minor overhead
   583         # data (eg: added or removed), however this should be a minor overhead
   584         # compared to the overall update process calling this.
   584         # compared to the overall update process calling this.
   585         if need_parent_file_data:
   585         if need_parent_file_data or parentfiledata is None:
   586             if parentfiledata is None:
   586             parentfiledata = self._get_filedata(filename)
   587                 parentfiledata = self._get_filedata(filename)
       
   588             mtime = parentfiledata[2]
       
   589 
       
   590             if mtime > self._lastnormaltime:
       
   591                 # Remember the most recent modification timeslot for
       
   592                 # status(), to make sure we won't miss future
       
   593                 # size-preserving file content modifications that happen
       
   594                 # within the same timeslot.
       
   595                 self._lastnormaltime = mtime
       
   596 
   587 
   597         self._map.reset_state(
   588         self._map.reset_state(
   598             filename,
   589             filename,
   599             wc_tracked,
   590             wc_tracked,
   600             p1_tracked,
   591             p1_tracked,