[MERGE] Refactor diffing

Aaron Bentley aaron.bentley at utoronto.ca
Fri Nov 23 23:19:03 GMT 2007


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

Robert Collins wrote:
> So, this patch goes a long way towards fixing the bug, but its not fixed
> yet :).

Hey, if I can run diff against PreviewTree, which has no inventory, how
can you say diff uses inventory?

>     def id2path(self, file_id):
>         "Convert a file-id to a path."

> That should do it and pass the interface tests.

Thanks.

Unfortunately, Dirstate.inventory is also used by DirState.kind and
DirState.get_file_lines.

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

iD8DBQFHR1/m0F+nu1YWqI0RAoaeAJsGbqotq+NXj3vS9TfyYPqVwVQdOgCfUVRm
7gwSUkQW/Z4TYg8SIIgWKcc=
=sFE9
-----END PGP SIGNATURE-----



More information about the bazaar mailing list