Rev 2197: Split up import_text_revisions. in file:///data/jelmer/bzr-svn/mappings/

[Jelmer Vernooij]

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

------------------------------------------------------------
revno: 2197
revision-id: jelmer at samba.org-20081206204753-v205trl203xqzk69
parent: jelmer at samba.org-20081206203905-lngnyztbn5k2256o
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: mappings
timestamp: Sat 2008-12-06 21:47:53 +0100
message:
  Split up import_text_revisions.
modified:
  mapping.py                     mapping.py-20080128201303-6cp01phc0dmc0kiv-1
  mapping2.py                    mapping.py-20080904055555-lw057kjuadn0r2ma-2
  mapping4.py                    mapping4.py-20080827182338-y4xzpsf43vyiwcir-1
  revmeta.py                     revmeta.py-20080901215045-n8a6arqybs9ez5hl-1
  tests/mapping_implementations/test_base.py test_base.py-20080904055908-3t0g1y0qnmr6aeiq-1
=== modified file 'mapping.py'
--- a/mapping.py	2008-12-06 20:39:05 +0000
+++ b/mapping.py	2008-12-06 20:47:53 +0000
@@ -455,8 +455,11 @@
         """
         raise NotImplementedError(self.export_text_revisions)
 
-    def import_text_revisions(self, revprops, fileprops):
-        raise NotImplementedError(self.import_text_revisions)
+    def import_text_revisions_revprops(self, revprops):
+        raise NotImplementedError(self.import_text_revisions_revprops)
+
+    def import_text_revisions_fileprops(self, fileprops):
+        raise NotImplementedError(self.import_text_revisions_fileprops)
 
     def export_revision(self, branch_root, timestamp, timezone, committer, revprops, revision_id, revno, parent_ids, svn_revprops, svn_fileprops):
         """Determines the revision properties and branch root file 
@@ -555,12 +558,15 @@
     def import_text_parents_revprops(self, svn_revprops):
         return {}
 
-    def import_text_revisions(self, svn_revprops, fileprops):
+    def import_text_revisions_fileprops(self, fileprops):
         metadata = fileprops.get(SVN_PROP_BZR_TEXT_REVISIONS)
         if metadata is None:
             return {}
         return parse_text_revisions_property(metadata[1])
 
+    def import_text_revisions_revprops(self, svn_revprops):
+        return {}
+
     def export_text_parents(self, text_parents, svn_revprops, fileprops):
         if text_parents != {}:
             fileprops[SVN_PROP_BZR_TEXT_PARENTS] = generate_text_parents_property(text_parents)
@@ -682,11 +688,14 @@
         if text_parents != {}:
             svn_revprops[SVN_REVPROP_BZR_TEXT_PARENTS] = generate_text_parents_property(text_parents)
 
-    def import_text_revisions(self, svn_revprops, fileprops):
+    def import_text_revisions_revprops(self, svn_revprops):
         if not svn_revprops.has_key(SVN_REVPROP_BZR_TEXT_REVISIONS):
             return {}
         return parse_text_revisions_property(svn_revprops[SVN_REVPROP_BZR_TEXT_REVISIONS])
 
+    def import_text_revisions_fileprops(self, fileprops):
+        return {}
+
     def export_text_revisions(self, text_revisions, svn_revprops, fileprops):
         if text_revisions != {}:
             svn_revprops[SVN_REVPROP_BZR_TEXT_REVISIONS] = generate_text_revisions_property(text_revisions)

=== modified file 'mapping2.py'
--- a/mapping2.py	2008-12-06 20:39:05 +0000
+++ b/mapping2.py	2008-12-06 20:47:53 +0000
@@ -94,7 +94,10 @@
     def import_text_parents_revprops(self, revprops):
         return {}
 
-    def import_text_revisions(self, svn_revprops, fileprops):
+    def import_text_revisions_revprops(self, svn_revprops):
+        return {}
+
+    def import_text_revisions_fileprops(self, fileprops):
         return {}
 
     def get_rhs_parents(self, branch_path, revprops, fileprops):

=== modified file 'mapping4.py'
--- a/mapping4.py	2008-12-06 20:39:05 +0000
+++ b/mapping4.py	2008-12-06 20:47:53 +0000
@@ -113,11 +113,11 @@
     def import_text_parents_revprops(self, svn_revprops):
         return self.revprops.import_text_parents_revprops(svn_revprops)
 
-    def import_text_revisions(self, svn_revprops, fileprops):
-        if svn_revprops.has_key(mapping.SVN_REVPROP_BZR_TEXT_REVISIONS):
-            return self.revprops.import_text_revisions(svn_revprops, fileprops)
-        else:
-            return self.fileprops.import_text_revisions(svn_revprops, fileprops)
+    def import_text_revisions_revprops(self, svn_revprops):
+        return self.revprops.import_text_revisions(svn_revprops)
+
+    def import_text_revisions_fileprops(self, fileprops):
+        return self.fileprops.import_text_revisions(fileprops)
 
     def import_fileid_map_fileprops(self, fileprops):
         return self.fileprops.import_fileid_map_fileprops(fileprops)

=== modified file 'revmeta.py'
--- a/revmeta.py	2008-12-06 20:39:05 +0000
+++ b/revmeta.py	2008-12-06 20:47:53 +0000
@@ -573,8 +573,8 @@
 
     def get_text_revisions(self, mapping):
         """Return text revision override map for this revision."""
-        return mapping.import_text_revisions(self.get_revprops(), 
-                                             self.get_changed_fileprops())
+        return self._import_from_props(mapping.import_text_revisions_fileprops,
+                                       mapping.import_text_revisions_revprops)
 
     def get_text_parents(self, mapping):
         """Return text revision override map for this revision."""

=== modified file 'tests/mapping_implementations/test_base.py'
--- a/tests/mapping_implementations/test_base.py	2008-12-06 20:39:05 +0000
+++ b/tests/mapping_implementations/test_base.py	2008-12-06 20:47:53 +0000
@@ -74,8 +74,12 @@
         fileprops = {}
         text_revisions = {"bla": "bloe", "ll": "12"}
         self.mapping.export_text_revisions(text_revisions, revprops, fileprops)
-        self.assertEquals(text_revisions,
-            self.mapping.import_text_revisions(revprops, changed_props(fileprops)))
+        if self.mapping.can_use_revprops:
+            self.assertEquals(text_revisions,
+                self.mapping.import_text_revisions_revprops(revprops))
+        if self.mapping.can_use_fileprops:
+            self.assertEquals(text_revisions,
+                self.mapping.import_text_revisions_fileprops(changed_props(fileprops)))
 
     def test_message(self):
         if not self.mapping.roundtripping: