[merge] countedlock handles lock tokens & misc cleanups

[Martin Pool]

Continuing to work towards cleaning up LockableFiles:

* CountedLock gets a repr
* CountedLock passes lock tokens through to the underlying lock
* DummyLock in its tests handles them
* Cleanups in some LockableFiles tests

-- 
Martin <http://launchpad.net/~mbp/>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 20080605-countedlock.diff
Type: text/x-diff
Size: 9982 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20080605/dd54bb01/attachment-0001.bin