Rev 42: Handle bzr.dev changes. in http://people.ubuntu.com/~robertc/baz2.0/plugins/groupcompress/trunk

[Robert Collins]

At http://people.ubuntu.com/~robertc/baz2.0/plugins/groupcompress/trunk

------------------------------------------------------------
revno: 42
revision-id: robertc at robertcollins.net-20090310054207-khdro5d2s9stjqm7
parent: john at arbash-meinel.com-20090309055502-ibgfds8w18hq2uaw
committer: Robert Collins <robertc at robertcollins.net>
branch nick: trunk
timestamp: Tue 2009-03-10 16:42:07 +1100
message:
  Handle bzr.dev changes.
=== modified file 'repofmt.py'
--- a/repofmt.py	2009-03-09 05:55:02 +0000
+++ b/repofmt.py	2009-03-10 05:42:07 +0000
@@ -508,15 +508,6 @@
         self._reconcile_does_inventory_gc = True
         self._reconcile_fixes_text_parents = True
         self._reconcile_backsup_inventory = False
-        # Note: We cannot unpack a delta that references a text we haven't seen yet.
-        #       There are 2 options, work in fulltexts, or require topological
-        #       sorting. Using fulltexts is more optimal for local operations,
-        #       because the source can be smart about extracting multiple
-        #       in-a-row (and sharing strings). Topological is better for
-        #       remote, because we access less data.
-        self._fetch_order = 'unordered'
-        self._fetch_gc_optimal = True
-        self._fetch_uses_deltas = False
 
 
 if chk_support:
@@ -578,15 +569,6 @@
             self._reconcile_does_inventory_gc = True
             self._reconcile_fixes_text_parents = True
             self._reconcile_backsup_inventory = False
-            # Note: We cannot unpack a delta that references a text we haven't
-            # seen yet. There are 2 options, work in fulltexts, or require
-            # topological sorting. Using fulltexts is more optimal for local
-            # operations, because the source can be smart about extracting
-            # multiple in-a-row (and sharing strings). Topological is better
-            # for remote, because we access less data.
-            self._fetch_order = 'unordered'
-            self._fetch_gc_optimal = True
-            self._fetch_uses_deltas = False
 
 
 class RepositoryFormatPackGCPlain(RepositoryFormatKnitPack6):
@@ -594,6 +576,15 @@
 
     repository_class = GCPackRepository
     rich_root_data = False
+    # Note: We cannot unpack a delta that references a text we haven't
+    # seen yet. There are 2 options, work in fulltexts, or require
+    # topological sorting. Using fulltexts is more optimal for local
+    # operations, because the source can be smart about extracting
+    # multiple in-a-row (and sharing strings). Topological is better
+    # for remote, because we access less data.
+    _fetch_order = 'unordered'
+    _fetch_gc_optimal = True
+    _fetch_uses_deltas = False
 
     def get_format_string(self):
         """See RepositoryFormat.get_format_string()."""
@@ -613,6 +604,15 @@
 
         repository_class = GCCHKPackRepository
         rich_root_data = True
+        # Note: We cannot unpack a delta that references a text we haven't
+        # seen yet. There are 2 options, work in fulltexts, or require
+        # topological sorting. Using fulltexts is more optimal for local
+        # operations, because the source can be smart about extracting
+        # multiple in-a-row (and sharing strings). Topological is better
+        # for remote, because we access less data.
+        _fetch_order = 'unordered'
+        _fetch_gc_optimal = True
+        _fetch_uses_deltas = False
 
         def get_format_string(self):
             """See RepositoryFormat.get_format_string()."""
@@ -652,6 +652,15 @@
         # than InterDifferingSerializer
         rich_root_data = True
         _serializer = chk_serializer_255_bigpage
+        # Note: We cannot unpack a delta that references a text we haven't
+        # seen yet. There are 2 options, work in fulltexts, or require
+        # topological sorting. Using fulltexts is more optimal for local
+        # operations, because the source can be smart about extracting
+        # multiple in-a-row (and sharing strings). Topological is better
+        # for remote, because we access less data.
+        _fetch_order = 'unordered'
+        _fetch_gc_optimal = True
+        _fetch_uses_deltas = False
 
         def get_format_string(self):
             """See RepositoryFormat.get_format_string()."""

=== modified file 'tests/test_groupcompress.py'
--- a/tests/test_groupcompress.py	2009-03-05 18:10:21 +0000
+++ b/tests/test_groupcompress.py	2009-03-10 05:42:07 +0000
@@ -24,8 +24,7 @@
 from bzrlib.plugins.groupcompress import errors, groupcompress
 from bzrlib.tests import (
     TestCaseWithTransport,
-    TestScenarioApplier,
-    adapt_tests,
+    multiply_tests,
     )
 from bzrlib.transport import get_transport
 
@@ -43,10 +42,8 @@
             'support_partial_insertion':False,
             }
         )
-    applier = TestScenarioApplier()
-    applier.scenarios = [group_scenario]
-    adapt_tests(vf_interface_tests, applier, standard_tests)
-    return standard_tests
+    scenarios = [group_scenario]
+    return multiply_tests(vf_interface_tests, scenarios, standard_tests)
 
 
 class TestGroupCompressor(tests.TestCase):