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

BranchView: Reuse TaskTreeRunner

Browse Source 
Change-Id: I86b7d799c7dc5cd941e1159caff8e630ad0fdd46
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:46:05 +01:00
parent e4866a1667
commit 9c85062432
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/branchview.cpp
View File

@@ -16,6 +16,8 @@
#include <coreplugin/documentmanager.h> #include <coreplugin/documentmanager.h>
#include <coreplugin/inavigationwidgetfactory.h> #include <coreplugin/inavigationwidgetfactory.h>
#include <solutions/tasking/tasktreerunner.h>
#include <utils/elidinglabel.h> #include <utils/elidinglabel.h>
#include <utils/fancylineedit.h> #include <utils/fancylineedit.h>
#include <utils/navigationtreeview.h> #include <utils/navigationtreeview.h>
@@ -229,7 +231,7 @@ void BranchView::slotCustomContextMenu(const QPoint &point)
const bool isTag = m_model->isTag(index); const bool isTag = m_model->isTag(index);
const bool hasActions = m_model->isLeaf(index); const bool hasActions = m_model->isLeaf(index);
const bool currentLocal = m_model->isLocal(currentBranch); const bool currentLocal = m_model->isLocal(currentBranch);
std::unique_ptr<TaskTree> taskTree; TaskTreeRunner taskTreeRunner;
QAction *mergeAction = nullptr; QAction *mergeAction = nullptr;
SetInContext block(m_blockRefresh); SetInContext block(m_blockRefresh);
@@ -277,16 +279,15 @@ void BranchView::slotCustomContextMenu(const QPoint &point)
.arg(indexName, currentName), .arg(indexName, currentName),
this, this,
[this] { merge(false); }); [this] { merge(false); });
taskTree.reset(new TaskTree(fastForwardMergeRecipe([&] { taskTreeRunner.start(fastForwardMergeRecipe([&] {
auto ffMerge = new QAction( auto ffMerge = new QAction(
Tr::tr("&Merge \"%1\" into \"%2\" (Fast-Forward)").arg(indexName, currentName)); Tr::tr("&Merge \"%1\" into \"%2\" (Fast-Forward)").arg(indexName, currentName));
connect(ffMerge, &QAction::triggered, this, [this] { merge(true); }); connect(ffMerge, &QAction::triggered, this, [this] { merge(true); });
contextMenu.insertAction(mergeAction, ffMerge); contextMenu.insertAction(mergeAction, ffMerge);
mergeAction->setText(Tr::tr("Merge \"%1\" into \"%2\" (No &Fast-Forward)") mergeAction->setText(Tr::tr("Merge \"%1\" into \"%2\" (No &Fast-Forward)")
.arg(indexName, currentName)); .arg(indexName, currentName));
}))); }));
taskTree->start(); connect(mergeAction, &QObject::destroyed, &taskTreeRunner, &TaskTreeRunner::reset);
connect(mergeAction, &QObject::destroyed, taskTree.get(), &TaskTree::stop);
contextMenu.addAction(Tr::tr("&Rebase \"%1\" on \"%2\"") contextMenu.addAction(Tr::tr("&Rebase \"%1\" on \"%2\"")
.arg(currentName, indexName), .arg(currentName, indexName),