feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Vcs: Add vcsBinary and vcsTimeout methods to VcsBaseClient

Browse Source 
Change-Id: I966a76ee4c1e5c45ac7332613e90cf511afc584c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Tobias Hunger
2015-03-25 12:30:07 +01:00
parent 65cd5381d9
commit f44161bb9a
14 changed files with 93 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/subversion/subversionclient.cpp
View File

@@ -182,8 +182,6 @@ private slots:
private:
QString getDescription() const;
void postCollectTextualDiffOutput();
int timeout() const;
FileName subversionPath() const;
QProcessEnvironment processEnvironment() const;
const SubversionClient *m_client;
@@ -201,16 +199,6 @@ DiffController::DiffController(IDocument *document, const SubversionClient *clie
forceContextLineCount(3); // SVN can not change that when using internal diff
}
int DiffController::timeout() const
{
return m_client->settings()->intValue(VcsBaseClientSettings::timeoutKey);
}
FileName DiffController::subversionPath() const
{
return m_client->settings()->binaryPath();
}
QProcessEnvironment DiffController::processEnvironment() const
{
return m_client->processEnvironment();
@@ -240,7 +228,7 @@ QString DiffController::getDescription() const
args << QString::number(m_changeNumber);
const SubversionResponse logResponse =
SubversionPlugin::instance()->runSvn(m_workingDirectory, args,
m_client->settings()->timeOutMs(),
m_client->vcsTimeout() * 1000,
VcsBasePlugin::SshPasswordPrompt);
if (logResponse.error)
@@ -251,7 +239,7 @@ QString DiffController::getDescription() const
void DiffController::postCollectTextualDiffOutput()
{
auto command = new VcsCommand(subversionPath(), m_workingDirectory, processEnvironment());
auto command = new VcsCommand(m_client->vcsBinary(), m_workingDirectory, processEnvironment());
command->setCodec(EditorManager::defaultTextCodec());
connect(command, SIGNAL(output(QString)),
this, SLOT(slotTextualDiffOutputReceived(QString)));
@@ -270,7 +258,7 @@ void DiffController::postCollectTextualDiffOutput()
args << m_filesList;
}
command->addJob(args, timeout());
command->addJob(args, m_client->vcsTimeout());
command->execute();
}