Git: Improve Timeouts.

- Observe timeout setting when running synchronous commands.
- Increase Default on Windows
- Stop process with terminate first (signal).
Task-number: QTCREATORBUG-777

1 files changed, 8 insertions, 0 deletions

diff --git a/src/plugins/git/gitcommand.h b/src/plugins/git/gitcommand.h
index 8f1c5aad0ec..9345ea4d3f1 100644
--- a/src/plugins/git/gitcommand.h
+++ b/src/plugins/git/gitcommand.h
@@ -34,6 +34,10 @@
 #include <QtCore/QStringList>
 #include <QtCore/QVariant>
 
+QT_BEGIN_NAMESPACE
+class QProcess;
+QT_END_NAMESPACE
+
 namespace Git {
 namespace Internal {
 
@@ -66,6 +70,10 @@ public:
     TerminationReportMode reportTerminationMode() const;
     void setTerminationReportMode(TerminationReportMode m);
 
+    static QString msgTimeout(int seconds);
+    // Helper to kill a process by SIGNAL first, allowing for cleanup
+    static bool stopProcess(QProcess &p);
+
 private:
     void run();