Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/dirstate.py @ 5082:79373ec3f27d
merge with crew-stable
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Mon, 06 Aug 2007 01:00:10 -0300 |
parents | 8b1ee1f59b3c b304c2496f52 |
children | 90d9ec0dc69d |
comparison
equal
deleted
inserted
replaced
5077:487659a90497 | 5082:79373ec3f27d |
---|---|
248 del self._map[f] | 248 del self._map[f] |
249 self._decpath(f) | 249 self._decpath(f) |
250 except KeyError: | 250 except KeyError: |
251 self._ui.warn(_("not in dirstate: %s!\n") % f) | 251 self._ui.warn(_("not in dirstate: %s!\n") % f) |
252 | 252 |
253 def clear(self): | |
254 self._map = {} | |
255 self._copymap = {} | |
256 self._pl = [nullid, nullid] | |
257 self._dirty = True | |
258 | |
253 def rebuild(self, parent, files): | 259 def rebuild(self, parent, files): |
254 self.invalidate() | 260 self.clear() |
255 for f in files: | 261 for f in files: |
256 if files.execf(f): | 262 if files.execf(f): |
257 self._map[f] = ('n', 0777, -1, 0) | 263 self._map[f] = ('n', 0777, -1, 0) |
258 else: | 264 else: |
259 self._map[f] = ('n', 0666, -1, 0) | 265 self._map[f] = ('n', 0666, -1, 0) |