Rev 2279: When adding ghosts revision_tree() raises RevisionNotPresent because of Knit, not NoSuchRevision in http://bzr.arbash-meinel.com/branches/bzr/experimental/dirstate

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/branches/bzr/experimental/dirstate

------------------------------------------------------------
revno: 2279
revision-id: john at arbash-meinel.com-20070213213402-05v5g7g3bsbrxb3p
parent: john at arbash-meinel.com-20070213210556-zw42d3te8rv50hct
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Tue 2007-02-13 15:34:02 -0600
message:
  When adding ghosts revision_tree() raises RevisionNotPresent because of Knit, not NoSuchRevision
modified:
  bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
-------------- next part --------------
=== modified file 'bzrlib/workingtree_4.py'
--- a/bzrlib/workingtree_4.py	2007-02-13 11:19:43 +0000
+++ b/bzrlib/workingtree_4.py	2007-02-13 21:34:02 +0000
@@ -326,7 +326,11 @@
         for revision_id in revision_ids:
             try:
                 revtree = self.branch.repository.revision_tree(revision_id)
-            except errors.NoSuchRevision:
+                # TODO: jam 20070213 KnitVersionedFile raises
+                #       RevisionNotPresent rather than NoSuchRevision if a
+                #       given revision_id is not present. Should Repository be
+                #       catching it and re-raising NoSuchRevision?
+            except (errors.NoSuchRevision, errors.RevisionNotPresent):
                 revtree = None
             trees.append((revision_id, revtree))
         self.set_parent_trees(trees,