Compare directories?

[Roman Polach]

Diffuse looks good!
Any plans to make directory tree comparison mode?
( like in Meld http://meld.sourceforge.net/
or in BeyondCompare http://www.scootersoftware.com/moreinfo.php )

[Derrick Moser]

Yes, directory comparision is on my to-do list.

Cheers,
Derrick

[Prashant Sharma]

[Derrick Moser]

Yes, directory comparison is on my to-do list?

Cheers,
Derrick

[Leo]

+1. I like the tool very much for it being able to directly use my .git revisions. But directory comparison would be a killer feature, e.g. for doing a 3-way or even N-way diff AFTER a git merge...

Just a thought: To navigate the tree of files, rather than switching forth and back (depth first?) between files, an explorer-like side-panel would be nice/necessary. But for navigating a repository, files might be added or deleted in one of the revisions, so the tree would have to eventually support the union of all trees of all revisions touched...

I'm a python noob and was looking into the code and am a bit frightened about that single file of 8500 lines... Well, I did only look into the code for 5 minutes now... I'll try to figure it out.
On my wishlist would be a better structuring of the application into multiple files, so potential contributors find their way around easier and commits/changes are less likely to conflict.

[Leo]

workaround for git:

.gitconfig

[diff]  
  tool = diffuse
[difftool "diffuse"]  
    cmd = <installationdir>/Diffuse/diffusew.exe $LOCAL $REMOTE $MERGED
    prompt = false

then issue:

git difftool  <commit>  <commit>

[Leo]

Here is a quick patch, that adds a --recursive <directory> option.
Usage:</directory>

diffuse { -r <rev> } -D -s --recursive <directory_under_revision_control></directory_under_revision_control></rev>

It will open a tab for each file, comparing the specified revisions. This is particularly useful to have a 3-way diff of a (completed) merge.

Does this patch break other modes, or comparison of revision agains filesystem? Feel free to modify and integrate it.
(patch against diffuse, commit 420)