Rev 3617: Disable auto-detecting the default stacking url in http://bzr.arbash-meinel.com/branches/bzr/1.6-dev/stacking_policy
John Arbash Meinel
john at arbash-meinel.com
Tue Aug 19 22:00:40 BST 2008
At http://bzr.arbash-meinel.com/branches/bzr/1.6-dev/stacking_policy
------------------------------------------------------------
revno: 3617
revision-id: john at arbash-meinel.com-20080819210037-o5l9dnoeovx5dtde
parent: pqm at pqm.ubuntu.com-20080818234533-ixoxs0ca9kygqe0m
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: stacking_policy
timestamp: Tue 2008-08-19 16:00:37 -0500
message:
Disable auto-detecting the default stacking url
modified:
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/branch_implementations/test_stacking.py test_stacking.py-20080214020755-msjlkb7urobwly0f-1
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
-------------- next part --------------
=== modified file 'bzrlib/bzrdir.py'
--- a/bzrlib/bzrdir.py 2008-07-31 08:35:25 +0000
+++ b/bzrlib/bzrdir.py 2008-08-19 21:00:37 +0000
@@ -390,15 +390,7 @@
def repository_policy(found_bzrdir):
stack_on = None
stack_on_pwd = None
- config = found_bzrdir.get_config()
stop = False
- if config is not None:
- stack_on = config.get_default_stack_on()
- if stack_on is not None:
- stack_on_pwd = found_bzrdir.root_transport.base
- stop = True
- note('Using default stacking branch %s at %s', stack_on,
- stack_on_pwd)
# does it have a repository ?
try:
repository = found_bzrdir.open_repository()
=== modified file 'bzrlib/tests/blackbox/test_push.py'
--- a/bzrlib/tests/blackbox/test_push.py 2008-07-17 05:51:29 +0000
+++ b/bzrlib/tests/blackbox/test_push.py 2008-08-19 21:00:37 +0000
@@ -342,7 +342,7 @@
self.assertEqual('', out)
self.assertFalse(self.get_transport('published').has('.'))
- def test_push_notifies_default_stacking(self):
+ def test_push_notices_default_stacking(self):
self.make_branch('stack_on', format='development1')
self.make_bzrdir('.').get_config().set_default_stack_on('stack_on')
self.make_branch('from', format='development1')
=== modified file 'bzrlib/tests/branch_implementations/test_stacking.py'
--- a/bzrlib/tests/branch_implementations/test_stacking.py 2008-08-01 02:58:08 +0000
+++ b/bzrlib/tests/branch_implementations/test_stacking.py 2008-08-19 21:00:37 +0000
@@ -219,10 +219,10 @@
parent_bzrdir.get_config().set_default_stack_on('stack-on')
source = self.make_branch('source')
target = source.bzrdir.sprout('target').open_branch()
- try:
- self.assertEqual('../stack-on', target.get_stacked_on_url())
- except errors.UnstackableBranchFormat:
- pass
+ # XXX: Determining stacking from a containing bzrdir has been
+ # explicitly disabled.
+ self.assertRaises((errors.UnstackableBranchFormat, errors.NotStacked),
+ target.get_stacked_on_url)
def test_clone_stacking_policy_handling(self):
"""Obey policy where possible, ignore otherwise."""
@@ -231,10 +231,10 @@
parent_bzrdir.get_config().set_default_stack_on('stack-on')
source = self.make_branch('source')
target = source.bzrdir.clone('target').open_branch()
- try:
- self.assertEqual('../stack-on', target.get_stacked_on_url())
- except errors.UnstackableBranchFormat:
- pass
+ # XXX: Determining stacking from a containing bzrdir has been
+ # explicitly disabled.
+ self.assertRaises((errors.UnstackableBranchFormat, errors.NotStacked),
+ target.get_stacked_on_url)
def prepare_stacked_on_fetch(self):
stack_on = self.make_branch_and_tree('stack-on')
=== modified file 'bzrlib/tests/test_bzrdir.py'
--- a/bzrlib/tests/test_bzrdir.py 2008-08-01 07:30:20 +0000
+++ b/bzrlib/tests/test_bzrdir.py 2008-08-19 21:00:37 +0000
@@ -424,22 +424,23 @@
my_bzrdir.root_transport.base)
self.assertFalse(repo.is_shared())
-
def test_determine_stacking_policy(self):
parent_bzrdir = self.make_bzrdir('.')
child_bzrdir = self.make_bzrdir('child')
parent_bzrdir.get_config().set_default_stack_on('http://example.org')
repo_policy = child_bzrdir.determine_repository_policy()
- self.assertEqual('http://example.org', repo_policy._stack_on)
+ # XXX: Determining stacking from a containing bzrdir has been
+ # explicitly disabled.
+ self.assertIs(None, repo_policy._stack_on)
def test_determine_stacking_policy_relative(self):
parent_bzrdir = self.make_bzrdir('.')
child_bzrdir = self.make_bzrdir('child')
parent_bzrdir.get_config().set_default_stack_on('child2')
repo_policy = child_bzrdir.determine_repository_policy()
- self.assertEqual('child2', repo_policy._stack_on)
- self.assertEqual(parent_bzrdir.root_transport.base,
- repo_policy._stack_on_pwd)
+ # XXX: Determining stacking from a containing bzrdir has been
+ # explicitly disabled.
+ self.assertIs(None, repo_policy._stack_on)
def prepare_default_stacking(self):
parent_bzrdir = self.make_bzrdir('.')
@@ -451,14 +452,18 @@
def test_clone_on_transport_obeys_stacking_policy(self):
child_branch, new_child_transport = self.prepare_default_stacking()
new_child = child_branch.bzrdir.clone_on_transport(new_child_transport)
- self.assertEqual(child_branch.base,
- new_child.open_branch().get_stacked_on_url())
+ # XXX: Determining stacking from a containing bzrdir has been
+ # explicitly disabled.
+ self.assertRaises(errors.NotStacked,
+ new_child.open_branch().get_stacked_on_url)
def test_sprout_obeys_stacking_policy(self):
child_branch, new_child_transport = self.prepare_default_stacking()
new_child = child_branch.bzrdir.sprout(new_child_transport.base)
- self.assertEqual(child_branch.base,
- new_child.open_branch().get_stacked_on_url())
+ # XXX: Determining stacking from a containing bzrdir has been
+ # explicitly disabled.
+ self.assertRaises(errors.NotStacked,
+ new_child.open_branch().get_stacked_on_url)
def test_add_fallback_repo_handles_absolute_urls(self):
stack_on = self.make_branch('stack_on', format='development1')
More information about the bazaar-commits
mailing list