##// END OF EJS Templates
Remove invalid state from dirstate...
mpm@selenic.com -
r253:2da0a56a default
parent child Browse files
Show More
@@ -212,7 +212,6 b' class dirstate:'
212 ''' current states:
212 ''' current states:
213 n normal
213 n normal
214 m needs merging
214 m needs merging
215 i invalid
216 r marked for removal
215 r marked for removal
217 a marked for addition'''
216 a marked for addition'''
218
217
@@ -223,12 +222,8 b' class dirstate:'
223 if state == "r":
222 if state == "r":
224 self.map[f] = ('r', 0, 0, 0)
223 self.map[f] = ('r', 0, 0, 0)
225 else:
224 else:
226 try:
225 s = os.stat(os.path.join(self.root, f))
227 s = os.stat(os.path.join(self.root, f))
226 self.map[f] = (state, s.st_mode, s.st_size, s.st_mtime)
228 self.map[f] = (state, s.st_mode, s.st_size, s.st_mtime)
229 except OSError:
230 if state != "i": raise
231 self.map[f] = ('r', 0, 0, 0)
232
227
233 def forget(self, files):
228 def forget(self, files):
234 if not files: return
229 if not files: return
@@ -537,11 +532,6 b' class localrepository:'
537 if not c:
532 if not c:
538 if fcmp(fn):
533 if fcmp(fn):
539 changed.append(fn)
534 changed.append(fn)
540 elif c[0] == 'i':
541 if fn not in mf:
542 added.append(fn)
543 elif fcmp(fn):
544 changed.append(fn)
545 elif c[0] == 'm':
535 elif c[0] == 'm':
546 changed.append(fn)
536 changed.append(fn)
547 elif c[0] == 'a':
537 elif c[0] == 'a':
General Comments 0
You need to be logged in to leave comments. Login now