aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/vcsbase/vcsbaseplugin.cpp
diff options
context:
space:
mode:
authorFriedemann Kleint <[email protected]>2010-05-25 11:48:53 +0200
committerFriedemann Kleint <[email protected]>2010-05-25 11:48:53 +0200
commit1c69b97ca6d1bbe5419308049848c11abc80d5d5 (patch)
tree7ae899981e40af78ec20a307fdb73560c9d756b3 /src/plugins/vcsbase/vcsbaseplugin.cpp
parent385ea8c9e0f9a4d2ea08f2d40c8e198630dac746 (diff)
VCS[git]: Make push/pull synchronous commands.
..for timeout handling to take effect. Also, log window will update continuously. Task-number: QTCREATORBUG-777
Diffstat (limited to 'src/plugins/vcsbase/vcsbaseplugin.cpp')
-rw-r--r--src/plugins/vcsbase/vcsbaseplugin.cpp12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/plugins/vcsbase/vcsbaseplugin.cpp b/src/plugins/vcsbase/vcsbaseplugin.cpp
index 6f5d24c48f1..957395c0074 100644
--- a/src/plugins/vcsbase/vcsbaseplugin.cpp
+++ b/src/plugins/vcsbase/vcsbaseplugin.cpp
@@ -778,10 +778,14 @@ Utils::SynchronousProcessResponse
// Run!
const Utils::SynchronousProcessResponse sp_resp = process.run(binary, arguments);
- // Fail message?
- if (sp_resp.result != Utils::SynchronousProcessResponse::Finished &&
- (!(flags & SuppressFailMessageInLogWindow)))
- outputWindow->appendError(sp_resp.exitMessage(binary, timeOutMS));
+ // Success/Fail message in appropriate window?
+ if (sp_resp.result == Utils::SynchronousProcessResponse::Finished) {
+ if (flags & ShowSuccessMessage)
+ outputWindow->append(sp_resp.exitMessage(binary, timeOutMS));
+ } else {
+ if (!(flags & SuppressFailMessageInLogWindow))
+ outputWindow->appendError(sp_resp.exitMessage(binary, timeOutMS));
+ }
return sp_resp;
}