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

Merge remote-tracking branch 'origin/4.2'

Browse Source 
Change-Id: Ia346d86ad5fabe9d91454ea642cbeac5ec862699
This commit is contained in:
Eike Ziller
2016-10-27 12:10:03 +02:00
parent e0ee142f8d c777bd32bc
commit cf47f3e807
166 changed files with 1729 additions and 514 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/vcsbase/vcsbaseclient.cpp
View File

@@ -175,6 +175,18 @@ QString VcsBaseClientImpl::stripLastNewline(const QString &in)
return in;
}
Utils::SynchronousProcessResponse
VcsBaseClientImpl::vcsFullySynchronousExec(const QString &workingDir, const Utils::FileName &binary,
const QStringList &args, unsigned flags,
int timeoutS, QTextCodec *codec) const
{
VcsCommand command(workingDir, processEnvironment());
command.addFlags(flags);
if (codec)
command.setCodec(codec);
return command.runCommand(binary, args, (timeoutS > 0) ? timeoutS : vcsTimeoutS());
}
void VcsBaseClientImpl::resetCachedVcsInfo(const QString &workingDir)
{
Core::VcsManager::resetVersionControlForDirectory(workingDir);
@@ -197,11 +209,7 @@ Utils::SynchronousProcessResponse
VcsBaseClientImpl::vcsFullySynchronousExec(const QString &workingDir, const QStringList &args,
unsigned flags, int timeoutS, QTextCodec *codec) const
{
VcsCommand command(workingDir, processEnvironment());
command.addFlags(flags);
if (codec)
command.setCodec(codec);
return command.runCommand(vcsBinary(), args, (timeoutS > 0) ? timeoutS : vcsTimeoutS());
return vcsFullySynchronousExec(workingDir, vcsBinary(), args, flags, timeoutS, codec);
}
VcsCommand *VcsBaseClientImpl::vcsExec(const QString &workingDirectory, const QStringList &arguments,