diff options
| author | Tobias Hunger <tobias.hunger@theqtcompany.com> | 2015-04-27 15:03:07 +0200 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@theqtcompany.com> | 2015-05-04 15:27:25 +0000 |
| commit | eec0a03212a13e5cf7377e5c7618471e546f787e (patch) | |
| tree | e1dcaac87d1a4320eab2ddfd53ced0fd835fcb5c /src/plugins/mercurial | |
| parent | 1e1fee86c43c70e6377b20d19e757b13137787ad (diff) | |
Vcs: Split up VcsCommand
Move the biggest chunk into Utils::ShellCommand, add some Qt Creator
specific magic in Core::ShellCommand and leave the rest in
VcsBase::VcsCommand.
Change-Id: I5fe6f7076e96023ad2164bcfaacfb3b65a7ff8a8
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/plugins/mercurial')
| -rw-r--r-- | src/plugins/mercurial/mercurialclient.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/mercurial/mercurialclient.cpp b/src/plugins/mercurial/mercurialclient.cpp index f53c816fe8..404c377055 100644 --- a/src/plugins/mercurial/mercurialclient.cpp +++ b/src/plugins/mercurial/mercurialclient.cpp @@ -102,9 +102,9 @@ bool MercurialClient::synchronousClone(const QString &workingDir, Q_UNUSED(extraOptions); QDir workingDirectory(srcLocation); QByteArray output; - const unsigned flags = VcsBasePlugin::SshPasswordPrompt | - VcsBasePlugin::ShowStdOutInLogWindow | - VcsBasePlugin::ShowSuccessMessage; + const unsigned flags = VcsCommand::SshPasswordPrompt | + VcsCommand::ShowStdOut | + VcsCommand::ShowSuccessMessage; if (workingDirectory.exists()) { // Let's make first init @@ -151,9 +151,9 @@ bool MercurialClient::synchronousPull(const QString &workingDir, const QString & args << vcsCommandString(PullCommand) << extraOptions << srcLocation; // Disable UNIX terminals to suppress SSH prompting const unsigned flags = - VcsBasePlugin::SshPasswordPrompt - | VcsBasePlugin::ShowStdOutInLogWindow - | VcsBasePlugin::ShowSuccessMessage; + VcsCommand::SshPasswordPrompt + | VcsCommand::ShowStdOut + | VcsCommand::ShowSuccessMessage; // cause mercurial doesn`t understand LANG QProcessEnvironment env = QProcessEnvironment::systemEnvironment(); |