Rev 1863: In WT.extras() handle when the directories have been deleted. in http://bzr.arbash-meinel.com/branches/bzr/1.3-dev/nested-trees

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/branches/bzr/1.3-dev/nested-trees

------------------------------------------------------------
revno: 1863
revision-id:john at arbash-meinel.com-20080306172059-20aq8b5i5x7ouoaj
parent: john at arbash-meinel.com-20080306170152-ch0jfmfr69030395
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: nested-trees
timestamp: Thu 2008-03-06 17:20:59 +0000
message:
  In WT.extras() handle when the directories have been deleted.
modified:
  bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
-------------- next part --------------
=== modified file 'bzrlib/workingtree.py'
--- a/bzrlib/workingtree.py	2008-03-04 16:55:41 +0000
+++ b/bzrlib/workingtree.py	2008-03-06 17:20:59 +0000
@@ -1632,8 +1632,11 @@
         for path, dir_entry in self.inventory.directories():
             # mutter("search for unknowns in %r", path)
             dirabs = self.abspath(path)
-            if self._kind(dirabs) != 'directory':
-                # e.g. directory deleted
+            try:
+                if self._kind(dirabs) != 'directory':
+                    # e.g. directory deleted
+                    continue
+            except errors.NoSuchFile:
                 continue
 
             fl = []