Rev 4313: Handle repositories that mutex on writes (rather than transactions). in http://people.ubuntu.com/~robertc/baz2.0/pending/push.roundtrips

[Robert Collins]

At http://people.ubuntu.com/~robertc/baz2.0/pending/push.roundtrips

------------------------------------------------------------
revno: 4313
revision-id: robertc at robertcollins.net-20090501063612-1898qo17eimybm7w
parent: robertc at robertcollins.net-20090429041426-91s1jby1uq6mac1l
committer: Robert Collins <robertc at robertcollins.net>
branch nick: push.roundtrips
timestamp: Fri 2009-05-01 16:36:12 +1000
message:
  Handle repositories that mutex on writes (rather than transactions).
=== modified file 'bzrlib/bzrdir.py'
--- a/bzrlib/bzrdir.py	2009-04-28 03:55:56 +0000
+++ b/bzrlib/bzrdir.py	2009-05-01 06:36:12 +0000
@@ -3173,8 +3173,10 @@
                 # Updated server verb that locks remotely.
                 repo_lock_token = response[10] or None
                 remote_repo.lock_write(repo_lock_token, _skip_rpc=True)
+                if repo_lock_token:
+                    remote_repo.dont_leave_lock_in_place()
             else:
-                remore_repo.lock_write()
+                remote_repo.lock_write()
             policy = UseExistingRepository(remote_repo, final_stack,
                 final_stack_pwd, require_stacking)
             policy.acquire_repository()