Rev 4250: Cherrypick bzr.dev 4280 in lp:///~jameinel/bzr/1.14-dev6rr-fixes

[John Arbash Meinel]

At lp:///~jameinel/bzr/1.14-dev6rr-fixes

------------------------------------------------------------
revno: 4250
revision-id: john at arbash-meinel.com-20090419011310-3i7m20ict2dyjtcd
parent: pqm at pqm.ubuntu.com-20090407234719-qme0colwkc8yl6pi
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.14-dev6rr-fixes
timestamp: Sat 2009-04-18 20:13:10 -0500
message:
  Cherrypick bzr.dev 4280
-------------- next part --------------
=== modified file 'bzrlib/repofmt/groupcompress_repo.py'
--- a/bzrlib/repofmt/groupcompress_repo.py	2009-04-07 14:12:57 +0000
+++ b/bzrlib/repofmt/groupcompress_repo.py	2009-04-19 01:13:10 +0000
@@ -972,7 +972,7 @@
     # multiple in-a-row (and sharing strings). Topological is better
     # for remote, because we access less data.
     _fetch_order = 'unordered'
-    _fetch_uses_deltas = True # essentially ignored by the groupcompress code.
+    _fetch_uses_deltas = False # essentially ignored by the groupcompress code.
     fast_deltas = True
 
     def _get_matching_bzrdir(self):

=== modified file 'bzrlib/tests/test_pack_repository.py'
--- a/bzrlib/tests/test_pack_repository.py	2009-04-07 14:12:57 +0000
+++ b/bzrlib/tests/test_pack_repository.py	2009-04-19 01:13:10 +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()