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

Git: Clear branches model when repository becomes empty

Browse Source 
Change-Id: I78932b342de5e1b29c75ed921d4d6afddf4d51da
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
Orgad Shaneh
2013-06-29 21:55:52 +03:00
committed by Orgad Shaneh
parent 49bad12787
commit 2103a4a96c
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/git/branchmodel.cpp
View File

@@ -74,7 +74,7 @@ public:
bool isLeaf() const bool isLeaf() const
{ {
return children.isEmpty(); return children.isEmpty() && parent && parent->parent;
} }
bool isTag() const bool isTag() const
@@ -331,8 +331,12 @@ void BranchModel::clear()
bool BranchModel::refresh(const QString &workingDirectory, QString *errorMessage) bool BranchModel::refresh(const QString &workingDirectory, QString *errorMessage)
{ {
if (workingDirectory.isEmpty()) beginResetModel();
clear();
if (workingDirectory.isEmpty()) {
endResetModel();
return false; return false;
}
m_currentSha = m_client->synchronousTopRevision(workingDirectory); m_currentSha = m_client->synchronousTopRevision(workingDirectory);
QStringList args; QStringList args;
@@ -341,9 +345,6 @@ bool BranchModel::refresh(const QString &workingDirectory, QString *errorMessage
if (!m_client->synchronousForEachRefCmd(workingDirectory, args, &output, errorMessage)) if (!m_client->synchronousForEachRefCmd(workingDirectory, args, &output, errorMessage))
VcsBase::VcsBaseOutputWindow::instance()->appendError(*errorMessage); VcsBase::VcsBaseOutputWindow::instance()->appendError(*errorMessage);
beginResetModel();
clear();
m_workingDirectory = workingDirectory; m_workingDirectory = workingDirectory;
const QStringList lines = output.split(QLatin1Char('\n')); const QStringList lines = output.split(QLatin1Char('\n'));
foreach (const QString &l, lines) foreach (const QString &l, lines)