Rev 2199: Split up get_lhs_parent(). in file:///data/jelmer/bzr-svn/mappings/

[Jelmer Vernooij]

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

------------------------------------------------------------
revno: 2199
revision-id: jelmer at samba.org-20081206211019-tdc75z9qsyly1o43
parent: jelmer at samba.org-20081206210426-4sq69e9f6578hiov
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: mappings
timestamp: Sat 2008-12-06 22:10:19 +0100
message:
  Split up get_lhs_parent().
modified:
  mapping.py                     mapping.py-20080128201303-6cp01phc0dmc0kiv-1
  mapping4.py                    mapping4.py-20080827182338-y4xzpsf43vyiwcir-1
  revmeta.py                     revmeta.py-20080901215045-n8a6arqybs9ez5hl-1
=== modified file 'mapping.py'
--- a/mapping.py	2008-12-06 21:04:26 +0000
+++ b/mapping.py	2008-12-06 21:10:19 +0000
@@ -381,14 +381,25 @@
         """
         raise NotImplementedError(self.import_revision)
 
-    def get_lhs_parent(self, branch_path, revprops, fileprops):
-        """Determine the left hand side parent, if it was explicitly recorded.
-
-        If not explicitly recorded, returns None. Returns NULL_REVISION if 
-        there is no lhs parent.
-
-        """
-        return None
+    def get_lhs_parent_revprops(self, revprops):
+        """Determine the left hand side parent, if it was explicitly recorded.
+
+        If not explicitly recorded, returns None. Returns NULL_REVISION if 
+        there is no lhs parent.
+
+        """
+        return None
+
+    def get_lhs_parent_fileprops(self, fileprops):
+        """Determine the left hand side parent, if it was explicitly recorded.
+
+        If not explicitly recorded, returns None. Returns NULL_REVISION if 
+        there is no lhs parent.
+
+        """
+        return None
+
+
 
     def get_rhs_parents_fileprops(self, fileprops):
         """Obtain the right-hand side parents for a revision.
@@ -709,11 +720,12 @@
         if text_revisions != {}:
             svn_revprops[SVN_REVPROP_BZR_TEXT_REVISIONS] = generate_text_revisions_property(text_revisions)
 
-    def get_lhs_parent(self, branch_parent, svn_revprops, fileprops):
-        if self.get_branch_root(svn_revprops) != branch_parent:
-            return None
+    def get_lhs_parent_revprops(self, svn_revprops):
         return svn_revprops.get(SVN_REVPROP_BZR_BASE_REVISION)
 
+    def get_lhs_parent_fileprops(self, fileprops):
+        return None
+
     def get_rhs_parents_revprops(self, svn_revprops):
         return tuple(svn_revprops.get(SVN_REVPROP_BZR_MERGE, "").splitlines())
 

=== modified file 'mapping4.py'
--- a/mapping4.py	2008-12-06 21:04:26 +0000
+++ b/mapping4.py	2008-12-06 21:10:19 +0000
@@ -92,13 +92,16 @@
     def get_branch_root(self, revprops):
         return self.revprops.get_branch_root(revprops)
 
-    def get_lhs_parent(self, branch_path, svn_revprops, fileprops):
-        return self.revprops.get_lhs_parent(branch_path, svn_revprops, fileprops)
+    def get_lhs_parent_fileprops(self, fileprops):
+        return None
+
+    def get_lhs_parent_revprops(self, svn_revprops):
+        return self.revprops.get_lhs_parent(svn_revprops)
 
     def get_rhs_parents_revprops(self, svn_revprops):
         return self.revprops.get_rhs_parents_revprops(svn_revprops)
     
-    def get_rhs_parent_fileprops(self, fileprops):
+    def get_rhs_parents_fileprops(self, fileprops):
         return self.fileprops.get_rhs_parents_fileprops(fileprops)
 
     def get_revision_id(self, branch_path, revprops, fileprops):

=== modified file 'revmeta.py'
--- a/revmeta.py	2008-12-06 21:04:26 +0000
+++ b/revmeta.py	2008-12-06 21:10:19 +0000
@@ -343,8 +343,10 @@
         return find_mapping(self.get_revprops(), self.get_changed_fileprops())
 
     def _get_stored_lhs_parent_revid(self, mapping):
-        return mapping.get_lhs_parent(self.branch_path, 
-                            self.get_revprops(), self.get_changed_fileprops())
+        return self._import_from_props(mapping, 
+                mapping.get_lhs_parent_fileprops,
+                mapping.get_lhs_parent_revprops, 
+                None)
 
     def get_lhs_parent_revid(self, mapping):
         """Find the revid of the left hand side parent of this revision."""
@@ -453,7 +455,7 @@
         """Check what Bazaar revisions were merged in this revision."""
         return self._import_from_props(mapping,
             mapping.get_rhs_parents_fileprops,
-            mapping.get_rhs_parent_revprops, ())
+            mapping.get_rhs_parents_revprops, ())
 
     def get_svk_merges(self, mapping):
         """Check what SVK revisions were merged in this revision."""