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

VcsManager: Fix soft assertion when directory is managed by 2 VCS

Browse Source 
In case 2 VCS manage the same directory, topLevel will be the same
for both. Chopping tmpDir gives a wrong directory for the second VC.

Change-Id: Ie20c716cf8b713dae0d5d8ecc4c947f1c5029544
Reviewed-by: Knut Petter Svendsen <knutpett@pvv.org>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2013-10-30 11:21:20 +02:00
committed by Orgad Shaneh
parent 0ec265259d
commit 0282b97c26
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -277,6 +277,9 @@ IVersionControl* VcsManager::findVersionControlForDirectory(const QString &input
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) {
// If topLevel was already cached for another VC, skip this one
if (tmpDir.count() < i->first.count())
continue;
d->cache(i->second, i->first, tmpDir); d->cache(i->second, i->first, tmpDir);
tmpDir = i->first; tmpDir = i->first;
const int slashPos = tmpDir.lastIndexOf(slash); const int slashPos = tmpDir.lastIndexOf(slash);