[ANN][PLUGIN] extending diff with graphical tools

[John Arbash Meinel]

Stephen Ward wrote:
> Hi,
> 
> I've updated the plugin to disable recursive diff on VIM-derived tools, and to 
> use the working-tree (instead of a temp directory) in more cases, to 
> facilitate editing-in-place.  I also switched the check for empty diffs to 
> use bzrlib.deltas.compare_trees() instead of 'diff --recursive --brief', so 
> it is about 6X faster at finding out there's nothing to do.
> 
> The initialization for VIM-derived tools now looks like:
> 
>   register_diff_tool(DiffTool('gvim', diff_options='-f -d', recursive=False))
>   register_diff_tool(DiffTool('gvimdiff', diff_options='-f', recursive=False))
>   register_diff_tool(DiffTool('vim', diff_options='-d', recursive=False))
>   register_diff_tool(DiffTool('vimdiff', recursive=False))
> 
> There are probably still improvements to make in the handling of non-recursive 
> tools, but the basic mechanism is in place now.
> 
> -- Steve
> 
> 

That looks pretty nice. Of course now we would want to handle the case
where "if not recursive, look for differences and spawn the diff once
per each file". :)

That, and if you could add "register_diff_tool(DiffTool('mgdiff',
recursive=False))" for Erik.

John
=:->


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 254 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060501/124c2b1d/attachment.pgp