Rev 1677: Use foreign utility functions. in file:///data/jelmer/bzr-svn/trunk/

[Jelmer Vernooij]

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

------------------------------------------------------------
revno: 1677
revision-id: jelmer at samba.org-20080827193925-kqfzvdq2km4beq5t
parent: jelmer at samba.org-20080827193729-gems6nqys1i6xdf2
parent: jelmer at samba.org-20080823141829-fo2ag5cxujoltimm
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Wed 2008-08-27 21:39:25 +0200
message:
  Use foreign utility functions.
modified:
  mapping.py                     mapping.py-20080128201303-6cp01phc0dmc0kiv-1
    ------------------------------------------------------------
    revno: 1616.1.1
    revision-id: jelmer at samba.org-20080823141829-fo2ag5cxujoltimm
    parent: jelmer at samba.org-20080823105414-ly0rpd1kv5uetcsz
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: foreign-util
    timestamp: Sat 2008-08-23 16:18:29 +0200
    message:
      Use bzrlib.foreign.
    modified:
      mapping.py                     mapping.py-20080128201303-6cp01phc0dmc0kiv-1
=== modified file 'mapping.py'
--- a/mapping.py	2008-08-27 19:29:40 +0000
+++ b/mapping.py	2008-08-27 19:39:25 +0000
@@ -19,7 +19,7 @@
 from bzrlib.errors import InvalidRevisionId
 from bzrlib.trace import mutter
 
-from bzrlib.plugins.svn import errors, properties, version_info
+from bzrlib.plugins.svn import errors, foreign, properties, version_info
 import calendar
 import time
 import urllib
@@ -250,7 +250,7 @@
             rev.properties[name[len(SVN_REVPROP_BZR_REVPROP_PREFIX):]] = value
 
 
-class BzrSvnMapping(object):
+class BzrSvnMapping(foreign.VcsMapping):
     """Class that maps between Subversion and Bazaar semantics."""
     experimental = False
     _warned_experimental = False
@@ -654,30 +654,7 @@
         raise NotImplementedError(self.get_rhs_ancestors)
 
 
-class BzrSvnMappingRegistry(registry.Registry):
-    """Registry for the various Bzr<->Svn mappings."""
-    def register(self, key, factory, help):
-        """Register a mapping between Bazaar and Subversion semantics.
-
-        The factory must be a callable that takes one parameter: the key.
-        It must produce an instance of BzrSvnMapping when called.
-        """
-        registry.Registry.register(self, key, factory, help)
-
-    def set_default(self, key):
-        """Set the 'default' key to be a clone of the supplied key.
-
-        This method must be called once and only once.
-        """
-        self._set_default_key(key)
-
-    def get_default(self):
-        """Convenience function for obtaining the default mapping to use."""
-        return self.get(self._get_default_key())
-
-
-
-mapping_registry = BzrSvnMappingRegistry()
+mapping_registry = foreign.VcsMappingRegistry()
 mapping_registry.register('v1', BzrSvnMappingv1,
         'Original bzr-svn mapping format')
 mapping_registry.register('v2', BzrSvnMappingv2,