CVS: Use new VCSBasePlugin-class.

Make the diff-base directory a property of VCSBaseEditor and use
everywhere.

src/plugins/git/gitclient.cpp

@@ -196,6 +196,7 @@ void GitClient::diff(const QString &workingDirectory,
     const QString title = tr("Git Diff");
 
     VCSBase::VCSBaseEditor *editor = createVCSEditor(kind, title, workingDirectory, true, "originalFileName", workingDirectory);
+    editor->setDiffBaseDirectory(workingDirectory);
 
     // Create a batch of 2 commands to be run after each other in case
     // we have a mixture of staged/unstaged files as is the case

src/plugins/git/giteditor.cpp

@@ -30,9 +30,9 @@
 #include "giteditor.h"
 
 #include "annotationhighlighter.h"
-#include "gitclient.h"
 #include "gitconstants.h"
 #include "gitplugin.h"
+#include "gitsettings.h"
 #include <QtCore/QTextCodec>
 
 #include <coreplugin/editormanager/editormanager.h>
@@ -122,21 +122,14 @@ VCSBase::BaseAnnotationHighlighter *GitEditor::createAnnotationHighlighter(const
 
 QString GitEditor::fileNameFromDiffSpecification(const QTextBlock &inBlock) const
 {
-    QString errorMessage;
-    // Check for "+++ b/src/plugins/git/giteditor.cpp" (blame and diff)
+        // Check for "+++ b/src/plugins/git/giteditor.cpp" (blame and diff)
     // Go back chunks.
     const QString newFileIndicator = QLatin1String("+++ b/");
     for (QTextBlock  block = inBlock; block.isValid(); block = block.previous()) {
         QString diffFileName = block.text();
         if (diffFileName.startsWith(newFileIndicator)) {
             diffFileName.remove(0, newFileIndicator.size());
-            const QString fileOrDir = source();
-            const QString repo = QFileInfo(fileOrDir).isDir() ?
-                GitClient::findRepositoryForDirectory(fileOrDir) : GitClient::findRepositoryForFile(fileOrDir);
-            const QString absPath = QDir(repo).absoluteFilePath(diffFileName);
-            if (Git::Constants::debug)
-                qDebug() << "fileNameFromDiffSpecification" << repo << diffFileName << absPath;
-            return absPath;
+            return findDiffFile(diffFileName, GitPlugin::instance()->versionControl());
         }
     }
     return QString();
@@ -195,3 +188,4 @@ void GitEditor::commandFinishedGotoLine(bool ok, const QVariant &v)
 
 } // namespace Internal
 } // namespace Git
+