Re: Diffing directories with external diff

"kaczoroj" <[email protected]> Sun, 26 Feb 2006 01:11:51 -0000
Newsgroups gmane.comp.version-control.cvs.gui.devel
Message-ID <[email protected]>
Kirill,

You can move the current "Don't recurse" checkbox above the "Use the 
external diff" checkbox. You can increase the height of dialog a 
little bit to make the room. 

I think if you put the "preview" files in their own view window it 
will be difficult to operate from dialog boxes like commit dialog. 

In fact if you feel ambitious we have discussed a concept of "basket"  
some time ago. The idea is to have a view of files that could be from 
different folders but otherwise would allow same commands as a current 
file view. It would be somewhat like a flat view (so no need for a 
folder tree). You could get the files in there by many different ways. 
You could just select some and copy-paste selection. Or you could run 
a "Query update" and files that need update would go there. Or the 
"diff --brief" output etc. 

To make it work for particular command we would just add a checkbox 
"Create basket" and feed files from query update or diff. 

I think it's best to have it as a flat view instead of folder view + 
file view because it's easier to group files from different folders. 
One can easily sort or filter by path to narrow view etc.

If you like the idea then create a flat file view with arbitrary files 
then make it working with your diff implementation. We can extend it 
later to accept files from different sources. It may be possible to 
use current flat view for that if modified a bit.

It is more work but it may be a really powerfull tool. At the very 
least diff and query update would be easier to use. If we then allowed 
to save the contents of such basket so it would persist between the 
session one could create a concept of project of some sort where you 
can group files for a particular fix or code review and work on then.

Now that I got myself going I have another big idea. To make a folder 
diff really fast and allow folder diff with different options it would 
be best to get the diff output and then copy affected files to temp 
folder and apply "patch" to it and then run an external diff. We used 
to have patch.exe in our distro long time ago but it was dropped. We 
could either re-introduce it or just copy some code out of it if it's 
not too much. This is by far most efficient way but also much more 
work.

Best Regards,
Jerzy






 
Yahoo! Groups Links

<*> To visit your group on the web, go to:
    http://groups.yahoo.com/group/cvsgui-dev/

<*> To unsubscribe from this group, send an email to:
    [email protected]

<*> Your use of Yahoo! Groups is subject to:
    http://docs.yahoo.com/info/terms/