Rev 1658: Fix bug, add another assertion. in http://people.samba.org/bzr/jelmer/bzr-svn/trunk

[Jelmer Vernooij]

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

------------------------------------------------------------
revno: 1658
revision-id: jelmer at samba.org-20080826014441-3fxukz7wlyty7p29
parent: jelmer at samba.org-20080826013425-lso1a510eessswgg
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Tue 2008-08-26 03:44:41 +0200
message:
  Fix bug, add another assertion.
modified:
  commit.py                      commit.py-20060607190346-qvq128wgfubhhgm2-1
  mapping3/__init__.py           __init__.py-20080502174630-9324zh25kka98vlw-1
=== modified file 'commit.py'
--- a/commit.py	2008-08-26 01:34:25 +0000
+++ b/commit.py	2008-08-26 01:44:41 +0000
@@ -493,6 +493,7 @@
                                               bp_parts, -1)
             self.revision_metadata = None
             for prop in self._svn_revprops:
+                assert prop.split(":")[0] in ("bzr", "svk", "svn")
                 if not properties.is_valid_property_name(prop):
                     warning("Setting property %r with invalid characters in name", prop)
             conn = self.repository.transport.get_connection()

=== modified file 'mapping3/__init__.py'
--- a/mapping3/__init__.py	2008-08-25 00:05:15 +0000
+++ b/mapping3/__init__.py	2008-08-26 01:44:41 +0000
@@ -344,8 +344,8 @@
     def export_revision(self, can_use_custom_revprops, branch_root, timestamp, timezone, committer, revprops, revision_id, revno, merges, old_fileprops):
         (_, fileprops) = mapping.BzrSvnMappingFileProps.export_revision(self, can_use_custom_revprops, branch_root, timestamp, timezone, committer, revprops, revision_id, revno, merges, old_fileprops)
         if can_use_custom_revprops:
-            (revprops, _) = self.revprop_map.export_revision(can_use_custom_revprops, branch_root, timestamp, timezone, committer, revprops, None, revno, merges, old_fileprops)
-        return (revprops, fileprops)
+            (svn_revprops, _) = self.revprop_map.export_revision(can_use_custom_revprops, branch_root, timestamp, timezone, committer, revprops, None, revno, merges, old_fileprops)
+        return (svn_revprops, fileprops)
 
     def export_fileid_map(self, can_use_custom_revprops, fileids, revprops, fileprops):
         mapping.BzrSvnMappingFileProps.export_fileid_map(self, can_use_custom_revprops, fileids, revprops, fileprops)