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

VCS: Work with canonical paths when looking for toplevel directories

Browse Source 
Change-Id: I2b2f3f76f04af298dcc6f38e1c5f1dd4555e2024
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Tobias Hunger
2012-10-17 15:46:54 +02:00
parent a1e3a5de9e
commit 8c980f5a4e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/coreplugin/vcsmanager.cpp
View File

@@ -209,7 +209,7 @@ IVersionControl* VcsManager::findVersionControlForDirectory(const QString &input
return 0; return 0;
// Make sure we a clean absolute path: // Make sure we a clean absolute path:
const QString directory = QDir(inputDirectory).absolutePath(); const QString directory = QDir(inputDirectory).canonicalPath();
VcsManagerPrivate::VcsInfo *cachedData = d->findInCache(directory); VcsManagerPrivate::VcsInfo *cachedData = d->findInCache(directory);
if (cachedData) { if (cachedData) {
@@ -242,7 +242,7 @@ IVersionControl* VcsManager::findVersionControlForDirectory(const QString &input
} }
// Register Vcs(s) with the cache // Register Vcs(s) with the cache
QString tmpDir = directory; QString tmpDir = QFileInfo(directory).canonicalFilePath();
const QChar slash = QLatin1Char('/'); const QChar slash = QLatin1Char('/');
const StringVersionControlPairs::const_iterator cend = allThatCanManage.constEnd(); const StringVersionControlPairs::const_iterator cend = allThatCanManage.constEnd();
for (StringVersionControlPairs::const_iterator i = allThatCanManage.constBegin(); i != cend; ++i) { for (StringVersionControlPairs::const_iterator i = allThatCanManage.constBegin(); i != cend; ++i) {