Mercurial > hg
comparison mercurial/dirstate.py @ 17197:67b8cca2f12b
dirstate: drop assert
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 16 Jul 2012 16:19:53 -0500 |
parents | 2abe975ffb94 |
children | 3c775c5a6c03 |
comparison
equal
deleted
inserted
replaced
17196:2abe975ffb94 | 17197:67b8cca2f12b |
---|---|
311 def _droppath(self, f): | 311 def _droppath(self, f): |
312 if self[f] not in "?r" and "_dirs" in self.__dict__: | 312 if self[f] not in "?r" and "_dirs" in self.__dict__: |
313 _decdirs(self._dirs, f) | 313 _decdirs(self._dirs, f) |
314 | 314 |
315 def _addpath(self, f, state, mode, size, mtime): | 315 def _addpath(self, f, state, mode, size, mtime): |
316 assert state not in "?r" | |
317 oldstate = self[f] | 316 oldstate = self[f] |
318 if state == 'a' or oldstate == 'r': | 317 if state == 'a' or oldstate == 'r': |
319 scmutil.checkfilename(f) | 318 scmutil.checkfilename(f) |
320 if f in self._dirs: | 319 if f in self._dirs: |
321 raise util.Abort(_('directory %r already in dirstate') % f) | 320 raise util.Abort(_('directory %r already in dirstate') % f) |