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

List:       kde-commits
Subject:    [kdevplatform/1.5] plugins/git: Use only the path to the current file
From:       eli mackenzie <argonel () gmail ! com>
Date:       2013-01-31 21:57:29
Message-ID: 20130131215729.BDF1AA60C8 () git ! kde ! org
[Download RAW message or body]

Git commit 837ae2715a37eda62fb0b89d9bc62142016ae259 by eli mackenzie.
Committed on 31/01/2013 at 18:05.
Pushed by argonel into branch '1.5'.

Use only the path to the current file

The context menu sends the complete URL of the file, which is not
a directory as far as QDir is concerned. This caused the revision
graph to fail to load in my testing.

REVIEW: 108690

M  +2    -2    plugins/git/gitplugin.cpp
M  +1    -1    plugins/git/gitplugin.h

http://commits.kde.org/kdevplatform/837ae2715a37eda62fb0b89d9bc62142016ae259

diff --git a/plugins/git/gitplugin.cpp b/plugins/git/gitplugin.cpp
index f1f9baf..d3c0412 100644
--- a/plugins/git/gitplugin.cpp
+++ b/plugins/git/gitplugin.cpp
@@ -1152,9 +1152,9 @@ DVcsJob* GitPlugin::gitRevParse(const QString &repository, const QStringList &ar
     return job;
 }
 
-DVcsJob* GitPlugin::gitRevList(const QString &repository, const QStringList &args)
+DVcsJob* GitPlugin::gitRevList(const QString& directory, const QStringList& args)
 {
-    DVcsJob* job = new DVcsJob(QDir(repository), this, KDevelop::OutputJob::Silent);
+    DVcsJob* job = new DVcsJob(urlDir(directory), this, KDevelop::OutputJob::Silent);
     {
         *job << "git" << "rev-list" << args;
         return job;
diff --git a/plugins/git/gitplugin.h b/plugins/git/gitplugin.h
index 1d13c5c..5d570f9 100644
--- a/plugins/git/gitplugin.h
+++ b/plugins/git/gitplugin.h
@@ -148,7 +148,7 @@ protected:
     KDevelop::DVcsJob* lsFiles(const QDir &repository,
                      const QStringList &args,
                      KDevelop::OutputJob::OutputJobVerbosity verbosity = KDevelop::OutputJob::Verbose);
-    KDevelop::DVcsJob* gitRevList(const QString &repository,
+    KDevelop::DVcsJob* gitRevList(const QString &directory,
                         const QStringList &args);
     KDevelop::DVcsJob* gitRevParse(const QString &repository,
                          const QStringList &args,
[prev in list] [next in list] [prev in thread] [next in thread]