Rev 2484: Fix remaining test failures. in http://bazaar.launchpad.net/~bzr/bzr/dirstate

[Robert Collins]

At http://bazaar.launchpad.net/~bzr/bzr/dirstate

------------------------------------------------------------
revno: 2484
revision-id: robertc at robertcollins.net-20070306132101-cj5e3d7d6834f80o
parent: robertc at robertcollins.net-20070306130853-1k6knym5pxf1jcns
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate.dogfood
timestamp: Wed 2007-03-07 00:21:01 +1100
message:
  Fix remaining test failures.
modified:
  bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
=== modified file 'bzrlib/workingtree_4.py'
--- a/bzrlib/workingtree_4.py	2007-03-06 12:28:18 +0000
+++ b/bzrlib/workingtree_4.py	2007-03-06 13:21:01 +0000
@@ -478,8 +478,12 @@
                 # the root is not a reference.
                 continue
             path = pathjoin(self.basedir, key[0].decode('utf8'), key[1].decode('utf8'))
-            if self._kind(path) == 'tree-reference':
-                yield path, key[2]
+            try:
+                if self._kind(path) == 'tree-reference':
+                    yield path, key[2]
+            except errors.NoSuchFile:
+                # path is missing on disk.
+                continue
 
     @needs_read_lock
     def kind(self, file_id):