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

VcsCommand: Conform to QtcProcess API

Browse Source 
Add result() getter and done() signal in order to
conform to QtcProcess API.

Change-Id: Idc7c57e03d6e8acead9d4c034f4efc56250f944d
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Jarek Kobus
2022-09-19 11:44:07 +02:00
parent f729efe3df
commit 5e10ea19c1
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/vcsbase/vcscommand.cpp
View File

@@ -106,6 +106,7 @@ public:
std::unique_ptr<QtcProcess> m_process; std::unique_ptr<QtcProcess> m_process;
QString m_stdOut; QString m_stdOut;
QString m_stdErr; QString m_stdErr;
ProcessResult m_result = ProcessResult::StartFailed;
QFutureInterface<void> m_futureInterface; QFutureInterface<void> m_futureInterface;
unsigned m_flags = 0; unsigned m_flags = 0;
@@ -255,6 +256,7 @@ void VcsCommandPrivate::processDone()
handleDone(m_process.get()); handleDone(m_process.get());
m_stdOut += m_process->cleanedStdOut(); m_stdOut += m_process->cleanedStdOut();
m_stdErr += m_process->cleanedStdErr(); m_stdErr += m_process->cleanedStdErr();
m_result = m_process->result();
++m_currentJob; ++m_currentJob;
const bool success = m_process->result() == ProcessResult::FinishedWithSuccess; const bool success = m_process->result() == ProcessResult::FinishedWithSuccess;
if (m_currentJob < m_jobs.count() && success) { if (m_currentJob < m_jobs.count() && success) {
@@ -263,6 +265,7 @@ void VcsCommandPrivate::processDone()
return; return;
} }
emit q->finished(success); emit q->finished(success);
emit q->done();
if (!success) if (!success)
m_futureInterface.reportCanceled(); m_futureInterface.reportCanceled();
cleanup(); cleanup();
@@ -377,6 +380,11 @@ QString VcsCommand::cleanedStdErr() const
return d->m_stdErr; return d->m_stdErr;
} }
ProcessResult VcsCommand::result() const
{
return d->m_result;
}
CommandResult VcsCommand::runCommand(const CommandLine &command, int timeoutS) CommandResult VcsCommand::runCommand(const CommandLine &command, int timeoutS)
{ {
QtcProcess process; QtcProcess process;

2
src/plugins/vcsbase/vcscommand.h
View File

@@ -118,11 +118,13 @@ public:
QString cleanedStdOut() const; QString cleanedStdOut() const;
QString cleanedStdErr() const; QString cleanedStdErr() const;
Utils::ProcessResult result() const;
signals: signals:
void stdOutText(const QString &); void stdOutText(const QString &);
void stdErrText(const QString &); void stdErrText(const QString &);
void finished(bool success); void finished(bool success);
void done();
void terminate(); // Internal void terminate(); // Internal