[MERGE][1.0] update C PatienceDiff to allow for non-strings

Aaron Bentley aaron.bentley at utoronto.ca
Tue Dec 4 16:43:31 GMT 2007


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

John Arbash Meinel wrote:
> Aaron pinged me on IRC to see if that was strictly required. I think he wanted
> to use patience diff for comparing annotated texts. And being able to use
> tuples there would be convenient.

Actually, it was for merge plans, but they have a similar structure:

[
 ('unchanged', 'foo'),
 ('killed-a', 'bar'),
 ('new-b', 'baz'),
]

> So this patch allows for arbitrary Python Objects. As long as they support
> PyObject_Hash (though I probably need to check the return value a bit better),
> PyObject_Length, and PyObject_Compare.

Nice.

> Anyway, I think this is worthy to merge into 1.0, it is a simple and
> straightforward improvement to the diff algorithm.

The work I was doing was to enable annotate merge to do cherrypicking.
That isn't targeted for 1.0, so I don't strictly need it for 1.0.

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

iD8DBQFHVYOz0F+nu1YWqI0RAjs3AJ0YikxDc3tUIoPBwypTvRQsTHu81wCfSNmi
QS6tilRaiRoxAtNFpbO8Qlo=
=gl4A
-----END PGP SIGNATURE-----



More information about the bazaar mailing list