Rev 6528: (jelmer) Remove deprecated register_format. (Jelmer Vernooij) in file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

[Patch Queue Manager]

At file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 6528 [merge]
revision-id: pqm at pqm.ubuntu.com-20120626140058-x12qbjzn5hj18yet
parent: pqm at pqm.ubuntu.com-20120626130108-ii918gx210vciviu
parent: jelmer at samba.org-20120626131740-pvv8fsxl35r7mt7e
committer: Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2012-06-26 14:00:58 +0000
message:
  (jelmer) Remove deprecated register_format. (Jelmer Vernooij)
modified:
  bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
  bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
  bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
  doc/en/release-notes/bzr-2.6.txt bzr2.6.txt-20120116134316-8w1xxom1c7vcu1t5-1
=== modified file 'bzrlib/branch.py'
--- a/bzrlib/branch.py	2012-06-18 11:43:07 +0000
+++ b/bzrlib/branch.py	2012-06-26 12:58:22 +0000
@@ -1694,11 +1694,6 @@
         """True if this format supports leaving locks in place."""
         return False # by default
 
-    @classmethod
-    @deprecated_method(deprecated_in((2, 4, 0)))
-    def unregister_format(klass, format):
-        format_registry.remove(format)
-
     def __str__(self):
         return self.get_format_description().rstrip()
 

=== modified file 'bzrlib/repository.py'
--- a/bzrlib/repository.py	2012-06-18 11:43:07 +0000
+++ b/bzrlib/repository.py	2012-06-26 12:58:22 +0000
@@ -1432,22 +1432,6 @@
     def __ne__(self, other):
         return not self == other
 
-    @classmethod
-    @symbol_versioning.deprecated_method(symbol_versioning.deprecated_in((2, 4, 0)))
-    def register_format(klass, format):
-        format_registry.register(format)
-
-    @classmethod
-    @symbol_versioning.deprecated_method(symbol_versioning.deprecated_in((2, 4, 0)))
-    def unregister_format(klass, format):
-        format_registry.remove(format)
-
-    @classmethod
-    @symbol_versioning.deprecated_method(symbol_versioning.deprecated_in((2, 4, 0)))
-    def get_default_format(klass):
-        """Return the current default format."""
-        return format_registry.get_default()
-
     def get_format_description(self):
         """Return the short description for this format."""
         raise NotImplementedError(self.get_format_description)

=== modified file 'bzrlib/tests/test_repository.py'
--- a/bzrlib/tests/test_repository.py	2012-02-23 19:45:15 +0000
+++ b/bzrlib/tests/test_repository.py	2012-06-26 12:58:22 +0000
@@ -178,25 +178,6 @@
         repository.RepositoryFormatMetaDir.register_feature("name")
         found_format.check_support_status(True)
 
-    def test_register_unregister_format(self):
-        # Test deprecated format registration functions
-        format = SampleRepositoryFormat()
-        # make a control dir
-        dir = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
-        # make a repo
-        format.initialize(dir)
-        # register a format for it.
-        self.applyDeprecated(symbol_versioning.deprecated_in((2, 4, 0)),
-            repository.RepositoryFormat.register_format, format)
-        # which repository.Open will refuse (not supported)
-        self.assertRaises(UnsupportedFormatError, repository.Repository.open,
-            self.get_url())
-        # but open(unsupported) will work
-        self.assertEqual(format.open(dir), "opened repository.")
-        # unregister the format
-        self.applyDeprecated(symbol_versioning.deprecated_in((2, 4, 0)),
-            repository.RepositoryFormat.unregister_format, format)
-
 
 class TestRepositoryFormatRegistry(TestCase):
 

=== modified file 'doc/en/release-notes/bzr-2.6.txt'
--- a/doc/en/release-notes/bzr-2.6.txt	2012-06-26 12:14:56 +0000
+++ b/doc/en/release-notes/bzr-2.6.txt	2012-06-26 13:17:40 +0000
@@ -58,6 +58,9 @@
 .. Changes that may require updates in plugins or other code that uses
    bzrlib.
 
+* Remove deprecated ``RepositoryFormat.register_format``.
+  (Jelmer Vernooij)
+
 * The previously deprecated ``bzrlib.annotate.annotate_file`` function
   has been removed. (Jelmer Vernooij)