← Back to branch summary

~jelmer/bzr-search/lazy-xml

« back to all changes in this revision

Viewing changes to index.py

  • Committer: Robert Collins
  • Date: 2010-05-14 14:28:24 UTC
  • mfrom: (77.1.1 trunk)
  • Revision ID: robertc@robertcollins.net-20100514142824-ndc75aqggci4764n
Land Gary's bzr-svn compat fix.

Show diffs side-by-side

added added

removed removed

Lines of Context:
index.py
27
27
from bzrlib.btree_index import BTreeGraphIndex, BTreeBuilder
28
28
from bzrlib.bzrdir import BzrDirMeta1
29
29
import bzrlib.config
30
 
from bzrlib.errors import NotBranchError, NoSuchFile, UnknownFormatError
 
30
from bzrlib.errors import (
 
31
    NotBranchError,
 
32
    NoSuchFile,
 
33
    UnknownFormatError,
 
34
    IncompatibleAPI,
 
35
)
31
36
from bzrlib.index import CombinedGraphIndex, GraphIndex, InMemoryGraphIndex
32
37
from bzrlib.lockdir import LockDir
33
38
try:
190
195
    """
191
196
    try:
192
197
        from bzrlib.plugins.svn.branch import SvnBranch
193
 
    except ImportError:
 
198
    except (ImportError, IncompatibleAPI):
194
199
        SvnBranch = None
195
200
    if type(branch) == SvnBranch:
196
201
        # We can't write to the 'bzrdir' as it is virtual