Rev 4269: Special case the CHK1 format to allow it to not fetch using deltas. in http://bzr.arbash-meinel.com/branches/bzr/1.14/bbc-merge

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/branches/bzr/1.14/bbc-merge

------------------------------------------------------------
revno: 4269
revision-id: john at arbash-meinel.com-20090409191456-dh9cqbf1qma90vc0
parent: john at arbash-meinel.com-20090409164651-4ftiuwg8z84wnjz6
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bbc-merge
timestamp: Thu 2009-04-09 14:14:56 -0500
message:
  Special case the CHK1 format to allow it to not fetch using deltas.
-------------- next part --------------
=== modified file 'bzrlib/tests/test_pack_repository.py'
--- a/bzrlib/tests/test_pack_repository.py	2009-04-08 16:33:19 +0000
+++ b/bzrlib/tests/test_pack_repository.py	2009-04-09 19:14:56 +0000
@@ -80,7 +80,14 @@
         """Packs reuse deltas."""
         format = self.get_format()
         repo = self.make_repository('.', format=format)
-        self.assertEqual(True, repo._format._fetch_uses_deltas)
+        if isinstance(format.repository_format, RepositoryFormatCHK1):
+            # TODO: This is currently a workaround. CHK format repositories
+            #       ignore the 'deltas' flag, but during conversions, we can't
+            #       do unordered delta fetches. Remove this clause once we
+            #       improve the inter-format fetching.
+            self.assertEqual(False, repo._format._fetch_uses_deltas)
+        else:
+            self.assertEqual(True, repo._format._fetch_uses_deltas)
 
     def test_disk_layout(self):
         format = self.get_format()