Merge lp:~jelmer/brz/pending into lp:brz

[Jelmer Vernooij]

Add registration for Converter objects.

Add registration for Converter objects.

[Martin Packman (gz)]

Looks good, thanks!

review: Approve

[The Breezy Bot (the-breezy-bot)]

Running landing tests failed
https://ci.breezy-vcs.org/job/brz/job/brz-land/167/

[The Breezy Bot (the-breezy-bot)]

Merging failed
https://ci.breezy-vcs.org/job/brz/job/brz-land/221/

[The Breezy Bot (the-breezy-bot)]

Running landing tests failed
https://ci.breezy-vcs.org/job/brz/job/brz-land/222/

[The Breezy Bot (the-breezy-bot)]

Running landing tests failed
https://ci.breezy-vcs.org/job/brz/job/brz-land/258/

[The Breezy Bot (the-breezy-bot)]

Merging failed
https://ci.breezy-vcs.org/job/brz/job/brz-land/500/

[The Breezy Bot (the-breezy-bot)]

Merging failed
https://ci.breezy-vcs.org/job/brz/job/brz-land/752/

[The Breezy Bot (the-breezy-bot)]

Merging failed
https://ci.breezy-vcs.org/job/brz/job/brz-land/996/

Unmerged revisions

7221. By Jelmer Vernooij on 2019-02-04

Merge trunk.

7220. By Jelmer Vernooij on 2019-01-06

Merge trunk.

7219. By Jelmer Vernooij on 2018-11-27

Add registration for Converter objects.

=== modified file 'breezy/bzr/bzrdir.py'
--- breezy/bzr/bzrdir.py	2018-11-18 19:48:57 +0000
+++ breezy/bzr/bzrdir.py	2019-02-04 13:47:49 +0000
@@ -869,10 +869,6 @@
             self.control_transport, self._format._lock_file_name,
             self._format._lock_class)
 
-    def can_convert_format(self):
-        """See BzrDir.can_convert_format()."""
-        return True
-
     def create_branch(self, name=None, repository=None,
                       append_revisions_only=None):
         """See ControlDir.create_branch."""
@@ -1612,21 +1608,6 @@
                              ' using format:\n  %s'),
                      new_branch_format.get_format_description())
 
-    def get_converter(self, format=None):
-        """See BzrDirFormat.get_converter()."""
-        if format is None:
-            format = BzrDirFormat.get_default_format()
-        if (isinstance(self, BzrDirMetaFormat1)
-                and isinstance(format, BzrDirMetaFormat1Colo)):
-            return ConvertMetaToColo(format)
-        if (isinstance(self, BzrDirMetaFormat1Colo)
-                and isinstance(format, BzrDirMetaFormat1)):
-            return ConvertMetaToColo(format)
-        if not isinstance(self, format.__class__):
-            # converting away from metadir is not implemented
-            raise NotImplementedError(self.get_converter)
-        return ConvertMetaToMeta(format)
-
     @classmethod
     def get_format_string(cls):
         """See BzrDirFormat.get_format_string()."""
@@ -1720,29 +1701,27 @@
         return BzrDirMeta1(transport, format)
 
 
-class ConvertMetaToMeta(controldir.Converter):
+class ConvertMetaContents(controldir.Converter):
     """Converts the components of metadirs."""
 
-    def __init__(self, target_format):
-        """Create a metadir to metadir converter.
-
-        :param target_format: The final metadir format that is desired.
-        """
-        self.target_format = target_format
-
-    def convert(self, to_convert, pb):
+    @classmethod
+    def is_compatible(cls, source_format, target_format):
+        return (isinstance(source_format, BzrDirMetaFormat1) and
+                isinstance(target_format, BzrDirMetaFormat1) and
+                source_format.get_format_string() == target_format.get_format_string())
+
+    def convert(self, to_convert, target_format, pb):
         """See Converter.convert()."""
-        self.controldir = to_convert
         self.pb = ui.ui_factory.nested_progress_bar()
         self.count = 0
         self.total = 1
         self.step('checking repository format')
         try:
-            repo = self.controldir.open_repository()
+            repo = to_convert.open_repository()
         except errors.NoRepositoryPresent:
             pass
         else:
-            repo_fmt = self.target_format.repository_format
+            repo_fmt = target_format.repository_format
             if not isinstance(repo._format, repo_fmt.__class__):
                 from ..repository import CopyConverter
                 ui.ui_factory.note(gettext('starting repository conversion'))
@@ -1750,14 +1729,14 @@
                     raise AssertionError(
                         "Repository in metadir does not support "
                         "overriding transport")
-                converter = CopyConverter(self.target_format.repository_format)
+                converter = CopyConverter(target_format.repository_format)
                 converter.convert(repo, pb)
-        for branch in self.controldir.list_branches():
+        for branch in to_convert.list_branches():
             # TODO: conversions of Branch and Tree should be done by
             # InterXFormat lookups/some sort of registry.
             # Avoid circular imports
             old = branch._format.__class__
-            new = self.target_format.get_branch_format().__class__
+            new = target_format.get_branch_format().__class__
             while old != new:
                 if (old == fullhistorybranch.BzrBranchFormat5
                     and new in (_mod_bzrbranch.BzrBranchFormat6,
@@ -1775,10 +1754,10 @@
                     raise errors.BadConversionTarget("No converter", new,
                                                      branch._format)
                 branch_converter.convert(branch)
-                branch = self.controldir.open_branch()
+                branch = to_convert.open_branch()
                 old = branch._format.__class__
         try:
-            tree = self.controldir.open_workingtree(recommend_upgrade=False)
+            tree = to_convert.open_workingtree(recommend_upgrade=False)
         except (errors.NoWorkingTree, errors.NotLocalUrl):
             pass
         else:
@@ -1786,56 +1765,48 @@
             # InterXFormat lookups
             if (isinstance(tree, workingtree_3.WorkingTree3)
                 and not isinstance(tree, workingtree_4.DirStateWorkingTree)
-                and isinstance(self.target_format.workingtree_format,
+                and isinstance(target_format.workingtree_format,
                                workingtree_4.DirStateWorkingTreeFormat)):
                 workingtree_4.Converter3to4().convert(tree)
             if (isinstance(tree, workingtree_4.DirStateWorkingTree)
                 and not isinstance(tree, workingtree_4.WorkingTree5)
-                and isinstance(self.target_format.workingtree_format,
+                and isinstance(target_format.workingtree_format,
                                workingtree_4.WorkingTreeFormat5)):
                 workingtree_4.Converter4to5().convert(tree)
             if (isinstance(tree, workingtree_4.DirStateWorkingTree)
                 and not isinstance(tree, workingtree_4.WorkingTree6)
-                and isinstance(self.target_format.workingtree_format,
+                and isinstance(target_format.workingtree_format,
                                workingtree_4.WorkingTreeFormat6)):
                 workingtree_4.Converter4or5to6().convert(tree)
         self.pb.finished()
         return to_convert
 
 
-class ConvertMetaToColo(controldir.Converter):
-    """Add colocated branch support."""
-
-    def __init__(self, target_format):
-        """Create a converter.that upgrades a metadir to the colo format.
-
-        :param target_format: The final metadir format that is desired.
-        """
-        self.target_format = target_format
-
-    def convert(self, to_convert, pb):
-        """See Converter.convert()."""
-        to_convert.transport.put_bytes('branch-format',
-                                       self.target_format.as_string())
-        return BzrDir.open_from_transport(to_convert.root_transport)
-
-
-class ConvertMetaToColo(controldir.Converter):
-    """Convert a 'development-colo' bzrdir to a '2a' bzrdir."""
-
-    def __init__(self, target_format):
-        """Create a converter that converts a 'development-colo' metadir
-        to a '2a' metadir.
-
-        :param target_format: The final metadir format that is desired.
-        """
-        self.target_format = target_format
-
-    def convert(self, to_convert, pb):
-        """See Converter.convert()."""
-        to_convert.transport.put_bytes('branch-format',
-                                       self.target_format.as_string())
-        return BzrDir.open_from_transport(to_convert.root_transport)
+controldir.Converter.register_converter(ConvertMetaContents)
+
+
+class ConvertMetaToColo(controldir.Converter):
+    """Convert a 'development-colo' bzrdir to a '2a' bzrdir and vice versa.
+    """
+
+    @classmethod
+    def is_compatible(self, source_format, target_format):
+        if (isinstance(source_format, BzrDirMetaFormat1)
+                and isinstance(target_format, BzrDirMetaFormat1Colo)):
+            return True
+        if (isinstance(source_format, BzrDirMetaFormat1Colo)
+                and isinstance(target_format, BzrDirMetaFormat1)):
+            return True
+        return False
+
+    def convert(self, to_convert, target_format, pb):
+        """See Converter.convert()."""
+        to_convert.transport.put_bytes('branch-format',
+                                       target_format.as_string())
+        return BzrDir.open_from_transport(to_convert.root_transport)
+
+
+controldir.Converter.register_converter(ConvertMetaToColo)
 
 
 class CreateRepository(controldir.RepositoryAcquisitionPolicy):
 
=== modified file 'breezy/bzr/remote.py'
--- breezy/bzr/remote.py	2019-01-01 23:40:59 +0000
+++ breezy/bzr/remote.py	2019-02-04 13:47:49 +0000
@@ -932,10 +932,6 @@
         self._ensure_real()
         return self._real_bzrdir.get_workingtree_transport(workingtree_format)
 
-    def can_convert_format(self):
-        """Upgrading of remote bzrdirs is not supported yet."""
-        return False
-
     def needs_format_conversion(self, format):
         """Upgrading of remote bzrdirs is not supported yet."""
         return False
 
=== modified file 'breezy/controldir.py'
--- breezy/controldir.py	2018-11-12 01:41:38 +0000
+++ breezy/controldir.py	2019-02-04 13:47:49 +0000
@@ -118,11 +118,6 @@
     API users to check for magic attributes to see what features are supported.
     """
 
-    def can_convert_format(self):
-        """Return true if this controldir is one whose format we can convert
-        from."""
-        return True
-
     def list_branches(self):
         """Return a sequence of all branches local to this control directory.
 
@@ -990,18 +985,38 @@
 class Converter(object):
     """Converts a disk format object from one format to another."""
 
-    def convert(self, to_convert, pb):
+    _converters = []
+
+    def convert(self, to_convert, target_format, pb):
         """Perform the conversion of to_convert, giving feedback via pb.
 
         :param to_convert: The disk object to convert.
+        :param target_format: The target format
         :param pb: a progress bar to use for progress information.
         """
+        raise NotImplementedError(self.convert)
 
     def step(self, message):
         """Update the pb by a step."""
         self.count += 1
         self.pb.update(message, self.count, self.total)
 
+    @classmethod
+    def is_compatible(cls, source_format, target_format):
+        raise NotImplementedError(cls.is_compatible)
+
+    @classmethod
+    def register_converter(cls, converter):
+        cls._converters.append(converter)
+
+    @classmethod
+    def get_converter(cls, source_format, target_format):
+        for converter in cls._converters:
+            if converter.is_compatible(source_format, target_format):
+                return converter()
+        raise errors.BadConversionTarget(
+            "no converter available", target_format, source_format)
+
 
 class ControlDirFormat(object):
     """An encapsulation of the initialization and open routines for a format.
@@ -1070,7 +1085,9 @@
         :param format: Optional format to override the default format of the
                        library.
         """
-        raise NotImplementedError(self.get_converter)
+        if format is None:
+            format = ControlDirFormat.get_default_format()
+        return Converter.get_converter(self, format)
 
     def is_supported(self):
         """Is this format supported?
 
=== modified file 'breezy/errors.py'
--- breezy/errors.py	2018-11-11 04:08:32 +0000
+++ breezy/errors.py	2019-02-04 13:47:49 +0000
@@ -922,11 +922,6 @@
         self.lock_token = lock_token
 
 
-class UpgradeReadonly(BzrError):
-
-    _fmt = "Upgrade URL cannot work with readonly URLs."
-
-
 class UpToDateFormat(BzrError):
 
     _fmt = "The branch format %(format)s is already at the most recent format."
 
=== modified file 'breezy/git/dir.py'
--- breezy/git/dir.py	2018-11-16 11:37:47 +0000
+++ breezy/git/dir.py	2019-02-04 13:47:49 +0000
@@ -107,9 +107,6 @@
     def is_supported(self):
         return True
 
-    def can_convert_format(self):
-        return False
-
     def break_lock(self):
         # There are no global locks, so nothing to break.
         raise NotImplementedError(self.break_lock)
 
=== modified file 'breezy/plugins/cvs/__init__.py'
--- breezy/plugins/cvs/__init__.py	2018-11-11 04:08:32 +0000
+++ breezy/plugins/cvs/__init__.py	2019-02-04 13:47:49 +0000
@@ -39,9 +39,6 @@
 class CVSDirFormat(controldir.ControlDirFormat):
     """The CVS directory control format."""
 
-    def get_converter(self):
-        raise NotImplementedError(self.get_converter)
-
     def get_format_description(self):
         return "CVS control directory."
 
 
=== modified file 'breezy/plugins/darcs/__init__.py'
--- breezy/plugins/darcs/__init__.py	2018-11-11 04:08:32 +0000
+++ breezy/plugins/darcs/__init__.py	2019-02-04 13:47:49 +0000
@@ -37,9 +37,6 @@
 class DarcsDirFormat(controldir.ControlDirFormat):
     """Darcs directory format."""
 
-    def get_converter(self):
-        raise NotImplementedError(self.get_converter)
-
     def get_format_description(self):
         return "darcs control directory"
 
 
=== modified file 'breezy/plugins/mtn/__init__.py'
--- breezy/plugins/mtn/__init__.py	2018-11-11 04:08:32 +0000
+++ breezy/plugins/mtn/__init__.py	2019-02-04 13:47:49 +0000
@@ -39,9 +39,6 @@
 class MonotoneDirFormat(controldir.ControlDirFormat):
     """Monotone directory format."""
 
-    def get_converter(self):
-        raise NotImplementedError(self.get_converter)
-
     def get_format_description(self):
         return "Monotone control directory"
 
 
=== modified file 'breezy/plugins/weave_fmt/bzrdir.py'
--- breezy/plugins/weave_fmt/bzrdir.py	2018-11-11 04:08:32 +0000
+++ breezy/plugins/weave_fmt/bzrdir.py	2019-02-04 13:47:49 +0000
@@ -126,11 +126,6 @@
         """See ControlDirFormat.get_format_description()."""
         return "All-in-one format 5"
 
-    def get_converter(self, format=None):
-        """See ControlDirFormat.get_converter()."""
-        # there is one and only one upgrade path here.
-        return ConvertBzrDir5To6()
-
     def _initialize_for_clone(self, url):
         return self.initialize_on_transport(get_transport(url), _cloning=True)
 
@@ -190,11 +185,6 @@
         from .branch import BzrBranchFormat4
         return BzrBranchFormat4()
 
-    def get_converter(self, format=None):
-        """See ControlDirFormat.get_converter()."""
-        # there is one and only one upgrade path here.
-        return ConvertBzrDir6ToMeta()
-
     def _initialize_for_clone(self, url):
         return self.initialize_on_transport(get_transport(url), _cloning=True)
 
@@ -236,7 +226,15 @@
         self.text_count = 0
         self.revisions = {}
 
-    def convert(self, to_convert, pb):
+    @classmethod
+    def is_compatible(cls, source_format, target_format):
+        if not isinstance(target_format, BzrDirFormat5):
+            return False
+        if not isinstance(source_format, BzrDirFormat4):
+            return False
+        return True
+
+    def convert(self, to_convert, target_format, pb):
         """See Converter.convert()."""
         self.controldir = to_convert
         if pb is not None:
@@ -294,7 +292,7 @@
         self._cleanup_spare_files_after_format4()
         self.branch._transport.put_bytes(
             'branch-format',
-            BzrDirFormat5().get_format_string(),
+            target_format.get_format_string(),
             mode=self.controldir._get_file_mode())
 
     def _cleanup_spare_files_after_format4(self):
@@ -504,7 +502,15 @@
 class ConvertBzrDir5To6(Converter):
     """Converts format 5 bzr dirs to format 6."""
 
-    def convert(self, to_convert, pb):
+    @classmethod
+    def is_compatible(cls, source_format, target_format):
+        if not isinstance(source_format, BzrDirFormat5):
+            return False
+        if not isinstance(source_format, BzrDirFormat6):
+            return False
+        return True
+
+    def convert(self, to_convert, target_format, pb):
         """See Converter.convert()."""
         self.controldir = to_convert
         with ui.ui_factory.nested_progress_bar() as pb:
@@ -538,14 +544,22 @@
                     store_transport.move(filename, new_name)
         self.controldir.transport.put_bytes(
             'branch-format',
-            BzrDirFormat6().get_format_string(),
+            target_format.get_format_string(),
             mode=self.controldir._get_file_mode())
 
 
 class ConvertBzrDir6ToMeta(Converter):
     """Converts format 6 bzr dirs to metadirs."""
 
-    def convert(self, to_convert, pb):
+    @classmethod
+    def is_compatible(cls, source_format, target_format):
+        if not isinstance(source_format, BzrDirFormat6):
+            return False
+        if not isinstance(target_format, BzrDirMetaFormat1):
+            return False
+        return True
+
+    def convert(self, to_convert, target_format, pb):
         """See Converter.convert()."""
         from .repository import RepositoryFormat7
         from ...bzr.fullhistory import BzrBranchFormat5
@@ -634,7 +648,7 @@
                     'checkout/last-revision', last_revision)
         self.controldir.transport.put_bytes(
             'branch-format',
-            BzrDirMetaFormat1().get_format_string(),
+            target_format.get_format_string(),
             mode=self.file_mode)
         self.pb.finished()
         return ControlDir.open(self.controldir.user_url)
@@ -692,11 +706,6 @@
         """See ControlDirFormat.get_format_description()."""
         return "All-in-one format 4"
 
-    def get_converter(self, format=None):
-        """See ControlDirFormat.get_converter()."""
-        # there is one and only one upgrade path here.
-        return ConvertBzrDir4To5()
-
     def initialize_on_transport(self, transport):
         """Format 4 branches cannot be created."""
         raise errors.UninitializableFormat(self)
@@ -1000,3 +1009,8 @@
         # bzrdir as a whole
         from .workingtree import WorkingTreeFormat2
         return WorkingTreeFormat2().open(self, _found=True)
+
+
+Converter.register_converter(ConvertBzrDir4To5)
+Converter.register_converter(ConvertBzrDir5To6)
+Converter.register_converter(ConvertBzrDir6ToMeta)
 
=== modified file 'breezy/plugins/weave_fmt/test_bzrdir.py'
--- breezy/plugins/weave_fmt/test_bzrdir.py	2018-11-16 18:33:17 +0000
+++ breezy/plugins/weave_fmt/test_bzrdir.py	2019-02-04 13:47:49 +0000
@@ -73,11 +73,6 @@
         dir = controldir.ControlDir.open(self.get_url())
         check_dir_components_use_same_lock(dir)
 
-    def test_can_convert(self):
-        # format 5 dirs are convertable
-        dir = BzrDirFormat5().initialize(self.get_url())
-        self.assertTrue(dir.can_convert_format())
-
     def test_needs_conversion(self):
         # format 5 dirs need a conversion if they are not the default,
         # and they aren't
@@ -108,11 +103,6 @@
         dir = controldir.ControlDir.open(self.get_url())
         check_dir_components_use_same_lock(dir)
 
-    def test_can_convert(self):
-        # format 6 dirs are convertable
-        dir = BzrDirFormat6().initialize(self.get_url())
-        self.assertTrue(dir.can_convert_format())
-
     def test_needs_conversion(self):
         # format 6 dirs need an conversion if they are not the default.
         dir = BzrDirFormat6().initialize(self.get_url())
 
=== modified file 'breezy/tests/blackbox/test_upgrade.py'
--- breezy/tests/blackbox/test_upgrade.py	2018-11-11 04:08:32 +0000
+++ breezy/tests/blackbox/test_upgrade.py	2019-02-04 13:47:49 +0000
@@ -46,11 +46,15 @@
 class ConvertOldTestToMeta(controldir.Converter):
     """A trivial converter, used for testing."""
 
-    def convert(self, to_convert, pb):
+    @classmethod
+    def is_compatible(cls, source_format, target_format):
+        return True
+
+    def convert(self, to_convert, target_format, pb):
         ui.ui_factory.note('starting upgrade from old test format to 2a')
         to_convert.control_transport.put_bytes(
             'branch-format',
-            bzrdir.BzrDirMetaFormat1().get_format_string(),
+            target_format.get_format_string(),
             mode=to_convert._get_file_mode())
         return controldir.ControlDir.open(to_convert.user_url)
 
@@ -59,9 +63,6 @@
 
     _lock_class = lockable_files.TransportLock
 
-    def get_converter(self, format=None):
-        return ConvertOldTestToMeta()
-
     @classmethod
     def get_format_string(cls):
         return b"Ancient Test Format"
@@ -131,6 +132,7 @@
 
     def test_upgrade_control_dir(self):
         old_format = OldBzrDirFormat()
+        self.overrideAttr(controldir.Converter, '_converters', [ConvertOldTestToMeta])
         self.addCleanup(bzr.BzrProber.formats.remove,
                         old_format.get_format_string())
         bzr.BzrProber.formats.register(old_format.get_format_string(),
 
=== modified file 'breezy/tests/per_controldir/test_controldir.py'
--- breezy/tests/per_controldir/test_controldir.py	2018-11-11 04:08:32 +0000
+++ breezy/tests/per_controldir/test_controldir.py	2019-02-04 13:47:49 +0000
@@ -1580,12 +1580,11 @@
     def test_can_and_needs_format_conversion(self):
         # check that we can ask an instance if its upgradable
         dir = self.make_controldir('.')
-        if dir.can_convert_format():
-            # if its default updatable there must be an updater
-            # (we force the latest known format as downgrades may not be
-            # available
+        try:
             self.assertTrue(isinstance(dir._format.get_converter(
                 format=dir._format), controldir.Converter))
+        except errors.BadConversionTarget:
+            pass  # No converter available
         dir.needs_format_conversion(
             controldir.ControlDirFormat.get_default_format())
 
@@ -1618,14 +1617,13 @@
         dir.create_repository()
         dir.create_branch()
         self.createWorkingTreeOrSkip(dir)
-        if dir.can_convert_format():
-            # if its default updatable there must be an updater
-            # (we force the latest known format as downgrades may not be
-            # available
+        try:
             with ui.ui_factory.nested_progress_bar() as pb:
-                dir._format.get_converter(format=dir._format).convert(dir, pb)
+                dir._format.get_converter(format=dir._format).convert(dir, dir._format, pb)
             # and it should pass 'check' now.
             check.check_dwim(self.get_url('.'), False, True, True)
+        except errors.BadConversionTarget:
+            pass  # no converter available
 
     def test_format_description(self):
         dir = self.make_controldir('.')
 
=== modified file 'breezy/tests/test_bzrdir.py'
--- breezy/tests/test_bzrdir.py	2019-01-04 21:30:02 +0000
+++ breezy/tests/test_bzrdir.py	2019-02-04 13:47:49 +0000
@@ -1440,7 +1440,7 @@
         format = bzrdir.BzrDirMetaFormat1Colo()
         self.assertTrue(tree.controldir.needs_format_conversion(format))
         converter = tree.controldir._format.get_converter(format)
-        result = converter.convert(tree.controldir, None)
+        result = converter.convert(tree.controldir, format, None)
         self.assertIsInstance(result._format, bzrdir.BzrDirMetaFormat1Colo)
         self.assertFalse(result.needs_format_conversion(format))
 
@@ -1449,16 +1449,16 @@
         format = bzrdir.BzrDirMetaFormat1()
         self.assertTrue(tree.controldir.needs_format_conversion(format))
         converter = tree.controldir._format.get_converter(format)
-        result = converter.convert(tree.controldir, None)
+        result = converter.convert(tree.controldir, format, None)
         self.assertIsInstance(result._format, bzrdir.BzrDirMetaFormat1)
         self.assertFalse(result.needs_format_conversion(format))
 
     def test_downgrade_to_2a_too_many_branches(self):
         tree = self.make_branch_and_tree('.', format='development-colo')
         tree.controldir.create_branch(name="another-colocated-branch")
-        converter = tree.controldir._format.get_converter(
-            bzrdir.BzrDirMetaFormat1())
-        result = converter.convert(tree.controldir, bzrdir.BzrDirMetaFormat1())
+        target_format = bzrdir.BzrDirMetaFormat1()
+        converter = tree.controldir._format.get_converter(target_format)
+        result = converter.convert(tree.controldir, target_format, None)
         self.assertIsInstance(result._format, bzrdir.BzrDirMetaFormat1)
 
     def test_nested(self):
 
=== modified file 'breezy/tests/test_upgrade.py'
--- breezy/tests/test_upgrade.py	2018-11-12 01:41:38 +0000
+++ breezy/tests/test_upgrade.py	2019-02-04 13:47:49 +0000
@@ -51,7 +51,7 @@
         target = controldir.format_registry.make_controldir(
             'dirstate-with-subtree')
         converter = b.controldir._format.get_converter(target)
-        converter.convert(b.controldir, None)
+        converter.convert(b.controldir, target, None)
         new_branch = branch.Branch.open(self.get_url('branch'))
         self.assertIs(new_branch.__class__, bzrbranch.BzrBranch6)
         self.assertEqual(b'CD', new_branch.last_revision())
@@ -62,7 +62,7 @@
 
         b2 = self.make_branch('branch2', format='knit')
         converter = b2.controldir._format.get_converter(target)
-        converter.convert(b2.controldir, None)
+        converter.convert(b2.controldir, target, None)
         b2 = branch.Branch.open(self.get_url('branch'))
         self.assertIs(b2.__class__, bzrbranch.BzrBranch6)
 
@@ -71,7 +71,7 @@
         target = controldir.format_registry.make_controldir('1.9')
         target.set_branch_format(bzrbranch.BzrBranchFormat8())
         converter = b.controldir._format.get_converter(target)
-        converter.convert(b.controldir, None)
+        converter.convert(b.controldir, target, None)
         b = branch.Branch.open(self.get_url('branch'))
         self.assertIs(b.__class__, bzrbranch.BzrBranch8)
         self.assertEqual({}, b._get_all_reference_info())
@@ -81,7 +81,7 @@
         tree = self.make_branch_and_tree('tree', format='knit')
         target = controldir.format_registry.make_controldir('dirstate')
         converter = tree.controldir._format.get_converter(target)
-        converter.convert(tree.controldir, None)
+        converter.convert(tree.controldir, target, None)
         new_tree = workingtree.WorkingTree.open('tree')
         self.assertIs(new_tree.__class__, workingtree_4.WorkingTree4)
         self.assertEqual(b'null:', new_tree.last_revision())
@@ -94,7 +94,7 @@
         tree.add(['file'], [b'file-id'])
         target = controldir.format_registry.make_controldir('dirstate')
         converter = tree.controldir._format.get_converter(target)
-        converter.convert(tree.controldir, None)
+        converter.convert(tree.controldir, target, None)
         new_tree = workingtree.WorkingTree.open('tree')
         self.assertIs(new_tree.__class__, workingtree_4.WorkingTree4)
         self.assertEqual(b'null:', new_tree.last_revision())
@@ -105,7 +105,7 @@
         rev_id = tree.commit('first post')
         target = controldir.format_registry.make_controldir('dirstate')
         converter = tree.controldir._format.get_converter(target)
-        converter.convert(tree.controldir, None)
+        converter.convert(tree.controldir, target, None)
         new_tree = workingtree.WorkingTree.open('tree')
         self.assertIs(new_tree.__class__, workingtree_4.WorkingTree4)
         self.assertEqual(rev_id, new_tree.last_revision())
@@ -122,7 +122,7 @@
         tree.merge_from_branch(merge_tree.branch)
         target = controldir.format_registry.make_controldir('dirstate')
         converter = tree.controldir._format.get_converter(target)
-        converter.convert(tree.controldir, None)
+        converter.convert(tree.controldir, target, None)
         new_tree = workingtree.WorkingTree.open('tree')
         self.assertIs(new_tree.__class__, workingtree_4.WorkingTree4)
         self.assertEqual(rev_id2, new_tree.last_revision())
 
=== modified file 'breezy/upgrade.py'
--- breezy/upgrade.py	2018-11-11 04:08:32 +0000
+++ breezy/upgrade.py	2019-02-04 13:47:49 +0000
@@ -32,6 +32,11 @@
 from .bzr.remote import RemoteBzrDir
 
 
+class UpgradeReadonly(errors.BzrError):
+
+    _fmt = "Upgrade URL cannot work with readonly URLs."
+
+
 class Convert(object):
 
     def __init__(self, url=None, format=None, control_dir=None):
@@ -60,7 +65,7 @@
             self.controldir._ensure_real()
             self.controldir = self.controldir._real_bzrdir
         if self.controldir.root_transport.is_readonly():
-            raise errors.UpgradeReadonly
+            raise UpgradeReadonly
         self.transport = self.controldir.root_transport
         ui.ui_factory.suppressed_warnings.add(warning_id)
         try:
@@ -96,9 +101,6 @@
             format = self.format
         if not self.controldir.needs_format_conversion(format):
             raise errors.UpToDateFormat(self.controldir._format)
-        if not self.controldir.can_convert_format():
-            raise errors.BzrError(gettext("cannot upgrade from bzrdir format %s") %
-                                  self.controldir._format)
         self.controldir.check_conversion_target(format)
         ui.ui_factory.note(gettext('starting upgrade of %s') %
                            urlutils.unescape_for_display(self.transport.base, 'utf-8'))
@@ -106,7 +108,7 @@
         self.backup_oldpath, self.backup_newpath = self.controldir.backup_bzrdir()
         while self.controldir.needs_format_conversion(format):
             converter = self.controldir._format.get_converter(format)
-            self.controldir = converter.convert(self.controldir, None)
+            self.controldir = converter.convert(self.controldir, format, None)
         ui.ui_factory.note(gettext('finished'))
 
     def clean_up(self):
 
=== modified file 'tools/prepare_for_latex.py'
--- tools/prepare_for_latex.py	2018-11-17 16:19:11 +0000
+++ tools/prepare_for_latex.py	2019-02-04 13:47:49 +0000
@@ -41,6 +41,7 @@
 DIRECTIVE_ELEMENT_PATTERN = re.compile(u'^\\s+:[^:]+:\\s+')
 
 class Converter(object):
+
     def __init__(self, srcdir, destdir):
         self.srcdir = srcdir
         self.destdir = destdir