Merge lp:~jelmer/bzr-search/no-svn-import into lp:bzr-search

[Jelmer Vernooij]

bzr-search currently imports SvnBranch from the svn plugin to see if a given branch is a svn branch.

As bzr-search installs a hook that runs whenever the branch tip changes, this
currently means that every branch change (including e.g. push or commit) will
load the svn plugin and its dependencies.

This MP changes it to use the branch format network name instead.

[Robert Collins (lifeless)]

I don't understand - its already guarded to only run on unknown formats...

The change looks fine, I just don't understand the why of it.

-Rob

[Jelmer Vernooij (jelmer)]

> I don't understand - its already guarded to only run on unknown formats...
>
> The change looks fine, I just don't understand the why of it.
There are two checks. The first, which is used when creating the index, only imports bzr-svn if the bzrdir isn't a meta1 dir, so it's fairly harmless. It will still trigger for remote bzrdirs and other non-meta1 formats (git, hg, ..).

In the other place (line 29 in the diff), when trying to open a index, bzr-svn is imported before bzr-search checks for a meta1 directory. This codepath is used by the post-branch-tip-change hook, which means that bzr-svn gets imported every time bzr changes a branch tip.

[Robert Collins (lifeless)]

+1

=== modified file 'index.py'
--- index.py	2011-03-14 22:42:42 +0000
+++ index.py	2011-08-14 16:19:23 +0000
@@ -108,14 +108,7 @@
         transport = branch.bzrdir.transport
         transport.mkdir('bzr-search')
         index_transport = transport.clone('bzr-search')
-    else:
-        # We don't know how to handle this format.
-        try:
-            from bzrlib.plugins.svn.branch import SvnBranch
-        except ImportError:
-            SvnBranch = None
-        if type(branch) != SvnBranch:
-            raise errors.CannotIndex(branch)
+    elif branch._format.network_name() == 'subversion':
         # We can't write to the 'bzrdir' as it is virtual
         uuid = branch.repository.uuid
         branch_path = branch.get_branch_path()
@@ -127,6 +120,8 @@
             transport = transport.clone(path)
             transport.ensure_base()
         index_transport = transport
+    else:
+        raise errors.CannotIndex(branch)
     lockdir = LockDir(index_transport, 'names-lock')
     lockdir.create()
     lockdir.lock_write()
@@ -201,11 +196,7 @@
     :param branch: The branch to get an index for.
     :raises: NoSearchIndex if no index can be located.
     """
-    try:
-        from bzrlib.plugins.svn.branch import SvnBranch
-    except (ImportError, IncompatibleAPI):
-        SvnBranch = None
-    if type(branch) == SvnBranch:
+    if branch._format.network_name() == 'subversion':
         # We can't write to the 'bzrdir' as it is virtual
         uuid = branch.repository.uuid
         branch_path = branch.get_branch_path()