diff options
Diffstat (limited to 'src/plugins/mercurial/mercurialclient.cpp')
-rw-r--r-- | src/plugins/mercurial/mercurialclient.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/plugins/mercurial/mercurialclient.cpp b/src/plugins/mercurial/mercurialclient.cpp index 768e566d6a..a8ab07635d 100644 --- a/src/plugins/mercurial/mercurialclient.cpp +++ b/src/plugins/mercurial/mercurialclient.cpp @@ -118,9 +118,7 @@ bool MercurialClient::synchronousClone(const FilePath &workingDirectory, { Q_UNUSED(srcLocation) Q_UNUSED(extraOptions) - const unsigned flags = VcsCommand::SshPasswordPrompt - | VcsCommand::ShowStdOut - | VcsCommand::ShowSuccessMessage; + const unsigned flags = VcsCommand::ShowStdOut | VcsCommand::ShowSuccessMessage; if (workingDirectory.exists()) { // Let's make first init @@ -164,17 +162,13 @@ bool MercurialClient::synchronousPull(const FilePath &workingDir, const QString { QStringList args; args << vcsCommandString(PullCommand) << extraOptions << srcLocation; - // Disable UNIX terminals to suppress SSH prompting - const unsigned flags = VcsCommand::SshPasswordPrompt - | VcsCommand::ShowStdOut - | VcsCommand::ShowSuccessMessage; // cause mercurial doesn`t understand LANG Environment env = Environment::systemEnvironment(); env.set("LANGUAGE", "C"); VcsCommand *command = VcsBaseClient::createVcsCommand(workingDir, env); - command->addFlags(flags); + command->addFlags(VcsCommand::ShowStdOut | VcsCommand::ShowSuccessMessage); const CommandResult result = command->runCommand({vcsBinary(), args}, vcsTimeoutS()); delete command; |