Show More
@@ -680,21 +680,15 b' class dirstate(object):' | |||||
680 | self.clear() |
|
680 | self.clear() | |
681 | self._lastnormaltime = lastnormaltime |
|
681 | self._lastnormaltime = lastnormaltime | |
682 |
|
682 | |||
683 | for f in changedfiles: |
|
|||
684 | mode = 0o666 |
|
|||
685 | if f in allfiles and 'x' in allfiles.flags(f): |
|
|||
686 | mode = 0o777 |
|
|||
687 |
|
||||
688 | if f in allfiles: |
|
|||
689 | self._map[f] = dirstatetuple('n', mode, -1, 0) |
|
|||
690 | else: |
|
|||
691 | self._map.pop(f, None) |
|
|||
692 | if f in self._nonnormalset: |
|
|||
693 | self._nonnormalset.remove(f) |
|
|||
694 |
|
||||
695 | if self._origpl is None: |
|
683 | if self._origpl is None: | |
696 | self._origpl = self._pl |
|
684 | self._origpl = self._pl | |
697 | self._pl = (parent, nullid) |
|
685 | self._pl = (parent, nullid) | |
|
686 | for f in changedfiles: | |||
|
687 | if f in allfiles: | |||
|
688 | self.normallookup(f) | |||
|
689 | else: | |||
|
690 | self.drop(f) | |||
|
691 | ||||
698 | self._dirty = True |
|
692 | self._dirty = True | |
699 |
|
693 | |||
700 | def write(self, tr): |
|
694 | def write(self, tr): |
@@ -48,8 +48,8 b' basic test for hg debugrebuildstate' | |||||
48 | state dump after |
|
48 | state dump after | |
49 |
|
49 | |||
50 | $ hg debugstate --nodates | sort |
|
50 | $ hg debugstate --nodates | sort | |
51 |
n |
|
51 | n 0 -1 unset bar | |
52 |
n |
|
52 | n 0 -1 unset foo | |
53 |
|
53 | |||
54 | $ hg debugadddrop --normal-lookup file1 file2 |
|
54 | $ hg debugadddrop --normal-lookup file1 file2 | |
55 | $ hg debugadddrop --drop bar |
|
55 | $ hg debugadddrop --drop bar | |
@@ -57,7 +57,7 b' state dump after' | |||||
57 | $ hg debugstate --nodates |
|
57 | $ hg debugstate --nodates | |
58 | n 0 -1 unset file1 |
|
58 | n 0 -1 unset file1 | |
59 | n 0 -1 unset file2 |
|
59 | n 0 -1 unset file2 | |
60 |
n |
|
60 | n 0 -1 unset foo | |
61 | $ hg debugrebuildstate |
|
61 | $ hg debugrebuildstate | |
62 |
|
62 | |||
63 | status |
|
63 | status | |
@@ -115,7 +115,7 b' dirstate' | |||||
115 | $ hg debugrebuilddirstate --minimal |
|
115 | $ hg debugrebuilddirstate --minimal | |
116 | $ hg debugdirstate --nodates |
|
116 | $ hg debugdirstate --nodates | |
117 | r 0 0 * bar (glob) |
|
117 | r 0 0 * bar (glob) | |
118 |
n |
|
118 | n 0 -1 * foo (glob) | |
119 | a 0 -1 * qux (glob) |
|
119 | a 0 -1 * qux (glob) | |
120 | $ hg status -A |
|
120 | $ hg status -A | |
121 | A qux |
|
121 | A qux |
General Comments 0
You need to be logged in to leave comments.
Login now