Rev 2280: Branch.push() only needs a read lock. in http://bzr.arbash-meinel.com/branches/bzr/0.15-dev/push_readonly

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/branches/bzr/0.15-dev/push_readonly

------------------------------------------------------------
revno: 2280
revision-id: john at arbash-meinel.com-20070212223618-7cboppunmrb86n3b
parent: pqm at pqm.ubuntu.com-20070209195330-312ec52588462782
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: push_readonly
timestamp: Mon 2007-02-12 16:36:18 -0600
message:
  Branch.push() only needs a read lock.
  By avoiding a write lock, we avoid deadlock when pushing within
  a single repository.
modified:
  bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
  bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
  bzrlib/tests/branch_implementations/test_push.py test_push.py-20070130153159-fhfap8uoifevg30j-1
-------------- next part --------------
=== modified file 'bzrlib/branch.py'
--- a/bzrlib/branch.py	2007-02-06 02:33:42 +0000
+++ b/bzrlib/branch.py	2007-02-12 22:36:18 +0000
@@ -1446,7 +1446,7 @@
             if master_branch:
                 master_branch.unlock()
 
-    @needs_write_lock
+    @needs_read_lock
     def push(self, target, overwrite=False, stop_revision=None):
         """Updates branch.push to be bound branch aware."""
         bound_location = target.get_bound_location()

=== modified file 'bzrlib/tests/blackbox/test_push.py'
--- a/bzrlib/tests/blackbox/test_push.py	2007-02-07 19:31:55 +0000
+++ b/bzrlib/tests/blackbox/test_push.py	2007-02-12 22:36:18 +0000
@@ -23,9 +23,8 @@
 from bzrlib import (
     errors,
     )
-import bzrlib
 from bzrlib.branch import Branch
-from bzrlib.bzrdir import BzrDirMetaFormat1
+from bzrlib.bzrdir import BzrDir, BzrDirMetaFormat1
 from bzrlib.osutils import abspath
 from bzrlib.repository import RepositoryFormatKnit1
 from bzrlib.tests.blackbox import ExternalBase
@@ -100,7 +99,7 @@
         out, err = self.run_bzr('push', 'pushed-location')
         self.assertEqual('', out)
         self.assertEqual('0 revision(s) pushed.\n', err)
-        b2 = bzrlib.branch.Branch.open('pushed-location')
+        b2 = Branch.open('pushed-location')
         self.assertEndsWith(b2.base, 'pushed-location/')
 
     def test_push_new_branch_revision_count(self):
@@ -233,3 +232,17 @@
         self.run_bzr_error(['At ../dir you have a valid .bzr control'],
                 'push', '../dir',
                 working_dir='tree')
+
+    def test_push_inside_repository(self):
+        """Push from one branch to another inside the same repository."""
+        repo = self.make_repository('repo', shared=True)
+        # This is a little bit trickier because make_branch_and_tree will not
+        # re-use a shared repository.
+        a_branch = BzrDir.create_branch_convenience('repo/tree')
+        tree = a_branch.bzrdir.open_workingtree()
+        self.build_tree(['repo/tree/a'])
+        tree.add(['a'])
+        tree.commit('a')
+
+        to_branch = BzrDir.create_branch_convenience('repo/branch')
+        tree.branch.push(to_branch)

=== modified file 'bzrlib/tests/branch_implementations/test_push.py'
--- a/bzrlib/tests/branch_implementations/test_push.py	2007-02-06 02:33:42 +0000
+++ b/bzrlib/tests/branch_implementations/test_push.py	2007-02-12 22:36:18 +0000
@@ -90,6 +90,25 @@
         self.assertRaises(errors.BoundBranchConnectionFailure,
                 other.branch.push, checkout.branch)
 
+    def test_push_uses_read_lock(self):
+        """Push should only need a read lock on the source side."""
+        source = self.make_branch_and_tree('source')
+        target = self.make_branch('target')
+
+        self.build_tree(['source/a'])
+        source.add(['a'])
+        source.commit('a')
+
+        source.branch.lock_read()
+        try:
+            target.lock_write()
+            try:
+                source.branch.push(target, stop_revision=source.last_revision())
+            finally:
+                target.unlock()
+        finally:
+            source.branch.unlock()
+
 
 class TestPushHook(TestCaseWithBranch):