Rev 2195: Split up function for importing file id mappings. in file:///data/jelmer/bzr-svn/mappings/

[Jelmer Vernooij]

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

------------------------------------------------------------
revno: 2195
revision-id: jelmer at samba.org-20081206202909-4ke5tdsganlwd4rr
parent: jelmer at samba.org-20081206040040-91xzhq4iqde81fe1
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: mappings
timestamp: Sat 2008-12-06 21:29:09 +0100
message:
  Split up function for importing file id mappings.
modified:
  mapping.py                     mapping.py-20080128201303-6cp01phc0dmc0kiv-1
  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
  workingtree.py                 workingtree.py-20060306120941-b083cb0fdd4a69de
=== modified file 'mapping.py'
--- a/mapping.py	2008-12-05 20:59:16 +0000
+++ b/mapping.py	2008-12-06 20:29:09 +0000
@@ -402,11 +402,17 @@
         """
         raise NotImplementedError(self.get_rhs_ancestors)
 
-    def import_fileid_map(self, revprops, fileprops):
-        """Obtain the file id map for a revision from the properties.
-
-        """
-        raise NotImplementedError(self.import_fileid_map)
+    def import_fileid_map_fileprops(self, fileprops):
+        """Obtain the file id map for a revision from the properties.
+
+        """
+        raise NotImplementedError(self.import_fileid_map_fileprops)
+
+    def import_fileid_map_revprops(self, revprops):
+        """Obtain the file id map for a revision from the properties.
+
+        """
+        raise NotImplementedError(self.import_fileid_map_revprops)
 
     def export_fileid_map(self, fileids, revprops, fileprops):
         """Adjust the properties for a file id map.
@@ -579,7 +585,7 @@
             ancestry.extend(l.split("\n"))
         return ancestry
 
-    def import_fileid_map(self, svn_revprops, fileprops):
+    def import_fileid_map_fileprops(self, fileprops):
         fileids = fileprops.get(SVN_PROP_BZR_FILEIDS, None)
         if fileids is None:
             return {}
@@ -645,11 +651,12 @@
 
 
 class BzrSvnMappingRevProps(object):
+
     def import_revision(self, svn_revprops, fileprops, foreign_revid, rev):
         parse_svn_revprops(svn_revprops, rev)
         parse_bzr_svn_revprops(svn_revprops, rev)
 
-    def import_fileid_map(self, svn_revprops, fileprops):
+    def import_fileid_map_revprops(self, svn_revprops):
         if not svn_revprops.has_key(SVN_REVPROP_BZR_FILEIDS):
             return {}
         return parse_fileid_property(svn_revprops[SVN_REVPROP_BZR_FILEIDS])

=== modified file 'mapping4.py'
--- a/mapping4.py	2008-12-05 14:18:09 +0000
+++ b/mapping4.py	2008-12-06 20:29:09 +0000
@@ -119,11 +119,11 @@
         else:
             return self.fileprops.import_text_revisions(svn_revprops, fileprops)
 
-    def import_fileid_map(self, svn_revprops, fileprops):
-        if svn_revprops.has_key(mapping.SVN_REVPROP_BZR_MAPPING_VERSION):
-            return self.revprops.import_fileid_map(svn_revprops, fileprops)
-        else:
-            return self.fileprops.import_fileid_map(svn_revprops, fileprops)
+    def import_fileid_map_fileprops(self, fileprops):
+        return self.fileprops.import_fileid_map_fileprops(fileprops)
+
+    def import_fileid_map_revprops(self, revprops):
+        return self.revprops.import_fileid_map_revprops(revprops)
 
     def export_revision(self, branch_root, timestamp, timezone, committer, revprops, revision_id, 
                         revno, parent_ids, svn_revprops, svn_fileprops):

=== modified file 'revmeta.py'
--- a/revmeta.py	2008-12-05 21:26:27 +0000
+++ b/revmeta.py	2008-12-06 20:29:09 +0000
@@ -561,8 +561,10 @@
 
     def get_fileid_map(self, mapping):
         """Find the file id override map for this revision."""
-        return mapping.import_fileid_map(self.get_revprops(), 
-                                         self.get_changed_fileprops())
+        ret = mapping.import_fileid_map_revprops(self.get_revprops())
+        if ret != {}:
+            return ret
+        return mapping.import_fileid_map_fileprops(self.get_changed_fileprops())
 
     def get_text_revisions(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-11-28 22:46:49 +0000
+++ b/tests/mapping_implementations/test_base.py	2008-12-06 20:29:09 +0000
@@ -46,8 +46,12 @@
         self.mapping.export_revision("branchp", 432432432.0, 0, "somebody", {}, "arevid", 4, ["merge1"], revprops, fileprops)
         self.mapping.export_fileid_map(fileids, revprops, fileprops)
         revprops["svn:date"] = "2008-11-03T09:33:00.716938Z"
-        self.assertEquals(fileids, 
-                self.mapping.import_fileid_map(revprops, changed_props(fileprops)))
+        if self.mapping.can_use_revprops:
+            self.assertEquals(fileids, 
+                    self.mapping.import_fileid_map_revprops(revprops))
+        if self.mapping.can_use_fileprops:
+            self.assertEquals(fileids, 
+                    self.mapping.import_fileid_map_fileprops(changed_props(fileprops)))
 
     def test_text_parents(self):
         if not self.mapping.roundtripping:

=== modified file 'workingtree.py'
--- a/workingtree.py	2008-12-05 16:54:52 +0000
+++ b/workingtree.py	2008-12-06 20:29:09 +0000
@@ -612,8 +612,8 @@
             wc.close()
 
     def _get_new_file_ids(self, wc):
-        return self.branch.mapping.import_fileid_map({}, 
-                self._get_changed_branch_props())
+        return self.branch.mapping.import_fileid_map_fileprops(
+            self._get_changed_branch_props())
 
     def _get_svk_merges(self, base_branch_props):
         return base_branch_props.get(svk.SVN_PROP_SVK_MERGE, "")