Merge lp:~mbp/bzr/408824-test-upgrade into lp:~bzr/bzr/trunk-old

[Martin Pool]

[Martin Pool (mbp)]

This does not yet fix bug 408824 but it does:

 * clean up this test to make the dependencies more clear

 * remove some copy&pasted code for checking compatibility

 * give a better message for incompatible repostiories

[Robert Collins (lifeless)]

 review +1

review: Approve

[Martin Pool (mbp)]

Follow on from https://code.edge.launchpad.net/~mbp/bzr/408824-test-upgrade/+merge/10143

now with an actual fix, specifically https://bugs.edge.launchpad.net/bzr/+bug/408824/comments/7

[Robert Collins (lifeless)]

this causes testfailures I think:
ERROR: blackbox.test_upgrade.TestWithUpgradableBranches.test_upgrade_up_to_date
    'function' object has no attribute 'rsplit'

review: Needs Fixing

[Robert Collins (lifeless)]

> this causes testfailures I think:
> ERROR:
> blackbox.test_upgrade.TestWithUpgradableBranches.test_upgrade_up_to_date
> 'function' object has no attribute 'rsplit'

It does however reduce overall failures, so I'm merging it into my 2a default branch.

[Robert Collins (lifeless)]

The new failure was actually from Martin's change to the registration of default-rich-root, so this branch is clean and I've submitted it.

review: Approve

=== modified file 'NEWS'
--- NEWS	2009-08-15 09:15:03 +0000
+++ NEWS	2009-08-17 20:36:46 +0000
@@ -58,6 +58,11 @@
 * StreamSource generates rich roots from non-rich root sources correctly
   now.  (Andrew Bennetts, #368921)
 
+* When deciding whether a repository was compatible for upgrading or
+  fetching, we previously incorrectly checked the default repository
+  format for the bzrdir format, rather than the format that was actually
+  present on disk.  (Martin Pool, #408824)
+
 Improvements
 ************
 

=== modified file 'bzrlib/bzrdir.py'
--- bzrlib/bzrdir.py	2009-08-14 09:31:37 +0000
+++ bzrlib/bzrdir.py	2009-08-17 20:36:46 +0000
@@ -130,8 +130,7 @@
 
     def check_conversion_target(self, target_format):
         target_repo_format = target_format.repository_format
-        source_repo_format = self._format.repository_format
-        source_repo_format.check_conversion_target(target_repo_format)
+        self.open_repository()._format.check_conversion_target(target_repo_format)
 
     @staticmethod
     def _check_supported(format, allow_unsupported,

=== modified file 'bzrlib/remote.py'
--- bzrlib/remote.py	2009-08-14 09:31:37 +0000
+++ bzrlib/remote.py	2009-08-17 20:36:46 +0000
@@ -566,17 +566,6 @@
     def __eq__(self, other):
         return self.__class__ is other.__class__
 
-    def check_conversion_target(self, target_format):
-        if self.rich_root_data and not target_format.rich_root_data:
-            raise errors.BadConversionTarget(
-                'Does not support rich root data.', target_format,
-                from_format=self)
-        if (self.supports_tree_reference and
-            not getattr(target_format, 'supports_tree_reference', False)):
-            raise errors.BadConversionTarget(
-                'Does not support nested trees', target_format,
-                from_format=self)
-
     def network_name(self):
         if self._network_name:
             return self._network_name

=== modified file 'bzrlib/repofmt/knitrepo.py'
--- bzrlib/repofmt/knitrepo.py	2009-08-14 09:37:57 +0000
+++ bzrlib/repofmt/knitrepo.py	2009-08-17 20:36:47 +0000
@@ -424,9 +424,6 @@
         """See RepositoryFormat.get_format_description()."""
         return "Knit repository format 1"
 
-    def check_conversion_target(self, target_format):
-        pass
-
 
 class RepositoryFormatKnit3(RepositoryFormatKnit):
     """Bzr repository knit format 3.

=== modified file 'bzrlib/repofmt/pack_repo.py'
--- bzrlib/repofmt/pack_repo.py	2009-08-14 09:37:57 +0000
+++ bzrlib/repofmt/pack_repo.py	2009-08-17 20:36:47 +0000
@@ -2529,9 +2529,6 @@
         """See RepositoryFormat.get_format_description()."""
         return "Packs containing knits without subtree support"
 
-    def check_conversion_target(self, target_format):
-        pass
-
 
 class RepositoryFormatKnitPack3(RepositoryFormatPack):
     """A subtrees parameterized Pack repository.
@@ -2647,9 +2644,6 @@
         """See RepositoryFormat.get_format_description()."""
         return "Packs 5 (adds stacking support, requires bzr 1.6)"
 
-    def check_conversion_target(self, target_format):
-        pass
-
 
 class RepositoryFormatKnitPack5RichRoot(RepositoryFormatPack):
     """A repository with rich roots and stacking.
@@ -2771,9 +2765,6 @@
         """See RepositoryFormat.get_format_description()."""
         return "Packs 6 (uses btree indexes, requires bzr 1.9)"
 
-    def check_conversion_target(self, target_format):
-        pass
-
 
 class RepositoryFormatKnitPack6RichRoot(RepositoryFormatPack):
     """A repository with rich roots, no subtrees, stacking and btree indexes.

=== modified file 'bzrlib/repofmt/weaverepo.py'
--- bzrlib/repofmt/weaverepo.py	2009-04-09 20:23:07 +0000
+++ bzrlib/repofmt/weaverepo.py	2009-08-17 20:36:47 +0000
@@ -319,9 +319,6 @@
         result.chk_bytes = None
         return result
 
-    def check_conversion_target(self, target_format):
-        pass
-
 
 class RepositoryFormat4(PreSplitOutRepositoryFormat):
     """Bzr repository format 4.
@@ -494,9 +491,6 @@
         """See RepositoryFormat.get_format_description()."""
         return "Weave repository format 7"
 
-    def check_conversion_target(self, target_format):
-        pass
-
     def _get_inventories(self, repo_transport, repo, name='inventory'):
         mapper = versionedfile.ConstantMapper(name)
         return versionedfile.ThunkedVersionedFiles(repo_transport,