Rev 1846: (jam) update Branch and WorkingTree to properly lock and cleanup in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 1846
revision-id: pqm at pqm.ubuntu.com-20060709161745-764d41910ae59c5e
parent: pqm at pqm.ubuntu.com-20060708044058-a64fc46ea66545cb
parent: john at arbash-meinel.com-20060709154702-304436a47a55e265
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sun 2006-07-09 17:17:45 +0100
message:
  (jam) update Branch and WorkingTree to properly lock and cleanup
added:
  bzrlib/tests/branch_implementations/test_locking.py test_locking.py-20060707151933-tav3o2hpibwi53u4-4
  bzrlib/tests/lock_helpers.py   LockHelpers.py-20060707151933-tav3o2hpibwi53u4-1
  bzrlib/tests/workingtree_implementations/test_locking.py test_locking.py-20060707151933-tav3o2hpibwi53u4-3
modified:
  bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
  bzrlib/lock.py                 lock.py-20050527050856-ec090bb51bc03349
  bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
  bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
  bzrlib/tests/workingtree_implementations/__init__.py __init__.py-20060203003124-b2aa5aca21a8bfad
  bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060709154702-304436a47a55e265
    parent: john at arbash-meinel.com-20060707152242-a7b5e0afd64d9d5a
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: two-phase-locking
    timestamp: Sun 2006-07-09 10:47:02 -0500
    message:
      Renaming LockHelpers.py to lock_helpers.py
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060707152242-a7b5e0afd64d9d5a
    parent: john at arbash-meinel.com-20060707152033-b9840586a3e0ab49
    parent: pqm at pqm.ubuntu.com-20060706145359-27c4289acd83b54e
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: two-phase-locking
    timestamp: Fri 2006-07-07 10:22:42 -0500
    message:
      [merge] bzr.dev 1843
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060707152033-b9840586a3e0ab49
    parent: john at arbash-meinel.com-20060701162808-769ff8f2520a65d6
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: two-phase-locking
    timestamp: Fri 2006-07-07 10:20:33 -0500
    message:
      Move the new locking tests into their own files, and move the helper functions into a test helper.
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060701162808-769ff8f2520a65d6
    parent: john at arbash-meinel.com-20060630203516-15636a2648ee156b
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: jam-integration
    timestamp: Sat 2006-07-01 11:28:08 -0500
    message:
      Test that other is unlocked even if self fails
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060630203516-15636a2648ee156b
    parent: john at arbash-meinel.com-20060630202722-432c791cc076e496
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: jam-integration
    timestamp: Fri 2006-06-30 15:35:16 -0500
    message:
      Branch should lock Repository before it locks self, and unlock self before Repository
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060630202722-432c791cc076e496
    parent: john at arbash-meinel.com-20060630195802-c6e78240f04c9d52
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: jam-integration
    timestamp: Fri 2006-06-30 15:27:22 -0500
    message:
      Test that WorkingTree locks Branch before self, and unlocks self before Branch
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060630195802-c6e78240f04c9d52
    parent: john at arbash-meinel.com-20060629165235-5dda727d9baa5237
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: jam-integration
    timestamp: Fri 2006-06-30 14:58:02 -0500
    message:
      Branch.lock_read/lock_write/unlock should handle failures
      because of the multi-phase of lock and unlock, we should make sure we
      cleanup the locks properly. This is now tested for Branch