Rev 6415: Missed fallouts from the previous trunk merge. in file:///home/vila/src/bzr/experimental/cached-branch-store/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/experimental/cached-branch-store/

------------------------------------------------------------
revno: 6415
revision-id: v.ladeuil+lp at free.fr-20120106091258-vtzwd5j2e6ohsmmp
parent: v.ladeuil+lp at free.fr-20120105175630-kp0kt0el27s40q0x
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: cached-branch-store
timestamp: Fri 2012-01-06 10:12:58 +0100
message:
  Missed fallouts from the previous trunk merge.
-------------- next part --------------
=== modified file 'bzrlib/tests/blackbox/test_bound_branches.py'
--- a/bzrlib/tests/blackbox/test_bound_branches.py	2012-01-05 17:56:30 +0000
+++ b/bzrlib/tests/blackbox/test_bound_branches.py	2012-01-06 09:12:58 +0000
@@ -127,14 +127,12 @@
 
     def test_double_binding(self):
         child_tree = self.create_branches()[1]
-
         child_tree.bzrdir.sprout('child2')
 
         # Double binding succeeds, but committing to child2 should fail
         self.run_bzr('bind ../child', working_dir='child2')
 
-        child2_tree = BzrDir.open('child2').open_workingtree()
-
+        child2_tree = bzrdir.BzrDir.open('child2').open_workingtree()
         self.assertRaises(errors.CommitToDoubleBoundBranch,
                 child2_tree.commit, message='child2', allow_pointless=True)
 
@@ -152,7 +150,7 @@
         self.run_bzr("commit -m child", retcode=3, working_dir='child')
         self.check_revno(1, 'child')
         self.run_bzr('unbind', working_dir='child')
-        child_tree = BzrDir.open('child').open_workingtree()
+        child_tree = bzrdir.BzrDir.open('child').open_workingtree()
         child_tree.commit(message='child')
         self.check_revno(2, 'child')
 
@@ -203,7 +201,7 @@
 
         self.run_bzr('unbind', working_dir='child')
 
-        child_tree = BzrDir.open('child').open_workingtree()
+        child_tree = bzrdir.BzrDir.open('child').open_workingtree()
         child_tree.commit(message='child', allow_pointless=True)
         self.check_revno(2, 'child')
 
@@ -215,7 +213,7 @@
         self.run_bzr('bind ../base', working_dir='child')
 
         # This should turn the local commit into a merge
-        child_tree = BzrDir.open('child').open_workingtree()
+        child_tree = bzrdir.BzrDir.open('child').open_workingtree()
         child_tree.update()
         child_tree.commit(message='merged')
         self.check_revno(3, 'child')
@@ -254,7 +252,7 @@
 
         self.run_bzr('unbind', working_dir='child')
         # Refresh the child tree/branch objects as 'bind' modified them
-        child_tree = BzrDir.open('child').open_workingtree()
+        child_tree = bzrdir.BzrDir.open('child').open_workingtree()
         child_tree.commit(message='child', allow_pointless=True)
         self.check_revno(2, 'child')
         self.check_revno(1, 'base')

=== modified file 'bzrlib/tests/blackbox/test_pull.py'
--- a/bzrlib/tests/blackbox/test_pull.py	2012-01-05 17:56:30 +0000
+++ b/bzrlib/tests/blackbox/test_pull.py	2012-01-06 09:12:58 +0000
@@ -144,7 +144,11 @@
         # Make a source, sprout a target off it
         builder = self.make_branch_builder('source')
         source = fixtures.build_branch_with_non_ancestral_rev(builder)
-        source.get_config_stack().set('branch.fetch_tags', True)
+        source.lock_write()
+        try:
+            source.get_config_stack().set('branch.fetch_tags', True)
+        finally:
+            source.unlock()
         target_bzrdir = source.bzrdir.sprout('target')
         source.tags.set_tag('tag-a', 'rev-2')
         # Pull from source
@@ -255,17 +259,18 @@
                 ('','bzr: ERROR: These branches have diverged.'
                     ' Use the missing command to see how.\n'
                     'Use the merge command to reconcile them.\n'))
-        branch_b = branch.Branch.open('branch_b')
+        tree_b = tree_b.bzrdir.open_workingtree()
+        branch_b = tree_b.branch
         self.assertEqual(parent, branch_b.get_parent())
         # test implicit --remember after resolving previous failure
         uncommit.uncommit(branch=branch_b, tree=tree_b)
         t.delete('branch_b/d')
         self.run_bzr('pull', working_dir='branch_b')
-        branch_b = branch.Branch.open('branch_b')
+        branch_b = branch_b.bzrdir.open_branch()
         self.assertEqual(branch_b.get_parent(), parent)
         # test explicit --remember
         self.run_bzr('pull ../branch_c --remember', working_dir='branch_b')
-        branch_b = branch.Branch.open('branch_b')
+        branch_b = branch_b.bzrdir.open_branch()
         self.assertEqual(branch_c.bzrdir.root_transport.base,
                          branch_b.get_parent())