[MERGE] Stop auto-detecting nested trees

[Aaron Bentley]

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

Hi all,

This patch changes working tree beheviour so that nested working trees
are not automatically treated as tree references.  Now, they will be
treated as tree references if explicitly added that way, and otherwise,
they will be treated as directories.

This prevents users from accidentally using nested trees, which are an
alpha-quality feature.  Previously, they were prevented by the
repository format, which meant that we had to have a separate repository
format for nested trees.  So with this patch, we can have a single
format (i.e. brisbane-core) instead of three variants.

In the process, I discovered that dirstate.update_entry() was broken wrt
tree-references-- it would always turn a tree-reference into a
directory.  This patch fixes this.

I also fixed a few tests that weren't taking locks before calling
Tree.kind, and refactored test_nested_specifics slightly.

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

iEYEARECAAYFAkm3Pw8ACgkQ0F+nu1YWqI084gCeImF8J4TLQqH/ams3jP6jrWev
3h4Anine3EGxha34bw6ZYzGEkYKij3e7
=mMzG
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: no-auto-reference-4108.patch
Type: text/x-patch
Size: 19392 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20090311/176bc3a1/attachment.bin