Standard difference viewer

[Andreas Pakulat]

On 25.07.07 02:43:44, dukju ahn wrote:
> 2007/7/20, Andreas Pakulat <apaku at gmx.de>:
> > On 20.07.07 12:36:37, dukju ahn wrote:
> > > 2007/7/20, Andreas Pakulat <apaku at gmx.de>:
> > > > On 20.07.07 11:46:20, dukju ahn wrote:
> > > > > Currently subversion plugin prints "svn diff" via plain text. I'd
> > > > > like to provide option to use external diff viewer such as kompare.
> > > > > The problem is that, kompare seems to be unmaintained. I tried
> > > > > kdiff3 but it seems that it doesn't have any feature to display
> > > > > already generated .diff file.( it just create .diff from multiples of file)
> > > > >
> > > > > What could be the best difference viewer for vcs diff viewer?
> > > >
> > > > I'm not aware of any other diff viewers. The question is: What exactly
> > > > should a diff viewer do? Just display the diff with some jump
> > > > forward/backward using some highlighting? That should be easily doable
> > > > with kate.
> > > >
> > > > Or what else do you have in mind?
> > >
> > > Yes. I meant the picture at
> > > http://www.caffeinated.me.uk/kompare/
> > >
> > > Kate can't do that right?
> >
> > No, then I misunderstood you. I thought you just wanted to display a
> > unified diff, but you actually want to display the differences between
> > old and new version of a file (wether old comes from svn repo or not).
> 
> Oops, sorry. I should have been more clear.
> I meant the unified diff, since vcs programs only offers unified diffs.

Thats wrong, you can ask the VCS to produce a full copy of pre and post
version of the file.

> The point was that I need graphical displayer as seen in the picture.

Right.

> > I suggest to look into the 3way-kompare branch, thats mentioned on that
> > page and talk to the author wether he wants to make the diff-algorithm
> > and the widget into a shared library (or even kpart). That would allow
> > us to use it directly, else I think we need to either copy the code or
> > re-implement a 3-way-diff/merge widget. We need one in the vcs library
> > for the merge() stuff.
> 
> Do we really need kparts or .so for these program? Why don't we
> just run them with KProcess? After all diff output is so long that
> dockwidget is not enough to display them. Only full screen is meaningful.

Who exactly said this should be in a dockwidget? Such a graphical
display needs to be in the editor part. Also we need a good interaction
with the difference-viewer because we want to be able to know when a
3-merge-diff (due to a conflict) was resolved. I still think we might
need our own diff-widget implementation, but we surely can't work
with plain execution of an external program. That works for viewing a
diff, but we want to have interactivity with the diff-viewer.

Andreas

-- 
You recoil from the crude; you tend naturally toward the exquisite.