[MERGE] Implement a --diff-command option for bzr diff.

[John Arbash Meinel]

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

Matthieu Moy wrote:
> Aaron Bentley <aaron.bentley at utoronto.ca> writes:
> 
>> Actually, I find the difftools plugin does a great job of running
>> external diff tools.
> 
> Ah, I had missed this one.
> 
>> But I don't have an objection to doing it in the core. I'll give
>> this a careful review later.
> 
> Well, since you have the --diff-options, I think --diff-command is a
> natural extension of it.
> 

difftools uses the option

bzr diff --using meld

or

bzr diff --using vim

Which seems a bit nicer than '--diff-command'.

The only other bit for integrating difftools instead, is that it can
handle lots of programs that don't take arguments in the same way. Some
take FROM TO, others TO FROM, as I understand it also understands 3-way
diffing, and when you have a command that can only diff 1 file, but you
give it the whole directory, it can do a recursive diff on the whole tree.

Just something to think about. Obviously if nobody has stepped up and
integrated difftools, your version is better than vaporware.

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

iD8DBQFG0vZxJdeBCYSNAAMRAv8NAKCgpRq3dhK+4jwrC8DpfcI+N+SbRwCfU73t
b8AE+k/sI88nn6SJzbUxhL0=
=H8ST
-----END PGP SIGNATURE-----