# HG changeset patch # User mpm@selenic.com # Date 1117927008 28800 # Node ID 2da0a56aa1fde4fb29f619bd0bec4e66accfb37b # Parent 5eda6c5429786757831c329abcfecd1a290b85d4 Remove invalid state from dirstate -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Remove invalid state from dirstate It's no longer needed now that we backup and restore dirstate properly manifest hash: 74c98540d685a76bd95dd7ebf4aaeff678706952 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCojZgywK+sNU5EO8RApaEAKCXO9Tl5h8vAC7GcQyUCx+feFExyACaAjfp 2hWiAJ9+B7EQgx2BJFE9Xek= =apay -----END PGP SIGNATURE----- diff --git a/mercurial/hg.py b/mercurial/hg.py --- a/mercurial/hg.py +++ b/mercurial/hg.py @@ -212,7 +212,6 @@ class dirstate: ''' current states: n normal m needs merging - i invalid r marked for removal a marked for addition''' @@ -223,12 +222,8 @@ class dirstate: if state == "r": self.map[f] = ('r', 0, 0, 0) else: - try: - s = os.stat(os.path.join(self.root, f)) - self.map[f] = (state, s.st_mode, s.st_size, s.st_mtime) - except OSError: - if state != "i": raise - self.map[f] = ('r', 0, 0, 0) + s = os.stat(os.path.join(self.root, f)) + self.map[f] = (state, s.st_mode, s.st_size, s.st_mtime) def forget(self, files): if not files: return @@ -537,11 +532,6 @@ class localrepository: if not c: if fcmp(fn): changed.append(fn) - elif c[0] == 'i': - if fn not in mf: - added.append(fn) - elif fcmp(fn): - changed.append(fn) elif c[0] == 'm': changed.append(fn) elif c[0] == 'a':