Show More
@@ -572,10 +572,14 b' class dirstate(object):' | |||||
572 |
|
572 | |||
573 | def drop(self, f): |
|
573 | def drop(self, f): | |
574 | '''Drop a file from the dirstate''' |
|
574 | '''Drop a file from the dirstate''' | |
575 |
|
|
575 | self._drop(f) | |
|
576 | ||||
|
577 | def _drop(self, filename): | |||
|
578 | """internal function to drop a file from the dirstate""" | |||
|
579 | if self._map.dropfile(filename): | |||
576 | self._dirty = True |
|
580 | self._dirty = True | |
577 | self._updatedfiles.add(f) |
|
581 | self._updatedfiles.add(filename) | |
578 | self._map.copymap.pop(f, None) |
|
582 | self._map.copymap.pop(filename, None) | |
579 |
|
583 | |||
580 | def _discoverpath(self, path, normed, ignoremissing, exists, storemap): |
|
584 | def _discoverpath(self, path, normed, ignoremissing, exists, storemap): | |
581 | if exists is None: |
|
585 | if exists is None: | |
@@ -689,7 +693,7 b' class dirstate(object):' | |||||
689 | for f in to_lookup: |
|
693 | for f in to_lookup: | |
690 | self.normallookup(f) |
|
694 | self.normallookup(f) | |
691 | for f in to_drop: |
|
695 | for f in to_drop: | |
692 | self.drop(f) |
|
696 | self._drop(f) | |
693 |
|
697 | |||
694 | self._dirty = True |
|
698 | self._dirty = True | |
695 |
|
699 |
General Comments 0
You need to be logged in to leave comments.
Login now