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

BranchModel: Reuse TaskTreeRunner

Browse Source 
Change-Id: Idce8e4463e55b9361d85f460a44b7302bf20170f
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Jarek Kobus
2024-01-13 17:27:51 +01:00
parent e0c6ca656c
commit 2a1553bb9a
1 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,14 +7,16 @@
#include "gitconstants.h"
#include "gittr.h"
#include <vcsbase/vcscommand.h>
#include <vcsbase/vcsoutputwindow.h>
#include <solutions/tasking/tasktreerunner.h>
#include <utils/environment.h>
#include <utils/process.h>
#include <utils/qtcassert.h>
#include <utils/stringutils.h>
#include <vcsbase/vcscommand.h>
#include <vcsbase/vcsoutputwindow.h>
#include <QDateTime>
#include <QFont>
@@ -228,7 +230,7 @@ public:
QString currentSha;
QDateTime currentDateTime;
QStringList obsoleteLocalBranches;
std::unique_ptr<TaskTree> refreshTask;
TaskTreeRunner taskTreeRunner;
bool oldBranchesIncluded = false;
struct OldEntry
@@ -254,6 +256,7 @@ BranchModel::BranchModel(QObject *parent) :
// Abuse the sha field for ref prefix
d->rootNode->append(new BranchNode(Tr::tr("Local Branches"), "refs/heads"));
d->rootNode->append(new BranchNode(Tr::tr("Remote Branches"), "refs/remotes"));
connect(&d->taskTreeRunner, &TaskTreeRunner::done, this, &BranchModel::endResetModel);
}
BranchModel::~BranchModel()
@@ -402,9 +405,9 @@ void BranchModel::clear()
void BranchModel::refresh(const FilePath &workingDirectory, ShowError showError)
{
if (d->refreshTask) {
if (d->taskTreeRunner.isRunning()) {
endResetModel(); // for the running task tree.
d->refreshTask.reset(); // old running tree is reset, no handlers are being called
d->taskTreeRunner.reset(); // old running tree is reset, no handlers are being called
}
beginResetModel();
clear();
@@ -463,18 +466,11 @@ void BranchModel::refresh(const FilePath &workingDirectory, ShowError showError)
}
};
const auto finalize = [this] {
endResetModel();
d->refreshTask.release()->deleteLater();
};
const Group root {
topRevisionProc,
ProcessTask(onForEachRefSetup, onForEachRefDone),
onGroupDone(finalize)
ProcessTask(onForEachRefSetup, onForEachRefDone)
};
d->refreshTask.reset(new TaskTree(root));
d->refreshTask->start();
d->taskTreeRunner.start(root);
}
void BranchModel::setCurrentBranch()