Rev 1262: Various updates to make storage branch mergeable: in /home/mbp/work/bzr/bzr.mbp.storage

[Martin Pool]

------------------------------------------------------------
revno: 1262
revision-id: mbp at sourcefrog.net-20060112083710-642730d8ae44f906
parent: mbp at sourcefrog.net-20060112065123-387e10eb3b38d7fa
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.storage
timestamp: Thu 2006-01-12 19:37:10 +1100
message:
  Various updates to make storage branch mergeable:
  
   * remove duplication of needs_read_lock, needs_write_lock decorators, 
     and move them into bzrlib.decorators
  
   * add Branch.peek_lock_mode
  
   * some docs
  
   * fix up merge flux in tests
added:
  bzrlib/decorators.py           decorators.py-20060112082512-6bfc2d882df1698d
modified:
  BRANCH.TODO                    BRANCH.TODO-20060103052123-79ac4969351c03a9
  bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
  bzrlib/lockable_files.py       control_files.py-20051111201905-bb88546e799d669f
  bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
  bzrlib/tests/test_permissions.py test_permissions.py-20051215004520-ccf475789c80e80c
  bzrlib/tests/test_workingtree.py testworkingtree.py-20051004024258-b88d0fe8f101d468
  bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
  bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3