| Alphare | |
| pulkit |
| hg-reviewers |
lets put this new method to use
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/dirstatemap.py (4 lines) |
| self.filefoldmap.pop(normed, None) | self.filefoldmap.pop(normed, None) | ||||
| self.nonnormalset.discard(f) | self.nonnormalset.discard(f) | ||||
| return exists | return exists | ||||
| def clearambiguoustimes(self, files, now): | def clearambiguoustimes(self, files, now): | ||||
| for f in files: | for f in files: | ||||
| e = self.get(f) | e = self.get(f) | ||||
| if e is not None and e.need_delay(now): | if e is not None and e.need_delay(now): | ||||
| self._map[f] = DirstateItem( | e.set_possibly_dirty() | ||||
| e.state, e.mode, e.size, AMBIGUOUS_TIME | |||||
| ) | |||||
| self.nonnormalset.add(f) | self.nonnormalset.add(f) | ||||
| def nonnormalentries(self): | def nonnormalentries(self): | ||||
| '''Compute the nonnormal dirstate entries from the dmap''' | '''Compute the nonnormal dirstate entries from the dmap''' | ||||
| try: | try: | ||||
| return parsers.nonnormalotherparententries(self._map) | return parsers.nonnormalotherparententries(self._map) | ||||
| except AttributeError: | except AttributeError: | ||||
| nonnorm = set() | nonnorm = set() | ||||