##// END OF EJS Templates
add dirstate._dirtypl variable...
Alexis S. L. Carvalho -
r4952:a11921d2 default
parent child Browse files
Show More
@@ -21,6 +21,7 b' class dirstate(object):'
21 self._opener = opener
21 self._opener = opener
22 self._root = root
22 self._root = root
23 self._dirty = 0
23 self._dirty = 0
24 self._dirtypl = 0
24 self._ui = ui
25 self._ui = ui
25
26
26 def __getattr__(self, name):
27 def __getattr__(self, name):
@@ -114,6 +115,7 b' class dirstate(object):'
114
115
115 def setparents(self, p1, p2=nullid):
116 def setparents(self, p1, p2=nullid):
116 self.markdirty()
117 self.markdirty()
118 self._dirtypl = 1
117 self._pl = p1, p2
119 self._pl = p1, p2
118
120
119 def setbranch(self, branch):
121 def setbranch(self, branch):
@@ -126,7 +128,8 b' class dirstate(object):'
126 def _read(self):
128 def _read(self):
127 self._map = {}
129 self._map = {}
128 self._copymap = {}
130 self._copymap = {}
129 self._pl = [nullid, nullid]
131 if not self._dirtypl:
132 self._pl = [nullid, nullid]
130 try:
133 try:
131 st = self._opener("dirstate").read()
134 st = self._opener("dirstate").read()
132 except IOError, err:
135 except IOError, err:
@@ -135,7 +138,8 b' class dirstate(object):'
135 if not st:
138 if not st:
136 return
139 return
137
140
138 self._pl = [st[:20], st[20: 40]]
141 if not self._dirtypl:
142 self._pl = [st[:20], st[20: 40]]
139
143
140 # deref fields so they will be local in loop
144 # deref fields so they will be local in loop
141 dmap = self._map
145 dmap = self._map
@@ -262,6 +266,7 b' class dirstate(object):'
262 st.write(cs.getvalue())
266 st.write(cs.getvalue())
263 st.rename()
267 st.rename()
264 self._dirty = 0
268 self._dirty = 0
269 self._dirtypl = 0
265
270
266 def filterfiles(self, files):
271 def filterfiles(self, files):
267 ret = {}
272 ret = {}
General Comments 0
You need to be logged in to leave comments. Login now