[RFC] Refactor diffing

Aaron Bentley aaron.bentley at utoronto.ca
Thu Nov 22 04:47:11 GMT 2007


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

Here's an updated version.  A couple of things:
1. several parts of Bazaar treat binary file handling as part of the
text diff protocol, so having a separate BinaryFileDiffer breaks
compatibility, and doesn't seem like a great improvement.

2. I'm not sure the tri-value return
(unchanged/changed/could-not-handle) makes sense.  We already know
whether the file is changed, and we wouldn't be diffing it if it was
unchanged.  So I think this could just be True for "could handle" and
False for "could not handle".

Thoughts?

Aaron


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

iD8DBQFHRQnO0F+nu1YWqI0RAp/iAJ9oOlZC81RmrsiWWkFjytE7wnOfzQCdHO6+
22Y/7HqMTbi7yaMI3Oi7PUU=
=C6nn
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: refactor-merge-2.patch
Type: text/x-diff
Size: 34949 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20071121/478dc4fb/attachment-0001.bin 


More information about the bazaar mailing list