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

Change asserts() to soft-asserts in Vcs-Cache.

Browse Source 
- Prevent crash when creating a project.
- Use QDir to normalize the path (as it is constrcuted in
  the assert anyway).
- Print proper warnings.

Change-Id: Ib6fa3c564aff20b73d6efc08ca3a13688fd97dce
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
Friedemann Kleint
2012-01-12 08:55:57 +01:00
committed by hjk
parent 92cc5146d3
commit b82475b0e9
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -110,12 +110,13 @@ public:
return result;
}
void resetCache(const QString &dir)
void resetCache(const QString &dirIn)
{
Q_ASSERT(QDir(dir).isAbsolute());
Q_ASSERT(!dir.endsWith(QLatin1Char('/')));
Q_ASSERT(QDir::fromNativeSeparators(dir) == dir);
const QDir qDir = QDir(dirIn);
QTC_ASSERT(qDir.exists(), qWarning("%s: '%s' does not exist.",
Q_FUNC_INFO, qPrintable(dirIn));
return; )
const QString dir = qDir.absolutePath();
const QString dirSlash = dir + QLatin1Char('/');
foreach (const QString &key, m_cachedMatches.keys()) {
if (key == dir || key.startsWith(dirSlash))
@@ -123,13 +124,16 @@ public:
}
}
void cache(IVersionControl *vc, const QString topLevel, const QString dir)
void cache(IVersionControl *vc, const QString &topLevel, const QString &dirIn)
{
Q_ASSERT(QDir(dir).isAbsolute());
Q_ASSERT(!dir.endsWith(QLatin1Char('/')));
Q_ASSERT(QDir::fromNativeSeparators(dir) == dir);
Q_ASSERT(dir.startsWith(topLevel));
const QDir qDir(dirIn);
QTC_ASSERT(qDir.exists(), qWarning("%s: '%s' does not exist.",
Q_FUNC_INFO, qPrintable(dirIn));
return; )
const QString dir = qDir.absolutePath();
QTC_ASSERT(dir.startsWith(topLevel), qWarning("%s: '%s' does not start with '%s'.",
Q_FUNC_INFO, qPrintable(dir), qPrintable(topLevel));
return; )
VcsInfo *newInfo = new VcsInfo(vc, topLevel);
bool createdNewInfo(true);
// Do we have a matching VcsInfo already?