Review Request: Kompare integration in KDevelop to review patches and vcs differences

Aleix Pol aleixpol at kde.org
Sat Aug 15 17:30:47 UTC 2009


-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
http://reviewboard.kde.org/r/1284/
-----------------------------------------------------------

(Updated 2009-08-15 17:30:47.536654)


Review request for KDevelop.


Changes
-------

Made it compile against 4.3 (without kompare).

Changed URL scheme to kdevpatch

I'll commit later if there are no objections. Further work should be done in trunk, IMO.


Summary
-------

This adds a new PatchDocument and a IPatchDocument interface that lets us work with patches integrating them using the Kompare part.

It adapts that to the Vcs support so that we can review local changes. (not complete support of all the VcsDiff cases)

There is more work to do still, but I wanted you to see what's been worked one and to criticize it if needed. Now when you compare to base you're moved to the Test area (which should be renamed to Review area, imho) and opens there all the different files. One document per changed file.

The compilation when the KomparePart is not installed is not really sorted out yet, I'll add that on a next version of the patch.

Some work will be needed on the KomparePart as well. Now when we compare a file with a string, Kompare assumes the new one is the string and in our case it's not (it's the string that comes from the VCS support).

We should make it possible to specify the base directory when working with 1 patch.


Diffs (updated)
-----

  trunk/KDE/kdevplatform/interfaces/idocumentcontroller.h 1011711 
  trunk/KDE/kdevplatform/interfaces/ipatchdocument.h PRE-CREATION 
  trunk/KDE/kdevplatform/shell/CMakeLists.txt 1011711 
  trunk/KDE/kdevplatform/shell/documentcontroller.h 1011711 
  trunk/KDE/kdevplatform/shell/documentcontroller.cpp 1011711 
  trunk/KDE/kdevplatform/shell/kross/wrappers/krosstopducontext.cpp 1011711 
  trunk/KDE/kdevplatform/shell/partdocument.h 1011711 
  trunk/KDE/kdevplatform/shell/partdocument.cpp 1011711 
  trunk/KDE/kdevplatform/shell/patchdocument.h PRE-CREATION 
  trunk/KDE/kdevplatform/shell/patchdocument.cpp PRE-CREATION 
  trunk/KDE/kdevplatform/vcs/vcspluginhelper.h 1011711 
  trunk/KDE/kdevplatform/vcs/vcspluginhelper.cpp 1011711 

Diff: http://reviewboard.kde.org/r/1284/diff


Testing
-------


Thanks,

Aleix





More information about the KDevelop-devel mailing list