From kde-commits  Sun Jun 08 16:01:31 2003
From: Mario Scalas <mario.scalas () libero ! it>
Date: Sun, 08 Jun 2003 16:01:31 +0000
To: kde-commits
Subject: kdevelop/parts/cvs
X-MARC-Message: https://marc.info/?l=kde-commits&m=105508809824302

CVS commit by marios: 

Fix for false reporting of diff cancelled while instead there is no differences in the repository


  M +5 -6      cvspart.cpp   1.43
  M +2 -2      cvspart.h   1.19


--- kdevelop/parts/cvs/cvspart.h  #1.18:1.19
@@ -103,6 +103,6 @@ private:
         // (if not, returns false since it avoid performing CVS operation)
         bool isRegisteredInRepository();
-        // Display "cvs diff" results in the diff part.
-        void diffFinished( const QString& diff, const QString& err );
+        // Display "cvs diff" results in the diff part (embedded views).
+        void diffFinished( const QString& diff, const QString& err, const int processExitCode = 0 );
         // Call this every time a slot for cvs operations starts!! (It will setup the
         // state (file/dir URL, ...).

--- kdevelop/parts/cvs/cvspart.cpp  #1.42:1.43
@@ -282,7 +282,8 @@ bool CvsPart::isRegisteredInRepository()
 ///////////////////////////////////////////////////////////////////////////////
 
-void CvsPart::diffFinished( const QString& diff, const QString& err )
+void CvsPart::diffFinished( const QString& diff, const QString& err, const int processExitCode )
 {
-    if (diff.isNull() && err.isNull() )
+//    if (diff.isNull() && err.isNull() )
+        if (processExitCode)
         {
         kdDebug(9000) << "cvs diff cancelled" << endl;
@@ -698,8 +699,6 @@ void CvsPart::projectConfigWidget( KDial
 QWidget* CvsPart::newProjectWidget( QWidget *parent )
 {
-        if (!form)
-        {
-                form = new CvsForm( parent );
-        }
+        form = new CvsForm( parent, "cvsform" );
+
         return form;
 }