mercurial/dirstatemap.py
changeset 47998 7ab99007fce5
parent 47972 e02f9af7aed1
child 48000 5a6c1ef4bcac
equal deleted inserted replaced
47997:87e3f878e65f 47998:7ab99007fce5
   314         previously recorded.
   314         previously recorded.
   315         """
   315         """
   316         old_entry = self._map.pop(f, None)
   316         old_entry = self._map.pop(f, None)
   317         self._dirs_decr(f, old_entry=old_entry)
   317         self._dirs_decr(f, old_entry=old_entry)
   318         self.nonnormalset.discard(f)
   318         self.nonnormalset.discard(f)
       
   319         self.copymap.pop(f, None)
   319         return old_entry is not None
   320         return old_entry is not None
   320 
   321 
   321     def clearambiguoustimes(self, files, now):
   322     def clearambiguoustimes(self, files, now):
   322         for f in files:
   323         for f in files:
   323             e = self.get(f)
   324             e = self.get(f)
   650             self._rustmap.removefile(f, in_merge=True)
   651             self._rustmap.removefile(f, in_merge=True)
   651 
   652 
   652         def removefile(self, *args, **kwargs):
   653         def removefile(self, *args, **kwargs):
   653             return self._rustmap.removefile(*args, **kwargs)
   654             return self._rustmap.removefile(*args, **kwargs)
   654 
   655 
   655         def dropfile(self, *args, **kwargs):
   656         def dropfile(self, f, *args, **kwargs):
   656             return self._rustmap.dropfile(*args, **kwargs)
   657             self._rustmap.copymap().pop(f, None)
       
   658             return self._rustmap.dropfile(f, *args, **kwargs)
   657 
   659 
   658         def clearambiguoustimes(self, *args, **kwargs):
   660         def clearambiguoustimes(self, *args, **kwargs):
   659             return self._rustmap.clearambiguoustimes(*args, **kwargs)
   661             return self._rustmap.clearambiguoustimes(*args, **kwargs)
   660 
   662 
   661         def nonnormalentries(self):
   663         def nonnormalentries(self):