equal
deleted
inserted
replaced
363 self._addpath(f) |
363 self._addpath(f) |
364 self._map[f] = ('m', s.st_mode, s.st_size, int(s.st_mtime)) |
364 self._map[f] = ('m', s.st_mode, s.st_size, int(s.st_mtime)) |
365 if f in self._copymap: |
365 if f in self._copymap: |
366 del self._copymap[f] |
366 del self._copymap[f] |
367 |
367 |
368 def forget(self, f): |
368 def drop(self, f): |
369 '''Forget a file.''' |
369 '''Drop a file from the dirstate''' |
370 self._dirty = True |
370 self._dirty = True |
371 try: |
371 self._droppath(f) |
372 self._droppath(f) |
372 del self._map[f] |
373 del self._map[f] |
|
374 except KeyError: |
|
375 self._ui.warn(_("not in dirstate: %s\n") % f) |
|
376 |
373 |
377 def _normalize(self, path, isknown): |
374 def _normalize(self, path, isknown): |
378 normed = os.path.normcase(path) |
375 normed = os.path.normcase(path) |
379 folded = self._foldmap.get(normed, None) |
376 folded = self._foldmap.get(normed, None) |
380 if folded is None: |
377 if folded is None: |