Commit 085d4a90 authored by Tobias Hunger's avatar Tobias Hunger
Browse files

Vcs: Move method around in vcsbaseclient.cpp, no code change



Change-Id: Ia815179f3bb8c13b05c271f2ce82c3736e6a7b79
Reviewed-by: default avatarOrgad Shaneh <orgads@gmail.com>
parent dcdcf540
......@@ -204,6 +204,20 @@ void VcsBaseClientImpl::annotateRevisionRequested(const QString &workingDirector
annotate(workingDirectory, file, changeCopy, line);
}
bool VcsBaseClientImpl::vcsFullySynchronousExec(const QString &workingDir, const QStringList &args,
QByteArray *outputData, QByteArray *errorData,
unsigned flags) const
{
QByteArray internalErrorData;
QScopedPointer<VcsCommand> command(createCommand(workingDir));
command->addFlags(flags);
bool result = command->runFullySynchronous(args, vcsTimeoutS(), outputData,
errorData ? errorData : &internalErrorData);
if (!internalErrorData.isEmpty())
VcsOutputWindow::appendError(commandOutputFromLocal8Bit(internalErrorData));
return result;
}
int VcsBaseClientImpl::vcsTimeoutS() const
{
return settings().intValue(VcsBaseClientSettings::timeoutKey);
......@@ -386,20 +400,6 @@ bool VcsBaseClient::synchronousPush(const QString &workingDir,
return resp.result == Utils::SynchronousProcessResponse::Finished;
}
bool VcsBaseClientImpl::vcsFullySynchronousExec(const QString &workingDir, const QStringList &args,
QByteArray *outputData, QByteArray *errorData,
unsigned flags) const
{
QByteArray internalErrorData;
QScopedPointer<VcsCommand> command(createCommand(workingDir));
command->addFlags(flags);
bool result = command->runFullySynchronous(args, vcsTimeoutS(), outputData,
errorData ? errorData : &internalErrorData);
if (!internalErrorData.isEmpty())
VcsOutputWindow::appendError(commandOutputFromLocal8Bit(internalErrorData));
return result;
}
Utils::SynchronousProcessResponse VcsBaseClient::vcsSynchronousExec(const QString &workingDirectory,
const QStringList &args,
unsigned flags,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment