bzr qlog breaks when bzr-svn incompatible with bzrlib

[Ian Clatworthy]

For bzr.dev rev 5110 or later, qlog breaks with this message ...

bzr: ERROR: The API for "<module 'bzrlib' from '/home/ian/Projects/lp/bzr/trunk/bzrlib/__init__.pyc'>" is not compatible with "(2, 1, 0)". It supports versions "(2, 2, 0)" to "(2, 2, 0)".

Weird.

[Gary van der Merwe (garyvdm)]

Disabling svn fixes this for me.

We probably do somithing like :

try:
  import bp.svn
except: ImportError:

which should be
except (ImportError, IncompatibleAPI):

[Gary van der Merwe (garyvdm)]

1.105 Traceback (most recent call last):
  File "/home/garyvdm/.bazaar/plugins/qbzr/lib/trace.py", line 291, in reports_exception_decorate
    return f(*args, **kargs)
  File "/home/garyvdm/.bazaar/plugins/qbzr/lib/log.py", line 233, in load
    self.log_list.load_locations(self.locations)
  File "/home/garyvdm/.bazaar/plugins/qbzr/lib/logwidget.py", line 162, in load_locations
    self.graph_provider.open_locations(locations)
  File "/home/garyvdm/.bazaar/plugins/qbzr/lib/loggraphprovider.py", line 301, in open_locations
    self.append_branch(tree, br)
  File "/home/garyvdm/.bazaar/plugins/qbzr/lib/loggraphprovider.py", line 243, in append_branch
    bi.index = self.open_search_index(branch)
  File "/home/garyvdm/.bazaar/plugins/qbzr/lib/loggraphprovider.py", line 249, in open_search_index
    return search_index.open_index_branch(branch)
  File "/home/garyvdm/.bazaar/plugins/search/index.py", line 192, in open_index_branch
    from bzrlib.plugins.svn.branch import SvnBranch
  File "/usr/lib/python2.6/dist-packages/bzrlib/plugins/svn/__init__.py", line 46, in <module>
    bzrlib.api.require_any_api(bzrlib, bzr_compatible_versions)
  File "/home/garyvdm/bzr/bzr.dev/bzrlib/api.py", line 104, in require_any_api
    require_api(object_with_api, wanted_api_list[-1])
  File "/home/garyvdm/bzr/bzr.dev/bzrlib/api.py", line 82, in require_api
    raise IncompatibleAPI(object_with_api, wanted_api, minimum, current)
IncompatibleAPI: The API for "<module 'bzrlib' from '/home/garyvdm/bzr/bzr.dev/bzrlib/__init__.pyc'>" is not compatible with "(2, 1, 0)". It supports versions "(2, 2, 0)" to "(2, 2, 0)".

The bug is actually in bzr.search