[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kdevelop-bugs
Subject:    [Bug 146114] Perforce VCS diff not compatible with KomparePart
From:       Andreas Pakulat <apaku () gmx ! de>
Date:       2007-05-29 16:01:42
Message-ID: 20070529160142.2927.qmail () ktown ! kde ! org
[Download RAW message or body]

------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.
         
http://bugs.kde.org/show_bug.cgi?id=146114         
apaku gmx de changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|UNCONFIRMED                 |RESOLVED
         Resolution|                            |FIXED



------- Additional Comments From apaku gmx de  2007-05-29 18:01 -------
SVN commit 669534 by apaku:

Apply Patch from Paul Fee to let p4 create a unified diff.
 Paul: Sorry, didn't see that you added a patch before sending my first reply..
BUG:146114


 M  +3 -2      perforcepart.cpp  
 M  +4 -3      perforcepart.h  


--- branches/KDE/3.5/kdevelop/vcs/perforce/perforcepart.cpp #669533:669534
 @ -240,6 +240,7  @
     QStringList args;
 
     args << "diff";
+    args << "-du";
     args << name;
     ExecCommand* cmv = new ExecCommand( "p4", args, QString::null, QStringList(), this );
     connect( cmv, SIGNAL(finished( const QString&, const QString& )),
 @ -271,10 +272,10  @
     }
 
     // strip the ==== headers
-    static QRegExp rx( "(^|\\n)====.*====\\n" );
+    static QRegExp rx( "(^|\\n)==== ([^ ]+) -.*====\\n" );
     rx.setMinimal( true );
     QString strippedDiff = diff;
-    strippedDiff.replace( rx, QString::null );
+    strippedDiff.replace( rx, "--- \\2\n+++ \\2\n" );
 
     if (KDevDiffFrontend *diffFrontend = extension<KDevDiffFrontend>("KDevelop/DiffFrontend"))
         diffFrontend->showDiff( strippedDiff );
--- branches/KDE/3.5/kdevelop/vcs/perforce/perforcepart.h #669533:669534
 @ -31,11 +31,12  @
     virtual QString shortDescription() const
     { return i18n( "Perforce is a version control system" ); }
 
-    virtual void createNewProject(const QString& dir) {}
+    virtual void createNewProject(const QString& /* dir */) {}
     virtual bool fetchFromRepository() { return true; }
     virtual KDevVCSFileInfoProvider *fileInfoProvider() const { return 0; }
-    virtual bool isValidDirectory(const QString &dirPath) const { return true; }
-    
+    virtual bool isValidDirectory(const QString& /* dirPath*/) const
+    { return true; }
+
 private slots:
     void contextMenu(QPopupMenu *popup, const Context *context);
     void slotCommit();


[prev in list] [next in list] [prev in thread] [next in thread]