From kde-commits  Sat Nov 22 15:15:34 2008
From: Robert Gruber <rgruber () users ! sourceforge ! net>
Date: Sat, 22 Nov 2008 15:15:34 +0000
To: kde-commits
Subject: KDE/kdevplatform/plugins/cvs
Message-Id: <1227366934.758122.5142.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=122736700112224

SVN commit 887681 by rgruber:

Implemented CvsDiffJob class which provides functionality
for the vcscommon plugin


 M  +1 -2      CMakeLists.txt  
 A             cvsdiffjob.cpp   [License: GPL (v2+)]
 A             cvsdiffjob.h   [License: GPL (v2+)]
 M  +2 -0      cvsjob.cpp  
 M  +1 -2      cvsplugin.cpp  
 M  +5 -2      cvsproxy.cpp  
 D             diffoptionsdialog.cpp  
 D             diffoptionsdialog.h  
 D             diffoptionsdialog.ui  
 M  +9 -2      tests/CMakeLists.txt  


--- trunk/KDE/kdevplatform/plugins/cvs/CMakeLists.txt #887680:887681
@@ -12,7 +12,6 @@
     cvsgenericoutputview.cpp
     cvsjob.cpp
     cvsproxy.cpp
-    diffoptionsdialog.cpp
     editorsview.cpp
     commitdialog.cpp
     updateoptionsdialog.cpp
@@ -21,13 +20,13 @@
     checkoutdialog.cpp
     cvsannotatejob.cpp
     cvslogjob.cpp
+    cvsdiffjob.cpp
     cvsstatusjob.cpp
 )
 
 set(kdevcvs_PART_UI
     cvsmainview.ui
     cvsgenericoutputview.ui
-    diffoptionsdialog.ui
     editorsview.ui
     commitdialog.ui
     updateoptionsdialog.ui
--- trunk/KDE/kdevplatform/plugins/cvs/cvsjob.cpp #887680:887681
@@ -198,6 +198,8 @@
 
     d->isRunning = false;
 
+    kDebug(9500) << "proc exited with code "<< exitCode;
+
     if (exitStatus != QProcess::NormalExit || exitCode != 0) {
         setError( exitCode );
         setErrorText( i18n("Process exited with status %1", exitCode) );
--- trunk/KDE/kdevplatform/plugins/cvs/cvsplugin.cpp #887680:887681
@@ -38,7 +38,6 @@
 #include "cvsmainview.h"
 #include "cvsproxy.h"
 #include "cvsjob.h"
-#include "diffoptionsdialog.h"
 #include "editorsview.h"
 #include "commitdialog.h"
 #include "updateoptionsdialog.h"
@@ -429,7 +428,7 @@
 
 KDevelop::VcsJob * CvsPlugin::diff(const KDevelop::VcsLocation & localOrRepoLocationSrc, const KDevelop::VcsLocation & localOrRepoLocationDst, const KDevelop::VcsRevision & srcRevision, const KDevelop::VcsRevision & dstRevision, KDevelop::VcsDiff::Type, KDevelop::IBasicVersionControl::RecursionMode )
 {
-    CvsJob* job = d->m_proxy->diff (localOrRepoLocationSrc.localUrl(), srcRevision, dstRevision, "");
+    CvsJob* job = d->m_proxy->diff (localOrRepoLocationSrc.localUrl(), srcRevision, dstRevision, "-u"/*always unified*/);
     return job;
 }
 
--- trunk/KDE/kdevplatform/plugins/cvs/cvsproxy.cpp #887680:887681
@@ -23,6 +23,7 @@
 #include "cvsannotatejob.h"
 #include "cvslogjob.h"
 #include "cvsstatusjob.h"
+#include "cvsdiffjob.h"
 
 #include <interfaces/iplugin.h>
 
@@ -177,7 +178,7 @@
 {
     QFileInfo info(url.toLocalFile());
 
-    CvsJob* job = new CvsJob(vcsplugin);
+    CvsDiffJob* job = new CvsDiffJob(vcsplugin);
     if ( prepareJob(job, info.absolutePath()) ) {
         *job << "cvs";
         *job << "diff";
@@ -204,7 +205,9 @@
         if (!rB.isEmpty())
             *job << rB;
 
-        *job << KShell::quoteArg(info.fileName());
+        // in case the KUrl is a directory there is no filename
+        if (!info.fileName().isEmpty())
+            *job << KShell::quoteArg(info.fileName());
 
         return job;
     }
--- trunk/KDE/kdevplatform/plugins/cvs/tests/CMakeLists.txt #887680:887681
@@ -24,8 +24,15 @@
 		${CMAKE_SOURCE_DIR}/vcs
 		${CMAKE_SOURCE_DIR}/plugins/cvs
 	)
-        set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
-	set(cvstest_SRCS cvstest.cpp ../cvsjob.cpp ../cvsproxy.cpp ../cvsannotatejob.cpp ../cvslogjob.cpp ../cvsstatusjob.cpp)
+    set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
+	set(cvstest_SRCS cvstest.cpp
+        ../cvsjob.cpp
+        ../cvsproxy.cpp
+        ../cvsannotatejob.cpp
+        ../cvslogjob.cpp
+        ../cvsstatusjob.cpp
+        ../cvsdiffjob.cpp
+    )
 	kde4_add_unit_test(kdevcvs-test ${cvstest_SRCS})
 	target_link_libraries(kdevcvs-test
 		${QT_QTTEST_LIBRARY}