From 96a09204403e22010d003bb3a18dc8464d257d96 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Thu, 6 Jun 2013 09:04:41 +0300 Subject: [PATCH] Git: Use file directory as editor source for files opened inside git dir * git rev-parse --show-toplevel doesn't work inside git dir. * Only "Describe (show)" should be available for those files. show works when running from inside the git dir Change-Id: If5f3d1af8da2f8d149ac1e03ffd70b530e609557 Reviewed-by: Petar Perisin Reviewed-by: Tobias Hunger --- src/plugins/git/gitclient.cpp | 13 ------------- src/plugins/git/gitclient.h | 1 - src/plugins/git/giteditor.cpp | 2 +- 3 files changed, 1 insertion(+), 15 deletions(-) diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index 75e36aaed99..dabe5716883 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -797,19 +797,6 @@ QString GitClient::findGitDirForRepository(const QString &repositoryDir) const return res; } -QString GitClient::findRepositoryForGitDir(const QString &gitDir) const -{ - static QHash gitDirCache; - QString &res = gitDirCache[gitDir]; - if (!res.isEmpty()) - return res; - QByteArray outputText; - QStringList arguments; - arguments << QLatin1String("rev-parse") << QLatin1String("--show-toplevel"); - fullySynchronousGit(gitDir, arguments, &outputText, 0, false); - return QString::fromLocal8Bit(outputText.trimmed()); -} - VcsBase::VcsBaseEditorWidget *GitClient::findExistingVCSEditor(const char *registerDynamicProperty, const QString &dynamicPropertyValue) const { diff --git a/src/plugins/git/gitclient.h b/src/plugins/git/gitclient.h index 9cfc17773a8..46b19e2ec09 100644 --- a/src/plugins/git/gitclient.h +++ b/src/plugins/git/gitclient.h @@ -136,7 +136,6 @@ public: QString findRepositoryForDirectory(const QString &dir); QString findGitDirForRepository(const QString &repositoryDir) const; - QString findRepositoryForGitDir(const QString &gitDir) const; void diff(const QString &workingDirectory, const QStringList &diffArgs, const QString &fileName); void diff(const QString &workingDirectory, const QStringList &diffArgs, diff --git a/src/plugins/git/giteditor.cpp b/src/plugins/git/giteditor.cpp index abd3bef64e7..d8f6de88e47 100644 --- a/src/plugins/git/giteditor.cpp +++ b/src/plugins/git/giteditor.cpp @@ -246,7 +246,7 @@ bool GitEditor::open(QString *errorString, const QString &fileName, const QStrin if (editorId == Git::Constants::GIT_COMMIT_TEXT_EDITOR_ID || editorId == Git::Constants::GIT_REBASE_EDITOR_ID) { QFileInfo fi(fileName); - setSource(GitPlugin::instance()->gitClient()->findRepositoryForGitDir(fi.absolutePath())); + setSource(fi.absolutePath()); } return res; }