[MERGE] Add an optional 'token' keyword argument to LockableFiles.lock_write

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Andrew Bennetts wrote:
> Andrew Bennetts wrote:
>> This adds the low-level support the branch and repository lock sharing that is
> [...]
> 
> Ahem.  And here is the bundle.

The possible weakness I see here is, how do we know which lock token to
supply?  It seems like we would need to guess.

Would it be better to supply all known tokens?

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.3 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFF09c/0F+nu1YWqI0RAuFEAJ940YMI7PG98+cC4B0T2tkTUXvlnwCghBcI
OCr9aDnxBqiYUammkRNywXA=
=MGGE
-----END PGP SIGNATURE-----