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

VCS: Chop trailing slash for cache

Browse Source 
When the directory is root (on both Windows and Linux), it ends with a slash,
and yet it is valid (although unlikely to be managed by VCS).

Chop the slash to avoid soft assertions.

Change-Id: I0f206b5a7ee70e9c641ff872fa21662f9d92aab2
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
Orgad Shaneh
2016-02-15 23:11:14 +02:00
committed by Orgad Shaneh
parent 181f62c84a
commit caf2ca0a37
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -223,13 +223,20 @@ IVersionControl *VcsManager::versionControl(Id id)
return Utils::findOrDefault(versionControls(), Utils::equal(&Core::IVersionControl::id, id)); return Utils::findOrDefault(versionControls(), Utils::equal(&Core::IVersionControl::id, id));
} }
static QString absoluteWithNoTrailingSlash(const QString &directory)
{
QString res = QDir(directory).absolutePath();
if (res.endsWith(QLatin1Char('/')))
res.chop(1);
return res;
}
void VcsManager::resetVersionControlForDirectory(const QString &inputDirectory) void VcsManager::resetVersionControlForDirectory(const QString &inputDirectory)
{ {
if (inputDirectory.isEmpty()) if (inputDirectory.isEmpty())
return; return;
const QString directory = QDir(inputDirectory).absolutePath(); const QString directory = absoluteWithNoTrailingSlash(inputDirectory);
d->resetCache(directory); d->resetCache(directory);
emit m_instance->repositoryChanged(directory); emit m_instance->repositoryChanged(directory);
} }
@@ -246,7 +253,7 @@ IVersionControl* VcsManager::findVersionControlForDirectory(const QString &input
} }
// Make sure we an absolute path: // Make sure we an absolute path:
QString directory = QDir(inputDirectory).absolutePath(); QString directory = absoluteWithNoTrailingSlash(inputDirectory);
#ifdef WITH_TESTS #ifdef WITH_TESTS
if (directory[0].isLetter() && directory.indexOf(QLatin1Char(':') + QLatin1String(TEST_PREFIX)) == 1) if (directory[0].isLetter() && directory.indexOf(QLatin1Char(':') + QLatin1String(TEST_PREFIX)) == 1)
directory = directory.mid(2); directory = directory.mid(2);
@@ -284,7 +291,7 @@ IVersionControl* VcsManager::findVersionControlForDirectory(const QString &input
} }
// Register Vcs(s) with the cache // Register Vcs(s) with the cache
QString tmpDir = QFileInfo(directory).canonicalFilePath(); QString tmpDir = absoluteWithNoTrailingSlash(directory);
#if defined WITH_TESTS #if defined WITH_TESTS
// Force caching of test directories (even though they do not exist): // Force caching of test directories (even though they do not exist):
if (directory.startsWith(QLatin1String(TEST_PREFIX))) if (directory.startsWith(QLatin1String(TEST_PREFIX)))