Rev 1263: Merge from mpool in /home/robertc/source/baz/storage/

[Robert Collins]

------------------------------------------------------------
revno: 1263
revision-id: robertc at robertcollins.net-20060124214346-c148443fda65c8b8
parent: robertc at robertcollins.net-20060118030939-c5c7106140cf444f
parent: mbp at sourcefrog.net-20060113065759-13605598ac561067
committer: Robert Collins <robertc at robertcollins.net>
branch nick: storage
timestamp: Wed 2006-01-25 08:43:46 +1100
message:
  Merge from mpool
added:
  bzrlib/tests/test_decorators.py test_decorators.py-20060113063037-0e7bd4566758f4fa
modified:
  bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
  bzrlib/decorators.py           decorators.py-20060112082512-6bfc2d882df1698d
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060113065759-13605598ac561067
    parent: mbp at sourcefrog.net-20060113063856-484eed116191727b
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.storage
    timestamp: Fri 2006-01-13 17:57:59 +1100
    message:
      review fixups from John
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060113063856-484eed116191727b
    parent: mbp at sourcefrog.net-20060112084859-62f2a2c71e50d442
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.storage
    timestamp: Fri 2006-01-13 17:38:56 +1100
    message:
      Pass through wrapped function name and docstrign 
      in needs_read_lock and needs_write_lock decorators.  Test this works.
      (Suggestion from John)