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

Git: speed up findRepositoryForDirectory

Browse Source 
Change-Id: I50ccb0f6e0e70f463e45feaea8237c434f5f76c4
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Petar Perisin
2013-03-09 20:58:39 +01:00
parent be36343950
commit c4ac55cc72
1 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -367,25 +367,20 @@ QString GitClient::findRepositoryForDirectory(const QString &dir)
{ {
if (dir.endsWith(QLatin1String("/.git")) || dir.contains(QLatin1String("/.git/"))) if (dir.endsWith(QLatin1String("/.git")) || dir.contains(QLatin1String("/.git/")))
return QString(); return QString();
// Find a directory to run git in:
const QString root = QDir::rootPath();
const QString home = QDir::homePath();
QDir directory(dir); QDir directory(dir);
QString dotGit = QLatin1String(GIT_DIRECTORY);
// QFileInfo is outside loop, because it is faster this way
QFileInfo fileInfo;
do { do {
const QString absDirPath = directory.absolutePath(); if (directory.exists(dotGit)) {
if (absDirPath == root || absDirPath == home) fileInfo.setFile(directory, dotGit);
break; if (fileInfo.isFile())
return directory.absolutePath();
if (directory.exists()) else if (directory.exists(QLatin1String(".git/config")))
break; return directory.absolutePath();
}
} while (directory.cdUp()); } while (directory.cdUp());
return QString();
QByteArray outputText;
QStringList arguments;
arguments << QLatin1String("rev-parse") << QLatin1String("--show-toplevel");
fullySynchronousGit(directory.absolutePath(), arguments, &outputText, 0, false);
return QString::fromLocal8Bit(outputText.trimmed());
} }
QString GitClient::findGitDirForRepository(const QString &repositoryDir) QString GitClient::findGitDirForRepository(const QString &repositoryDir)