Rev 4463: Add new attribute to RepositoryFormat pack_compresses, hinting when pack can be useful. in http://people.ubuntu.com/~robertc/baz2.0/pending/autopack-cross-format-fetch
Robert Collins
robertc at robertcollins.net
Fri Jun 19 05:19:35 BST 2009
At http://people.ubuntu.com/~robertc/baz2.0/pending/autopack-cross-format-fetch
------------------------------------------------------------
revno: 4463
revision-id: robertc at robertcollins.net-20090619041922-acr6p23jah4z2gc8
parent: pqm at pqm.ubuntu.com-20090618213920-8d1p9f28uomzfkvl
committer: Robert Collins <robertc at robertcollins.net>
branch nick: autopack-cross-format-fetch
timestamp: Fri 2009-06-19 14:19:22 +1000
message:
Add new attribute to RepositoryFormat pack_compresses, hinting when pack can be useful.
=== modified file 'NEWS'
--- a/NEWS 2009-06-18 19:19:49 +0000
+++ b/NEWS 2009-06-19 04:19:22 +0000
@@ -63,6 +63,9 @@
properly fetch the minimum number of texts for non-smart fetching.
(John Arbash Meinel)
+* RepositoryFormat has a new attribute 'pack_compresses' which is True
+ when doing a pack operation changes the compression of content in the
+ repository. (Robert Collins)
Improvements
************
=== modified file 'bzrlib/remote.py'
--- a/bzrlib/remote.py 2009-06-17 03:53:51 +0000
+++ b/bzrlib/remote.py 2009-06-19 04:19:22 +0000
@@ -566,6 +566,11 @@
return self._creating_repo._real_repository._format.network_name()
@property
+ def pack_compresses(self):
+ self._ensure_real()
+ return self._custom_format.pack_compresses
+
+ @property
def _serializer(self):
self._ensure_real()
return self._custom_format._serializer
=== modified file 'bzrlib/repofmt/groupcompress_repo.py'
--- a/bzrlib/repofmt/groupcompress_repo.py 2009-06-18 19:19:49 +0000
+++ b/bzrlib/repofmt/groupcompress_repo.py 2009-06-19 04:19:22 +0000
@@ -1048,6 +1048,7 @@
_fetch_order = 'unordered'
_fetch_uses_deltas = False # essentially ignored by the groupcompress code.
fast_deltas = True
+ pack_compresses = True
def _get_matching_bzrdir(self):
return bzrdir.format_registry.make_bzrdir('development6-rich-root')
=== modified file 'bzrlib/repository.py'
--- a/bzrlib/repository.py 2009-06-17 17:57:15 +0000
+++ b/bzrlib/repository.py 2009-06-19 04:19:22 +0000
@@ -2844,6 +2844,11 @@
# Does this format have < O(tree_size) delta generation. Used to hint what
# code path for commit, amongst other things.
fast_deltas = None
+ # Does doing a pack operation compress data? Useful for the pack UI command
+ # (so if there is one pack, the operation can still proceed because it may
+ # help), and for fetching when data won't have come from the same
+ # compressor.
+ pack_compresses = False
def __str__(self):
return "<%s>" % self.__class__.__name__
=== modified file 'bzrlib/tests/per_repository/test_repository.py'
--- a/bzrlib/tests/per_repository/test_repository.py 2009-06-17 21:33:03 +0000
+++ b/bzrlib/tests/per_repository/test_repository.py 2009-06-19 04:19:22 +0000
@@ -66,29 +66,29 @@
class TestRepository(TestCaseWithRepository):
+ def assertFormatAttribute(self, attribute, allowed_values):
+ """Assert that the format has an attribute 'attribute'."""
+ repo = self.make_repository('repo')
+ self.assertSubset([getattr(repo._format, attribute)], allowed_values)
+
def test_attribute__fetch_order(self):
"""Test the the _fetch_order attribute."""
- tree = self.make_branch_and_tree('tree')
- repo = tree.branch.repository
- self.assertTrue(repo._format._fetch_order in ('topological', 'unordered'))
+ self.assertFormatAttribute('_fetch_order', ('topological', 'unordered'))
def test_attribute__fetch_uses_deltas(self):
"""Test the the _fetch_uses_deltas attribute."""
- tree = self.make_branch_and_tree('tree')
- repo = tree.branch.repository
- self.assertTrue(repo._format._fetch_uses_deltas in (True, False))
+ self.assertFormatAttribute('_fetch_uses_deltas', (True, False))
def test_attribute_fast_deltas(self):
"""Test the format.fast_deltas attribute."""
- tree = self.make_branch_and_tree('tree')
- repo = tree.branch.repository
- self.assertTrue(repo._format.fast_deltas in (True, False))
+ self.assertFormatAttribute('fast_deltas', (True, False))
def test_attribute__fetch_reconcile(self):
"""Test the the _fetch_reconcile attribute."""
- tree = self.make_branch_and_tree('tree')
- repo = tree.branch.repository
- self.assertTrue(repo._format._fetch_reconcile in (True, False))
+ self.assertFormatAttribute('_fetch_reconcile', (True, False))
+
+ def test_attribute_format_pack_compresses(self):
+ self.assertFormatAttribute('pack_compresses', (True, False))
def test_attribute_inventories_store(self):
"""Test the existence of the inventories attribute."""
=== modified file 'bzrlib/tests/test_repository.py'
--- a/bzrlib/tests/test_repository.py 2009-06-18 18:00:01 +0000
+++ b/bzrlib/tests/test_repository.py 2009-06-19 04:19:22 +0000
@@ -673,10 +673,14 @@
self.assertFalse(repo._format.supports_external_lookups)
-class TestDevelopment6(TestCaseWithTransport):
+class Test2alpha(TestCaseWithTransport):
+
+ def test_format_pack_compresses_True(self):
+ repo = self.make_repository('repo', format='2a')
+ self.assertTrue(repo._format.pack_compresses)
def test_inventories_use_chk_map_with_parent_base_dict(self):
- tree = self.make_branch_and_tree('repo', format="development6-rich-root")
+ tree = self.make_branch_and_tree('repo', format="2a")
revid = tree.commit("foo")
tree.lock_read()
self.addCleanup(tree.unlock)
@@ -689,13 +693,13 @@
inv.parent_id_basename_to_file_id._root_node.maximum_size)
def test_stream_source_to_gc(self):
- source = self.make_repository('source', format='development6-rich-root')
- target = self.make_repository('target', format='development6-rich-root')
+ source = self.make_repository('source', format='2a')
+ target = self.make_repository('target', format='2a')
stream = source._get_source(target._format)
self.assertIsInstance(stream, groupcompress_repo.GroupCHKStreamSource)
def test_stream_source_to_non_gc(self):
- source = self.make_repository('source', format='development6-rich-root')
+ source = self.make_repository('source', format='2a')
target = self.make_repository('target', format='rich-root-pack')
stream = source._get_source(target._format)
# We don't want the child GroupCHKStreamSource
@@ -703,7 +707,7 @@
def test_get_stream_for_missing_keys_includes_all_chk_refs(self):
source_builder = self.make_branch_builder('source',
- format='development6-rich-root')
+ format='2a')
# We have to build a fairly large tree, so that we are sure the chk
# pages will have split into multiple pages.
entries = [('add', ('', 'a-root-id', 'directory', None))]
@@ -726,7 +730,7 @@
source_branch = source_builder.get_branch()
source_branch.lock_read()
self.addCleanup(source_branch.unlock)
- target = self.make_repository('target', format='development6-rich-root')
+ target = self.make_repository('target', format='2a')
source = source_branch.repository._get_source(target._format)
self.assertIsInstance(source, groupcompress_repo.GroupCHKStreamSource)
More information about the bazaar-commits
mailing list