equal
deleted
inserted
replaced
328 if entry.from_p2: |
328 if entry.from_p2: |
329 self.otherparentset.add(f) |
329 self.otherparentset.add(f) |
330 entry.set_untracked() |
330 entry.set_untracked() |
331 return True |
331 return True |
332 |
332 |
333 def clearambiguoustimes(self, files, now): |
|
334 for f in files: |
|
335 e = self.get(f) |
|
336 if e is not None and e.need_delay(now): |
|
337 e.set_possibly_dirty() |
|
338 self.nonnormalset.add(f) |
|
339 |
|
340 def nonnormalentries(self): |
333 def nonnormalentries(self): |
341 '''Compute the nonnormal dirstate entries from the dmap''' |
334 '''Compute the nonnormal dirstate entries from the dmap''' |
342 try: |
335 try: |
343 return parsers.nonnormalotherparententries(self._map) |
336 return parsers.nonnormalotherparententries(self._map) |
344 except AttributeError: |
337 except AttributeError: |
699 return True |
692 return True |
700 |
693 |
701 def removefile(self, *args, **kwargs): |
694 def removefile(self, *args, **kwargs): |
702 return self._rustmap.removefile(*args, **kwargs) |
695 return self._rustmap.removefile(*args, **kwargs) |
703 |
696 |
704 def clearambiguoustimes(self, *args, **kwargs): |
|
705 return self._rustmap.clearambiguoustimes(*args, **kwargs) |
|
706 |
|
707 def nonnormalentries(self): |
697 def nonnormalentries(self): |
708 return self._rustmap.nonnormalentries() |
698 return self._rustmap.nonnormalentries() |
709 |
699 |
710 def get(self, *args, **kwargs): |
700 def get(self, *args, **kwargs): |
711 return self._rustmap.get(*args, **kwargs) |
701 return self._rustmap.get(*args, **kwargs) |