Merge lp:~garyvdm/bzr-search/svn_incompatable into lp:bzr-search

[Gary van der Merwe]

This make bzr-search check for an IncompatibleAPI error when importing bzr-svn so that bzr-search does not break when bzr-svn is incompatible with bzrlib.

[Robert Collins (lifeless)]

 review: +1

review: Approve

=== modified file 'index.py'
--- index.py	2009-11-03 00:12:13 +0000
+++ index.py	2010-03-25 13:24:20 +0000
@@ -27,7 +27,12 @@
 from bzrlib.btree_index import BTreeGraphIndex, BTreeBuilder
 from bzrlib.bzrdir import BzrDirMeta1
 import bzrlib.config
-from bzrlib.errors import NotBranchError, NoSuchFile, UnknownFormatError
+from bzrlib.errors import (
+    NotBranchError,
+    NoSuchFile,
+    UnknownFormatError,
+    IncompatibleAPI,
+)
 from bzrlib.index import CombinedGraphIndex, GraphIndex, InMemoryGraphIndex
 from bzrlib.lockdir import LockDir
 try:
@@ -190,7 +195,7 @@
     """
     try:
         from bzrlib.plugins.svn.branch import SvnBranch
-    except ImportError:
+    except (ImportError, IncompatibleAPI):
         SvnBranch = None
     if type(branch) == SvnBranch:
         # We can't write to the 'bzrdir' as it is virtual