diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2010-05-21 17:46:00 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2010-05-21 17:46:00 +0200 |
commit | 5364f5c152a2cdbcdb3abb1b80b658474e081411 (patch) | |
tree | 3306f8665c8ce1149cbf65a75acac00599752d29 /src/plugins/vcsbase/vcsbaseoutputwindow.h | |
parent | 91c4b0305c0d36da4d959d1be744ee61863b4642 (diff) | |
download | qt-creator-5364f5c152a2cdbcdb3abb1b80b658474e081411.tar.gz |
VCS: Show message box on timeouts/Add SSH prompt.
- Use message boxes on timeouts.
- Add a configuration for a graphical SSH password prompt binary with
defaults
- Launch commands that require authentification with no terminal on UNIX
and environment variable SSH_ASKPASS set accordingly.
- First attempt at introduce a common function to synchronously run VCS
commands in base plugin with flags.
- Use standard execution log entries in all VCS plugins (outputwindow).
Diffstat (limited to 'src/plugins/vcsbase/vcsbaseoutputwindow.h')
-rw-r--r-- | src/plugins/vcsbase/vcsbaseoutputwindow.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/plugins/vcsbase/vcsbaseoutputwindow.h b/src/plugins/vcsbase/vcsbaseoutputwindow.h index de65d210d0..2008c202d7 100644 --- a/src/plugins/vcsbase/vcsbaseoutputwindow.h +++ b/src/plugins/vcsbase/vcsbaseoutputwindow.h @@ -77,6 +77,13 @@ public: QString repository() const; + // Helper to consistently format log entries for commands as + // 'Executing <dir>: <cmd> <args>'. Hides well-known password option + // arguments. + static QString msgExecutionLogEntry(const QString &workingDir, + const QString &executable, + const QStringList &arguments); + public slots: void setRepository(const QString &); void clearRepository(); @@ -105,6 +112,11 @@ public slots: // Append a command, prepended by a log time stamp. "Executing: vcs -diff" // will result in "10:00 Executing: vcs -diff" in bold void appendCommand(const QString &text); + // Append a standard-formatted entry for command execution + // (see msgExecutionLogEntry). + void appendCommand(const QString &workingDirectory, + const QString &binary, + const QStringList &args); private: VCSBaseOutputWindow(); |