Mercurial > hg
changeset 253:2da0a56aa1fd
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-----
| author | mpm@selenic.com |
|---|---|
| date | Sat, 04 Jun 2005 15:16:48 -0800 |
| parents | 5eda6c542978 |
| children | c03f58e5fd2d |
| files | mercurial/hg.py |
| diffstat | 1 files changed, 2 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/hg.py Sat Jun 04 15:14:39 2005 -0800 +++ b/mercurial/hg.py Sat Jun 04 15:16:48 2005 -0800 @@ -212,7 +212,6 @@ ''' current states: n normal m needs merging - i invalid r marked for removal a marked for addition''' @@ -223,12 +222,8 @@ 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 @@ 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':