Rev 629: Fix two more tests. in file:///data/jelmer/bzr-svn/revprops/

[Jelmer Vernooij]

At file:///data/jelmer/bzr-svn/revprops/

------------------------------------------------------------
revno: 629
revision-id:jelmer at samba.org-20080202194102-whp3aq1uud69n7c4
parent: jelmer at samba.org-20080202191921-9rlucp4e2syhtj68
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: revprops
timestamp: Sat 2008-02-02 20:41:02 +0100
message:
  Fix two more tests.
modified:
  mapping.py                     mapping.py-20080128201303-6cp01phc0dmc0kiv-1
  repository.py                  repository.py-20060306123302-1f8c5069b3fe0265
=== modified file 'mapping.py'
--- a/mapping.py	2008-02-02 19:19:21 +0000
+++ b/mapping.py	2008-02-02 19:41:02 +0000
@@ -450,7 +450,7 @@
                 get_branch_file_property(SVN_PROP_BZR_REVISION_INFO, ""), rev)
 
     @classmethod
-    def _svk_merged_revisions(cls, revprops, get_branch_file_property):
+    def _svk_merged_revisions(cls, get_branch_file_property, scheme):
         """Find out what SVK features were merged in a revision.
 
         """

=== modified file 'repository.py'
--- a/repository.py	2008-02-01 22:28:08 +0000
+++ b/repository.py	2008-02-02 19:41:02 +0000
@@ -478,7 +478,12 @@
             return revid
 
         # See if there is a bzr:revision-id revprop set
-        revprops = self._log._get_transport().revprop_list(revnum)
+        try:
+            revprops = self._log._get_transport().revprop_list(revnum)
+        except SubversionException, (_, num):
+            if num == svn.core.SVN_ERR_FS_NO_SUCH_REVISION:
+                raise NoSuchRevision(path, revnum)
+            raise
         (bzr_revno, revid) = default_mapping.get_revision_id(revprops, 
                 lambda name, default: self.branchprop_list.get_changed_property(path, revnum, name, default),
                 scheme)