[MERGE] Use composite trees for diff.

[Aaron Bentley]

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

Hi all,

This patch adds support for nested trees to the diff command.  It builds
on my previous two patches for status and composite trees.

DirStateWorkingTree must be locked before invoking iter_references, and
this is clearly by design, so I've updated
composite_tree.maybe_composite to lock the tree before calling
iter_references.

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

iEYEARECAAYFAknVGl4ACgkQ0F+nu1YWqI3S0gCeNCIP/ceBY6U5jjUYCrQkYhN6
ZjQAn28BLr4vPhD3SNheJlXNus5fGrH0
=D1Po
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: diff-1916.patch
Type: text/x-patch
Size: 113181 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20090402/3ecee804/attachment-0001.bin