Rev 3228: Backport development1 format (stackable packs) to before-shallow-branches. in http://people.ubuntu.com/~robertc/baz2.0/shallow-branch
Robert Collins
robertc at robertcollins.net
Wed Feb 20 00:42:44 GMT 2008
At http://people.ubuntu.com/~robertc/baz2.0/shallow-branch
------------------------------------------------------------
revno: 3228
revision-id:robertc at robertcollins.net-20080220004239-jieihiu0h1kno7fc
parent: robertc at robertcollins.net-20080220002317-5bdinlaczri004x2
committer: Robert Collins <robertc at robertcollins.net>
branch nick: Development1
timestamp: Wed 2008-02-20 11:42:39 +1100
message:
Backport development1 format (stackable packs) to before-shallow-branches.
added:
bzrlib/tests/repository_implementations/test_add_fallback_repository.py test_add_fallback_re-20080215040003-8w9n4ck9uqdxj18m-1
modified:
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/check.py check.py-20050309040759-f3a679400c06bcc1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_branch.py test_branch.py-20060116013032-97819aa07b8ab3b5
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
=== modified file 'bzrlib/branch.py'
--- a/bzrlib/branch.py 2008-02-06 04:06:42 +0000
+++ b/bzrlib/branch.py 2008-02-20 00:42:39 +0000
@@ -40,6 +40,7 @@
)
from bzrlib.config import BranchConfig, TreeConfig
from bzrlib.lockable_files import LockableFiles, TransportLock
+from bzrlib.repofmt.pack_repo import RepositoryFormatPackDevelopment1Subtree
from bzrlib.tag import (
BasicTags,
DisabledTags,
@@ -1187,6 +1188,11 @@
def supports_tags(self):
return True
+ def __init__(self):
+ super(BzrBranchFormat6, self).__init__()
+ self._matchingbzrdir.repository_format = \
+ RepositoryFormatPackDevelopment1Subtree()
+
class BranchReferenceFormat(BranchFormat):
"""Bzr branch reference format.
=== modified file 'bzrlib/bzrdir.py'
--- a/bzrlib/bzrdir.py 2008-02-13 22:11:40 +0000
+++ b/bzrlib/bzrdir.py 2008-02-20 00:42:39 +0000
@@ -2686,7 +2686,7 @@
)
# The following two formats should always just be aliases.
format_registry.register_metadir('development',
- 'bzrlib.repofmt.pack_repo.RepositoryFormatPackDevelopment0',
+ 'bzrlib.repofmt.pack_repo.RepositoryFormatPackDevelopment1',
help='Current development format. Can convert data to and from pack-0.92 '
'(and anything compatible with pack-0.92) format repositories. '
'Repositories in this format can only be read by bzr.dev. '
@@ -2699,7 +2699,7 @@
alias=True,
)
format_registry.register_metadir('development-subtree',
- 'bzrlib.repofmt.pack_repo.RepositoryFormatPackDevelopment0Subtree',
+ 'bzrlib.repofmt.pack_repo.RepositoryFormatPackDevelopment1Subtree',
help='Current development format, subtree variant. Can convert data to and '
'from pack-0.92 (and anything compatible with pack-0.92) format '
'repositories. Repositories in this format can only be read by '
@@ -2734,4 +2734,27 @@
hidden=True,
experimental=True,
)
+format_registry.register_metadir('development1',
+ 'bzrlib.repofmt.pack_repo.RepositoryFormatPackDevelopment1',
+ help='pack-0.92 with a branch that supports stacking. '
+ 'Please read '
+ 'http://doc.bazaar-vcs.org/latest/developers/development-repo.html '
+ 'before use.',
+ branch_format='bzrlib.branch.BzrBranchFormat6',
+ tree_format='bzrlib.workingtree.WorkingTreeFormat4',
+ hidden=True,
+ experimental=True,
+ )
+format_registry.register_metadir('development1-subtree',
+ 'bzrlib.repofmt.pack_repo.RepositoryFormatPackDevelopment1Subtree',
+ help='pack-0.92-subtree with a branch that supports stacking. '
+ 'Please read '
+ 'http://doc.bazaar-vcs.org/latest/developers/development-repo.html '
+ 'before use.',
+ branch_format='bzrlib.branch.BzrBranchFormat6',
+ tree_format='bzrlib.workingtree.WorkingTreeFormat4',
+ hidden=True,
+ experimental=True,
+ )
+# The current format that is made on 'bzr init'.
format_registry.set_default('pack-0.92')
=== modified file 'bzrlib/check.py'
--- a/bzrlib/check.py 2007-11-27 23:39:22 +0000
+++ b/bzrlib/check.py 2008-02-20 00:42:39 +0000
@@ -94,7 +94,7 @@
def plan_revisions(self):
repository = self.repository
- self.planned_revisions = repository.all_revision_ids()
+ self.planned_revisions = list(repository.all_revision_ids())
self.progress.clear()
inventoried = set(self.inventory_weave.versions())
awol = set(self.planned_revisions) - inventoried
=== modified file 'bzrlib/remote.py'
--- a/bzrlib/remote.py 2008-02-12 05:17:25 +0000
+++ b/bzrlib/remote.py 2008-02-20 00:42:39 +0000
@@ -300,6 +300,8 @@
# Can this repository be given external locations to lookup additional
# data.
self.supports_external_lookups = False
+ # Additional places to query for data.
+ self._fallback_repositories = []
def __str__(self):
return "%s(%s)" % (self.__class__.__name__, self.base)
@@ -678,6 +680,17 @@
committer=committer, revprops=revprops, revision_id=revision_id)
return builder
+ def add_fallback_repository(self, repository):
+ """Add a repository to use for looking up data not held locally.
+
+ :param repository: A repository.
+ """
+ if not self._format.supports_external_lookups:
+ raise errors.UnstackableRepositoryFormat(self._format, self.base)
+ # We need to accumulate additional repositories here, to pass them in
+ # on various RPC's.
+ self._fallback_repositories.append(repository)
+
def add_inventory(self, revid, inv, parents):
self._ensure_real()
return self._real_repository.add_inventory(revid, inv, parents)
=== modified file 'bzrlib/repofmt/pack_repo.py'
--- a/bzrlib/repofmt/pack_repo.py 2008-02-19 03:58:32 +0000
+++ b/bzrlib/repofmt/pack_repo.py 2008-02-20 00:42:39 +0000
@@ -2328,3 +2328,72 @@
"pack-0.92-subtree\n")
+class RepositoryFormatPackDevelopment1(RepositoryFormatPackDevelopment0):
+ """A no-subtrees development repository.
+
+ This format should be retained until the second release after bzr 1.2.
+
+ Supports external lookups, which results in non-truncated ghosts after
+ reconcile compared to pack-0.92 formats.
+ """
+
+ supports_external_lookups = True
+
+ def _get_matching_bzrdir(self):
+ return bzrdir.format_registry.make_bzrdir('development1')
+
+ def _ignore_setting_bzrdir(self, format):
+ pass
+
+ _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
+
+ def get_format_string(self):
+ """See RepositoryFormat.get_format_string()."""
+ return "Bazaar development format 1 (needs bzr.dev from before 1.3)\n"
+
+ def get_format_description(self):
+ """See RepositoryFormat.get_format_description()."""
+ return ("Development repository format, currently the same as "
+ "pack-0.92 with external reference support.\n")
+
+ def check_conversion_target(self, target_format):
+ pass
+
+
+class RepositoryFormatPackDevelopment1Subtree(RepositoryFormatPackDevelopment0):
+ """A subtrees development repository.
+
+ This format should be retained until the second release after bzr 1.2.
+
+ Supports external lookups, which results in non-truncated ghosts after
+ reconcile compared to pack-0.92 formats.
+ """
+
+ supports_external_lookups = True
+
+ def _get_matching_bzrdir(self):
+ return bzrdir.format_registry.make_bzrdir(
+ 'development1-subtree')
+
+ def _ignore_setting_bzrdir(self, format):
+ pass
+
+ _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
+
+ def check_conversion_target(self, target_format):
+ if not target_format.rich_root_data:
+ raise errors.BadConversionTarget(
+ 'Does not support rich root data.', target_format)
+ if not getattr(target_format, 'supports_tree_reference', False):
+ raise errors.BadConversionTarget(
+ 'Does not support nested trees', target_format)
+
+ def get_format_string(self):
+ """See RepositoryFormat.get_format_string()."""
+ return ("Bazaar development format 1 with subtree support "
+ "(needs bzr.dev from before 1.3)\n")
+
+ def get_format_description(self):
+ """See RepositoryFormat.get_format_description()."""
+ return ("Development repository format, currently the same as "
+ "pack-0.92-subtree with external reference support.\n")
=== modified file 'bzrlib/repository.py'
--- a/bzrlib/repository.py 2008-02-19 03:58:32 +0000
+++ b/bzrlib/repository.py 2008-02-20 00:42:39 +0000
@@ -495,6 +495,15 @@
attempted.
"""
+ def add_fallback_repository(self, repository):
+ """Add a repository to use for looking up data not held locally.
+
+ :param repository: A repository.
+ """
+ if not self._format.supports_external_lookups:
+ raise errors.UnstackableRepositoryFormat(self._format, self.base)
+ self._fallback_repositories.append(repository)
+
def add_inventory(self, revision_id, inv, parents):
"""Add the inventory inv to the repository as revision_id.
@@ -563,13 +572,17 @@
def all_revision_ids(self):
"""Returns a list of all the revision ids in the repository.
- This is deprecated because code should generally work on the graph
- reachable from a particular revision, and ignore any other revisions
- that might be present. There is no direct replacement method.
+ This is conceptually deprecated because code should generally work on
+ the graph reachable from a particular revision, and ignore any other
+ revisions that might be present. There is no direct replacement
+ method.
"""
if 'evil' in debug.debug_flags:
mutter_callsite(2, "all_revision_ids is linear with history.")
- return self._all_revision_ids()
+ all_ids = set(self._all_revision_ids())
+ for repository in self._fallback_repositories:
+ all_ids.update(repository.all_revision_ids())
+ return all_ids
def _all_revision_ids(self):
"""Returns a list of all the revision ids in the repository.
@@ -635,6 +648,8 @@
self._warn_if_deprecated()
self._write_group = None
self.base = control_files._transport.base
+ # Additional places to query for data.
+ self._fallback_repositories = []
def __repr__(self):
return '%s(%r)' % (self.__class__.__name__,
@@ -2332,6 +2347,17 @@
'bzrlib.repofmt.pack_repo',
'RepositoryFormatPackDevelopment0Subtree',
)
+format_registry.register_lazy(
+ "Bazaar development format 1 (needs bzr.dev from before 1.3)\n",
+ 'bzrlib.repofmt.pack_repo',
+ 'RepositoryFormatPackDevelopment1',
+ )
+format_registry.register_lazy(
+ ("Bazaar development format 1 with subtree support "
+ "(needs bzr.dev from before 1.3)\n"),
+ 'bzrlib.repofmt.pack_repo',
+ 'RepositoryFormatPackDevelopment1Subtree',
+ )
# 1.3->1.4 go below here
=== modified file 'bzrlib/tests/repository_implementations/__init__.py'
--- a/bzrlib/tests/repository_implementations/__init__.py 2008-01-11 03:54:51 +0000
+++ b/bzrlib/tests/repository_implementations/__init__.py 2008-02-20 00:42:39 +0000
@@ -859,6 +859,7 @@
prefix = 'bzrlib.tests.repository_implementations.'
test_repository_modules = [
+ 'test_add_fallback_repository',
'test_break_lock',
'test_check',
# test_check_reconcile is intentionally omitted, see below.
=== added file 'bzrlib/tests/repository_implementations/test_add_fallback_repository.py'
--- a/bzrlib/tests/repository_implementations/test_add_fallback_repository.py 1970-01-01 00:00:00 +0000
+++ b/bzrlib/tests/repository_implementations/test_add_fallback_repository.py 2008-02-20 00:42:39 +0000
@@ -0,0 +1,36 @@
+# Copyright (C) 2008 Canonical Ltd
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+"""Tests for Repository.add_fallback_repository."""
+
+from bzrlib import errors
+from bzrlib.tests import TestNotApplicable
+from bzrlib.tests.repository_implementations import TestCaseWithRepository
+
+
+class TestAddFallbackRepository(TestCaseWithRepository):
+
+ def test_add_fallback_repository(self):
+ repo = self.make_repository('repo')
+ tree = self.make_branch_and_tree('branch')
+ if not repo._format.supports_external_lookups:
+ self.assertRaises(errors.UnstackableRepositoryFormat,
+ repo.add_fallback_repository, tree.branch.repository)
+ raise TestNotApplicable
+ repo.add_fallback_repository(tree.branch.repository)
+ # the repository has been added correctly if we can query against it.
+ revision_id = tree.commit('1st post')
+ self.assertEqual(set([revision_id]), set(repo.all_revision_ids()))
=== modified file 'bzrlib/tests/repository_implementations/test_repository.py'
--- a/bzrlib/tests/repository_implementations/test_repository.py 2008-02-12 02:38:27 +0000
+++ b/bzrlib/tests/repository_implementations/test_repository.py 2008-02-20 00:42:39 +0000
@@ -894,8 +894,8 @@
def test_all_revision_ids(self):
# all_revision_ids -> all revisions
- self.assertEqual(['rev1', 'rev2', 'rev3', 'rev4'],
- self.bzrdir.open_repository().all_revision_ids())
+ self.assertEqual(set(['rev1', 'rev2', 'rev3', 'rev4']),
+ set(self.bzrdir.open_repository().all_revision_ids()))
def test_get_ancestry_missing_revision(self):
# get_ancestry(revision that is in some data but not fully installed
=== modified file 'bzrlib/tests/test_branch.py'
--- a/bzrlib/tests/test_branch.py 2007-10-04 05:50:44 +0000
+++ b/bzrlib/tests/test_branch.py 2008-02-20 00:42:39 +0000
@@ -294,6 +294,7 @@
self.assertEqual(warnings[0], 'Value "new" is masked by "old" from '
'locations.conf')
+
class TestBranchReference(TestCaseWithTransport):
"""Tests for the branch reference facility."""
=== modified file 'bzrlib/tests/test_repository.py'
--- a/bzrlib/tests/test_repository.py 2008-02-19 03:58:32 +0000
+++ b/bzrlib/tests/test_repository.py 2008-02-20 00:42:39 +0000
@@ -1213,7 +1213,7 @@
def get_format(self):
return bzrdir.format_registry.make_bzrdir(
- 'development')
+ 'development0')
def check_format(self, t):
self.assertEqualDiff(
@@ -1225,14 +1225,47 @@
def get_format(self):
return bzrdir.format_registry.make_bzrdir(
+ 'development0-subtree')
+
+ def check_format(self, t):
+ self.assertEqualDiff(
+ "Bazaar development format 0 with subtree support "
+ "(needs bzr.dev from before 1.3)\n",
+ t.get('format').read())
+
+
+class TestDevelopment1(TestKnitPackNoSubtrees):
+
+ def get_format(self):
+ return bzrdir.format_registry.make_bzrdir(
+ 'development')
+
+ def check_format(self, t):
+ self.assertEqualDiff(
+ "Bazaar development format 1 (needs bzr.dev from before 1.3)\n",
+ t.get('format').read())
+
+ def test_supports_external_lookups(self):
+ repo = self.make_repository('.', format=self.get_format())
+ self.assertTrue(repo._format.supports_external_lookups)
+
+
+class TestDevelopment1Subtree(TestKnitPackNoSubtrees):
+
+ def get_format(self):
+ return bzrdir.format_registry.make_bzrdir(
'development-subtree')
def check_format(self, t):
self.assertEqualDiff(
- "Bazaar development format 0 with subtree support "
+ "Bazaar development format 1 with subtree support "
"(needs bzr.dev from before 1.3)\n",
t.get('format').read())
+ def test_supports_external_lookups(self):
+ repo = self.make_repository('.', format=self.get_format())
+ self.assertTrue(repo._format.supports_external_lookups)
+
class TestRepositoryPackCollection(TestCaseWithTransport):
More information about the bazaar-commits
mailing list