[MERGE] PreviewTree updates

[Aaron Bentley]

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

Hi all,

Launchpad wants to be able to generate diffs of merges that assume
another branch has already been merged.

A strawman UI would be something like "bzr merge --preview --dependent
branch1 branch2"

branch1 would be the dependent branch; i.e. part one in a two-part
change.  The idea is that we want to get branch1 and branch2 reviewed in
parallel, without requiring branch1 to land before we generate a merge
- --preview for branch2.

Similar behaviour can be achieved with careful use of looms, but there
are some differences.  In general, diff -r thread: shows the changes
that were made, but merge --preview shows the results of merging,
including conflicts, etc.  Long story short, we want to make PreviewTree
a proper Tree so it can serve as the tree being merged *into*.

Currently, many PreviewTree methods are thunks into the underlying Tree.

This patch fixes all_file_ids, path2id and iter_entries.

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

iD8DBQFIYWaP0F+nu1YWqI0RAq11AJ9WgSAq1Cqk/EQtj+DboRaCX8Ty3wCfZ1p7
8b2J3RF0wPMbQOAoQ37TYHI=
=5CrI
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: preview-tree-changed-3389.patch
Type: text/x-diff
Size: 26513 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20080624/746fc509/attachment-0001.bin