Show More
@@ -386,9 +386,6 b' class dirstate(object):' | |||||
386 | def copies(self): |
|
386 | def copies(self): | |
387 | return self._map.copymap |
|
387 | return self._map.copymap | |
388 |
|
388 | |||
389 | def _droppath(self, f): |
|
|||
390 | self._updatedfiles.add(f) |
|
|||
391 |
|
||||
392 | def _addpath(self, f, state, mode, size, mtime): |
|
389 | def _addpath(self, f, state, mode, size, mtime): | |
393 | oldstate = self[f] |
|
390 | oldstate = self[f] | |
394 | if state == 'a' or oldstate == 'r': |
|
391 | if state == 'a' or oldstate == 'r': | |
@@ -465,7 +462,6 b' class dirstate(object):' | |||||
465 | def remove(self, f): |
|
462 | def remove(self, f): | |
466 | '''Mark a file removed.''' |
|
463 | '''Mark a file removed.''' | |
467 | self._dirty = True |
|
464 | self._dirty = True | |
468 | self._droppath(f) |
|
|||
469 | oldstate = self[f] |
|
465 | oldstate = self[f] | |
470 | size = 0 |
|
466 | size = 0 | |
471 | if self._pl[1] != nullid: |
|
467 | if self._pl[1] != nullid: | |
@@ -477,6 +473,7 b' class dirstate(object):' | |||||
477 | elif entry[0] == 'n' and entry[2] == -2: # other parent |
|
473 | elif entry[0] == 'n' and entry[2] == -2: # other parent | |
478 | size = -2 |
|
474 | size = -2 | |
479 | self._map.otherparentset.add(f) |
|
475 | self._map.otherparentset.add(f) | |
|
476 | self._updatedfiles.add(f) | |||
480 | self._map.removefile(f, oldstate, size) |
|
477 | self._map.removefile(f, oldstate, size) | |
481 | if size == 0: |
|
478 | if size == 0: | |
482 | self._map.copymap.pop(f, None) |
|
479 | self._map.copymap.pop(f, None) | |
@@ -492,7 +489,7 b' class dirstate(object):' | |||||
492 | oldstate = self[f] |
|
489 | oldstate = self[f] | |
493 | if self._map.dropfile(f, oldstate): |
|
490 | if self._map.dropfile(f, oldstate): | |
494 | self._dirty = True |
|
491 | self._dirty = True | |
495 |
self._ |
|
492 | self._updatedfiles.add(f) | |
496 | self._map.copymap.pop(f, None) |
|
493 | self._map.copymap.pop(f, None) | |
497 |
|
494 | |||
498 | def _discoverpath(self, path, normed, ignoremissing, exists, storemap): |
|
495 | def _discoverpath(self, path, normed, ignoremissing, exists, storemap): |
General Comments 0
You need to be logged in to leave comments.
Login now