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

Gerrit: Support cancel in fetch context

Browse Source 
Task-number: QTCREATORBUG-9743
Change-Id: Idf77d1d4efa5accb1aa00f61f495a3813704c934
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
Orgad Shaneh
2015-02-04 23:59:50 +02:00
committed by Orgad Shaneh
parent c6ccb096d6
commit 10f36eada5
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/git/gerrit/gerritplugin.cpp
View File

@@ -67,6 +67,7 @@
#include <QTemporaryFile> #include <QTemporaryFile>
#include <QDir> #include <QDir>
#include <QMap> #include <QMap>
#include <QFutureWatcher>
using namespace Core; using namespace Core;
using namespace Git::Internal; using namespace Git::Internal;
@@ -126,6 +127,7 @@ private:
void show(); void show();
void cherryPick(); void cherryPick();
void checkout(); void checkout();
void terminate();
const QSharedPointer<GerritChange> m_change; const QSharedPointer<GerritChange> m_change;
const QString m_repository; const QString m_repository;
@@ -135,6 +137,7 @@ private:
State m_state; State m_state;
QProcess m_process; QProcess m_process;
QFutureInterface<void> m_progress; QFutureInterface<void> m_progress;
QFutureWatcher<void> m_watcher;
}; };
FetchContext::FetchContext(const QSharedPointer<GerritChange> &change, FetchContext::FetchContext(const QSharedPointer<GerritChange> &change,
@@ -157,6 +160,9 @@ FetchContext::FetchContext(const QSharedPointer<GerritChange> &change,
this, SLOT(processReadyReadStandardError())); this, SLOT(processReadyReadStandardError()));
connect(&m_process, SIGNAL(readyReadStandardOutput()), connect(&m_process, SIGNAL(readyReadStandardOutput()),
this, SLOT(processReadyReadStandardOutput())); this, SLOT(processReadyReadStandardOutput()));
connect(&m_watcher, &QFutureWatcher<void>::canceled,
this, &FetchContext::terminate);
m_watcher.setFuture(m_progress.future());
m_process.setWorkingDirectory(repository); m_process.setWorkingDirectory(repository);
m_process.setProcessEnvironment(gitClient()->processEnvironment()); m_process.setProcessEnvironment(gitClient()->processEnvironment());
m_process.closeWriteChannel(); m_process.closeWriteChannel();
@@ -167,7 +173,7 @@ FetchContext::~FetchContext()
if (m_progress.isRunning()) if (m_progress.isRunning())
m_progress.reportFinished(); m_progress.reportFinished();
m_process.disconnect(this); m_process.disconnect(this);
Utils::SynchronousProcess::stopProcess(m_process); terminate();
} }
void FetchContext::start() void FetchContext::start()
@@ -228,7 +234,8 @@ void FetchContext::processReadyReadStandardOutput()
void FetchContext::handleError(const QString &e) void FetchContext::handleError(const QString &e)
{ {
m_state = ErrorState; m_state = ErrorState;
VcsBase::VcsOutputWindow::appendError(e); if (!m_progress.isCanceled())
VcsBase::VcsOutputWindow::appendError(e);
m_progress.reportCanceled(); m_progress.reportCanceled();
m_progress.reportFinished(); m_progress.reportFinished();
deleteLater(); deleteLater();
@@ -236,6 +243,8 @@ void FetchContext::handleError(const QString &e)
void FetchContext::processError(QProcess::ProcessError e) void FetchContext::processError(QProcess::ProcessError e)
{ {
if (m_progress.isCanceled())
return;
const QString msg = tr("Error running %1: %2").arg(m_git.toUserOutput(), m_process.errorString()); const QString msg = tr("Error running %1: %2").arg(m_git.toUserOutput(), m_process.errorString());
if (e == QProcess::FailedToStart) if (e == QProcess::FailedToStart)
handleError(msg); handleError(msg);
@@ -263,6 +272,11 @@ void FetchContext::checkout()
gitClient()->stashAndCheckout(m_repository, QLatin1String("FETCH_HEAD")); gitClient()->stashAndCheckout(m_repository, QLatin1String("FETCH_HEAD"));
} }
void FetchContext::terminate()
{
Utils::SynchronousProcess::stopProcess(m_process);
}
GerritPlugin::GerritPlugin(QObject *parent) GerritPlugin::GerritPlugin(QObject *parent)
: QObject(parent) : QObject(parent)