Show More
@@ -406,13 +406,15 b' class dirstate(object):' | |||
|
406 | 406 | |
|
407 | 407 | # Discard 'm' markers when moving away from a merge state |
|
408 | 408 | if s[0] == 'm': |
|
409 |
|
|
|
410 |
|
|
|
409 | source = self._copymap.get(f) | |
|
410 | if source: | |
|
411 | copies[f] = source | |
|
411 | 412 | self.normallookup(f) |
|
412 | 413 | # Also fix up otherparent markers |
|
413 | 414 | elif s[0] == 'n' and s[2] == -2: |
|
414 |
|
|
|
415 |
|
|
|
415 | source = self._copymap.get(f) | |
|
416 | if source: | |
|
417 | copies[f] = source | |
|
416 | 418 | self.add(f) |
|
417 | 419 | return copies |
|
418 | 420 | |
@@ -518,8 +520,7 b' class dirstate(object):' | |||
|
518 | 520 | self._copymap[dest] = source |
|
519 | 521 | self._updatedfiles.add(source) |
|
520 | 522 | self._updatedfiles.add(dest) |
|
521 |
elif |
|
|
522 | del self._copymap[dest] | |
|
523 | elif self._copymap.pop(dest, None): | |
|
523 | 524 | self._updatedfiles.add(dest) |
|
524 | 525 | |
|
525 | 526 | def copied(self, file): |
@@ -568,8 +569,7 b' class dirstate(object):' | |||
|
568 | 569 | mtime = s.st_mtime |
|
569 | 570 | self._addpath(f, 'n', s.st_mode, |
|
570 | 571 | s.st_size & _rangemask, mtime & _rangemask) |
|
571 |
|
|
|
572 | del self._copymap[f] | |
|
572 | self._copymap.pop(f, None) | |
|
573 | 573 | if f in self._nonnormalset: |
|
574 | 574 | self._nonnormalset.remove(f) |
|
575 | 575 | if mtime > self._lastnormaltime: |
@@ -597,8 +597,7 b' class dirstate(object):' | |||
|
597 | 597 | if entry[0] == 'm' or entry[0] == 'n' and entry[2] == -2: |
|
598 | 598 | return |
|
599 | 599 | self._addpath(f, 'n', 0, -1, -1) |
|
600 |
|
|
|
601 | del self._copymap[f] | |
|
600 | self._copymap.pop(f, None) | |
|
602 | 601 | if f in self._nonnormalset: |
|
603 | 602 | self._nonnormalset.remove(f) |
|
604 | 603 | |
@@ -613,15 +612,12 b' class dirstate(object):' | |||
|
613 | 612 | else: |
|
614 | 613 | # add-like |
|
615 | 614 | self._addpath(f, 'n', 0, -2, -1) |
|
616 | ||
|
617 | if f in self._copymap: | |
|
618 | del self._copymap[f] | |
|
615 | self._copymap.pop(f, None) | |
|
619 | 616 | |
|
620 | 617 | def add(self, f): |
|
621 | 618 | '''Mark a file added.''' |
|
622 | 619 | self._addpath(f, 'a', 0, -1, -1) |
|
623 |
|
|
|
624 | del self._copymap[f] | |
|
620 | self._copymap.pop(f, None) | |
|
625 | 621 | |
|
626 | 622 | def remove(self, f): |
|
627 | 623 | '''Mark a file removed.''' |
@@ -638,8 +634,8 b' class dirstate(object):' | |||
|
638 | 634 | self._otherparentset.add(f) |
|
639 | 635 | self._map[f] = dirstatetuple('r', 0, size, 0) |
|
640 | 636 | self._nonnormalset.add(f) |
|
641 |
if size == 0 |
|
|
642 |
|
|
|
637 | if size == 0: | |
|
638 | self._copymap.pop(f, None) | |
|
643 | 639 | |
|
644 | 640 | def merge(self, f): |
|
645 | 641 | '''Mark a file merged.''' |
@@ -655,8 +651,7 b' class dirstate(object):' | |||
|
655 | 651 | del self._map[f] |
|
656 | 652 | if f in self._nonnormalset: |
|
657 | 653 | self._nonnormalset.remove(f) |
|
658 |
|
|
|
659 | del self._copymap[f] | |
|
654 | self._copymap.pop(f, None) | |
|
660 | 655 | |
|
661 | 656 | def _discoverpath(self, path, normed, ignoremissing, exists, storemap): |
|
662 | 657 | if exists is None: |
General Comments 0
You need to be logged in to leave comments.
Login now