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

Vcs: Standardize on second based timeouts

Browse Source 
Change-Id: Ia273fda05a4c4a1934819f26e5dc1b6b80a89f6f
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2015-04-10 14:44:17 +02:00
parent a55fb4a378
commit 7719fb669c
17 changed files with 134 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -83,7 +83,8 @@ public:
~VcsCommand();
void addJob(const QStringList &arguments, Utils::ExitCodeInterpreter *interpreter = 0);
void addJob(const QStringList &arguments, int timeout, Utils::ExitCodeInterpreter *interpreter = 0);
void addJob(const QStringList &arguments, int timeoutS,
Utils::ExitCodeInterpreter *interpreter = 0);
void execute();
void abort();
bool lastExecutionSuccess() const;
@@ -93,8 +94,8 @@ public:
const QString &workingDirectory() const;
const QProcessEnvironment &processEnvironment() const;
int defaultTimeout() const;
void setDefaultTimeout(int timeout);
int defaultTimeoutS() const;
void setDefaultTimeoutS(int timeout);
unsigned flags() const;
void addFlags(unsigned f);
@@ -108,15 +109,15 @@ public:
void setProgressParser(ProgressParser *parser);
void setProgressiveOutput(bool progressive);
Utils::SynchronousProcessResponse runVcs(const QStringList &arguments, int timeoutMS,
Utils::SynchronousProcessResponse runVcs(const QStringList &arguments, int timeoutS,
Utils::ExitCodeInterpreter *interpreter = 0);
// Make sure to not pass through the event loop at all:
bool runFullySynchronous(const QStringList &arguments, int timeoutMS,
bool runFullySynchronous(const QStringList &arguments, int timeoutS,
QByteArray *outputData, QByteArray *errorData);
private:
void run(QFutureInterface<void> &future);
Utils::SynchronousProcessResponse runSynchronous(const QStringList &arguments, int timeoutMS,
Utils::SynchronousProcessResponse runSynchronous(const QStringList &arguments, int timeoutS,
Utils::ExitCodeInterpreter *interpreter = 0);
void emitRepositoryChanged();