[MERGE][FIXES: 38458] diff always uses working tree for file ids

[Aaron Bentley]

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

Hi all,

This patch allows diff to use three trees for converting paths to file
ids: the FROM tree, the TO tree, and the working tree.

What I've done:
1. split transform.find_interesting into tree.specified_file_ids
2. add ability to specify an arbitrary number of trees to specified_file_ids
3. make specified_file_ids *optionally* raise PathsdNotVersionedError,
instead of unconditionally raising NotVersionedError
4. make compare_trees use specified_file_ids, instead of is_inside_any and
5. add extra_trees parameter to compare_trees and show_diff trees, teach
diff_cmd_helper to use it
6. add require_versioned to compare_trees

If this seems like a bit much for the the bug it fixes, it's because I
think specified_file_ids has the potential to become our standard method
of converting paths to file_ids across one or many trees.  We have
several different ways of doing this, and I'd like to unify them.

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

iD8DBQFEq0040F+nu1YWqI0RAtcIAJ9EKgKPtRWUWfzqTT/mVpWGcLsbfgCfS3dl
CiXHFsufzv5N+hzTXHCsFwA=
=VzDx
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: diff-uses-wt.patch
Type: text/x-patch
Size: 15462 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060705/d708cfa7/attachment.bin