feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Git: Use file directory as editor source for files opened inside git dir

Browse Source 
* 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 <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2013-06-06 09:04:41 +03:00
committed by Orgad Shaneh
parent 879012a50b
commit 96a0920440
3 changed files with 1 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/git/gitclient.cpp
View File

@@ -797,19 +797,6 @@ QString GitClient::findGitDirForRepository(const QString &repositoryDir) const
return res; return res;
} }
QString GitClient::findRepositoryForGitDir(const QString &gitDir) const
{
static QHash<QString, QString> 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, VcsBase::VcsBaseEditorWidget *GitClient::findExistingVCSEditor(const char *registerDynamicProperty,
const QString &dynamicPropertyValue) const const QString &dynamicPropertyValue) const
{ {

1
src/plugins/git/gitclient.h
View File

@@ -136,7 +136,6 @@ public:
QString findRepositoryForDirectory(const QString &dir); QString findRepositoryForDirectory(const QString &dir);
QString findGitDirForRepository(const QString &repositoryDir) const; 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, const QString &fileName);
void diff(const QString &workingDirectory, const QStringList &diffArgs, void diff(const QString &workingDirectory, const QStringList &diffArgs,

2
src/plugins/git/giteditor.cpp
View File

@@ -246,7 +246,7 @@ bool GitEditor::open(QString *errorString, const QString &fileName, const QStrin
if (editorId == Git::Constants::GIT_COMMIT_TEXT_EDITOR_ID if (editorId == Git::Constants::GIT_COMMIT_TEXT_EDITOR_ID
|| editorId == Git::Constants::GIT_REBASE_EDITOR_ID) { || editorId == Git::Constants::GIT_REBASE_EDITOR_ID) {
QFileInfo fi(fileName); QFileInfo fi(fileName);
setSource(GitPlugin::instance()->gitClient()->findRepositoryForGitDir(fi.absolutePath())); setSource(fi.absolutePath());
} }
return res; return res;
} }