Merge lp:~jelmer/bzr/converter into lp:bzr

[Jelmer Vernooij]

Move Converter from bzrlib.bzrdir to bzrlib.controldir.

Move Converter from bzrlib.bzrdir to bzrlib.controldir as it is generic.

[John A Meinel (jameinel)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 3/3/2011 2:08 AM, Jelmer Vernooij wrote:
> Jelmer Vernooij has proposed merging lp:~jelmer/bzr/converter into lp:bzr.
>
> Requested reviews:
> bzr-core (bzr-core)
>
> For more details, see:
> https://code.launchpad.net/~jelmer/bzr/converter/+merge/51993
>
> Move Converter from bzrlib.bzrdir to bzrlib.controldir as it is generic.

 merge: approve

Not sure it gives you much, but if you want it, you can have it.

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk1vWmgACgkQJdeBCYSNAAP7CwCgl7BsCNzTEuKU+2dJc84cbScq
FuAAnAqz1KaNfMTjboE5FQT4dygHHNIk
=2gJl
-----END PGP SIGNATURE-----

review: Approve

[Jelmer Vernooij (jelmer)]

sent to pqm by email

=== modified file 'bzrlib/bzrdir.py'
--- bzrlib/bzrdir.py	2011-02-24 16:13:39 +0000
+++ bzrlib/bzrdir.py	2011-03-03 01:09:03 +0000
@@ -2147,23 +2147,7 @@
 controldir.ControlDirFormat._default_format = __default_format
 
 
-class Converter(object):
-    """Converts a disk format object from one format to another."""
-
-    def convert(self, to_convert, pb):
-        """Perform the conversion of to_convert, giving feedback via pb.
-
-        :param to_convert: The disk object to convert.
-        :param pb: a progress bar to use for progress information.
-        """
-
-    def step(self, message):
-        """Update the pb by a step."""
-        self.count +=1
-        self.pb.update(message, self.count, self.total)
-
-
-class ConvertBzrDir4To5(Converter):
+class ConvertBzrDir4To5(controldir.Converter):
     """Converts format 4 bzr dirs to format 5."""
 
     def __init__(self):
@@ -2435,7 +2419,7 @@
         return order
 
 
-class ConvertBzrDir5To6(Converter):
+class ConvertBzrDir5To6(controldir.Converter):
     """Converts format 5 bzr dirs to format 6."""
 
     def convert(self, to_convert, pb):
@@ -2478,7 +2462,7 @@
             mode=self.bzrdir._get_file_mode())
 
 
-class ConvertBzrDir6ToMeta(Converter):
+class ConvertBzrDir6ToMeta(controldir.Converter):
     """Converts format 6 bzr dirs to metadirs."""
 
     def convert(self, to_convert, pb):
@@ -2601,7 +2585,7 @@
             self.file_mode)
 
 
-class ConvertMetaToMeta(Converter):
+class ConvertMetaToMeta(controldir.Converter):
     """Converts the components of metadirs."""
 
     def __init__(self, target_format):

=== modified file 'bzrlib/controldir.py'
--- bzrlib/controldir.py	2011-02-25 12:42:33 +0000
+++ bzrlib/controldir.py	2011-03-03 01:09:03 +0000
@@ -709,6 +709,22 @@
         return modules
 
 
+class Converter(object):
+    """Converts a disk format object from one format to another."""
+
+    def convert(self, to_convert, pb):
+        """Perform the conversion of to_convert, giving feedback via pb.
+
+        :param to_convert: The disk object to convert.
+        :param pb: a progress bar to use for progress information.
+        """
+
+    def step(self, message):
+        """Update the pb by a step."""
+        self.count +=1
+        self.pb.update(message, self.count, self.total)
+
+
 class ControlDirFormat(object):
     """An encapsulation of the initialization and open routines for a format.
 

=== modified file 'bzrlib/tests/per_controldir/test_controldir.py'
--- bzrlib/tests/per_controldir/test_controldir.py	2011-02-24 16:13:39 +0000
+++ bzrlib/tests/per_controldir/test_controldir.py	2011-03-03 01:09:03 +0000
@@ -1504,7 +1504,7 @@
             # (we force the latest known format as downgrades may not be
             # available
             self.assertTrue(isinstance(dir._format.get_converter(
-                format=dir._format), bzrdir.Converter))
+                format=dir._format), controldir.Converter))
         dir.needs_format_conversion(
             controldir.ControlDirFormat.get_default_format())
 

=== modified file 'doc/en/release-notes/bzr-2.4.txt'
--- doc/en/release-notes/bzr-2.4.txt	2011-02-26 15:39:49 +0000
+++ doc/en/release-notes/bzr-2.4.txt	2011-03-03 01:09:03 +0000
@@ -159,6 +159,9 @@
   indicates whether the components of the bzrdir can be upgraded
   independent of the ``BzrDir``. (Jelmer Vernooij)
 
+* ``Converter`` has been moved from ``bzrlib.bzrdir`` to
+  ``bzrlib.controldir``. (Jelmer Vernooij)
+
 * Repository formats can now provide
   ``_get_extra_interrepo_test_combinations`` in the same module 
   to provide extra test combinations for ``bzrlib.tests.per_repository``.