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