Rev 2264: Ignore unknown branching schemes. in http://people.samba.org/bzr/jelmer/bzr-svn/0.5

[Jelmer Vernooij]

At http://people.samba.org/bzr/jelmer/bzr-svn/0.5

------------------------------------------------------------
revno: 2264
revision-id: jelmer at samba.org-20081214053411-yqie8jclpthvm1ny
parent: jelmer at samba.org-20081214025312-zegqow9142btxs9a
author: David Allouche <david at allouche.net>
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.5
timestamp: Sun 2008-12-14 06:34:11 +0100
message:
  Ignore unknown branching schemes.
modified:
  revids.py                      revids.py-20070416220458-36vfa0730cchevp1-1
=== modified file 'revids.py'
--- a/revids.py	2008-12-10 02:57:38 +0000
+++ b/revids.py	2008-12-14 05:34:11 +0000
@@ -32,6 +32,7 @@
         mapping_registry,
         parse_revid_property,
         )
+from bzrlib.plugins.svn.mapping3.scheme import UnknownBranchingScheme
 
 import subvertpy
 from subvertpy import ERR_FS_NOT_DIRECTORY
@@ -94,7 +95,10 @@
             # If there are any new entries that are not yet in the cache, 
             # add them
             for ((entry_revno, entry_revid), mapping_name) in revids:
-                yield (entry_revid, branch, 0, revno, mapping_registry.parse_mapping_name("svn-" + mapping_name))
+                try:
+                    yield (entry_revid, branch, 0, revno, mapping_registry.parse_mapping_name("svn-" + mapping_name))
+                except UnknownBranchingScheme:
+                    pass
 
     def bisect_revid_revnum(self, revid, branch_path, min_revnum, max_revnum):
         """Find out what the actual revnum was that corresponds to a revid.