Rev 2202: Remove find_mapping. in file:///data/jelmer/bzr-svn/mappings/

[Jelmer Vernooij]

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

------------------------------------------------------------
revno: 2202
revision-id: jelmer at samba.org-20081206213800-dvskxzcu9qwq0332
parent: jelmer at samba.org-20081206212348-sdnj0toepf7sfar2
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: mappings
timestamp: Sat 2008-12-06 22:38:00 +0100
message:
  Remove find_mapping.
modified:
  mapping.py                     mapping.py-20080128201303-6cp01phc0dmc0kiv-1
  revids.py                      revids.py-20070416220458-36vfa0730cchevp1-1
  revmeta.py                     revmeta.py-20080901215045-n8a6arqybs9ez5hl-1
=== modified file 'mapping.py'
--- a/mapping.py	2008-12-06 21:23:48 +0000
+++ b/mapping.py	2008-12-06 21:38:00 +0000
@@ -861,16 +861,6 @@
     return None
 
 
-def find_mapping(revprops, changed_fileprops):
-    """Find a mapping instance based on the revprops and fileprops set on a revision.
-
-    :param revprops: Revision properties.
-    :param fileprops: File properties set on branch root.
-    :return: BzrSvnMapping instance or None if no mapping found.
-    """
-    return find_mapping_revprops(revprops) or find_mapping_fileprops(changed_fileprops)
-
-
 def is_bzr_revision_revprops(revprops):
     """Check if the specified revision properties 
     contain bzr-svn metadata."""

=== modified file 'revids.py'
--- a/revids.py	2008-12-05 20:59:16 +0000
+++ b/revids.py	2008-12-06 21:38:00 +0000
@@ -26,7 +26,6 @@
 from bzrlib.plugins.svn.mapping import (
         BzrSvnMapping,
         SVN_PROP_BZR_REVISION_ID,
-        find_mapping,
         find_new_lines,
         is_bzr_revision_revprops,
         mapping_registry,

=== modified file 'revmeta.py'
--- a/revmeta.py	2008-12-06 21:23:48 +0000
+++ b/revmeta.py	2008-12-06 21:38:00 +0000
@@ -36,7 +36,8 @@
         )
 from bzrlib.plugins.svn.mapping import (
         estimate_bzr_ancestors, 
-        find_mapping,
+        find_mapping_fileprops,
+        find_mapping_revprops,
         get_roundtrip_ancestor_revids,
         is_bzr_revision_fileprops, 
         is_bzr_revision_revprops, 
@@ -340,9 +341,10 @@
         """Find the original mapping that was used to store this revision
         or None if it is not a bzr-svn revision.
         """
-        if not self.is_bzr_revision():
-            return None
-        return find_mapping(self.get_revprops(), self.get_changed_fileprops())
+        return self._import_from_props(mapping,
+                find_mapping_fileprops,
+                find_mapping_revprops,
+                None)
 
     def _get_stored_lhs_parent_revid(self, mapping):
         return self._import_from_props(mapping,