##// END OF EJS Templates
dirstate: move dropping of folded filenames into the dirstate map...
Mark Thomas -
r35081:e6c64744 default
parent child Browse files
Show More
@@ -387,11 +387,6 b' class dirstate(object):'
387 return self._map.copymap
387 return self._map.copymap
388
388
389 def _droppath(self, f):
389 def _droppath(self, f):
390 if "filefoldmap" in self._map.__dict__:
391 normed = util.normcase(f)
392 if normed in self._map.filefoldmap:
393 del self._map.filefoldmap[normed]
394
395 self._updatedfiles.add(f)
390 self._updatedfiles.add(f)
396
391
397 def _addpath(self, f, state, mode, size, mtime):
392 def _addpath(self, f, state, mode, size, mtime):
@@ -1213,9 +1208,6 b' class dirstatemap(object):'
1213
1208
1214 - `dirfoldmap` is a dict mapping normalized directory names to the
1209 - `dirfoldmap` is a dict mapping normalized directory names to the
1215 denormalized form that they appear as in the dirstate.
1210 denormalized form that they appear as in the dirstate.
1216
1217 Once instantiated, the filefoldmap and dirfoldmap views must be maintained
1218 by the caller.
1219 """
1211 """
1220
1212
1221 def __init__(self, ui, opener, root):
1213 def __init__(self, ui, opener, root):
@@ -1297,6 +1289,9 b' class dirstatemap(object):'
1297 """
1289 """
1298 if oldstate not in "?r" and "dirs" in self.__dict__:
1290 if oldstate not in "?r" and "dirs" in self.__dict__:
1299 self.dirs.delpath(f)
1291 self.dirs.delpath(f)
1292 if "filefoldmap" in self.__dict__:
1293 normed = util.normcase(f)
1294 self.filefoldmap.pop(normed, None)
1300 self._map[f] = dirstatetuple('r', 0, size, 0)
1295 self._map[f] = dirstatetuple('r', 0, size, 0)
1301 self.nonnormalset.add(f)
1296 self.nonnormalset.add(f)
1302
1297
@@ -1309,6 +1304,9 b' class dirstatemap(object):'
1309 if exists:
1304 if exists:
1310 if oldstate != "r" and "dirs" in self.__dict__:
1305 if oldstate != "r" and "dirs" in self.__dict__:
1311 self.dirs.delpath(f)
1306 self.dirs.delpath(f)
1307 if "filefoldmap" in self.__dict__:
1308 normed = util.normcase(f)
1309 self.filefoldmap.pop(normed, None)
1312 self.nonnormalset.discard(f)
1310 self.nonnormalset.discard(f)
1313 return exists
1311 return exists
1314
1312
General Comments 0
You need to be logged in to leave comments. Login now