forked from qt-creator/qt-creator
VcsBase: Rename vcsFullySynchronousExec into vcsSynchronousExec
Get rid of original vcsSynchronousExec(), as it was calling vcsFullySynchronousExec(). Change-Id: I911dc786d54c34c211d03661c37df9b58d60a20b Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
@@ -76,10 +76,10 @@ public:
|
||||
static QString stripLastNewline(const QString &in);
|
||||
|
||||
// Fully synchronous VCS execution (QProcess-based)
|
||||
CommandResult vcsFullySynchronousExec(const Utils::FilePath &workingDir,
|
||||
CommandResult vcsSynchronousExec(const Utils::FilePath &workingDir,
|
||||
const QStringList &args, unsigned flags = 0,
|
||||
int timeoutS = -1, QTextCodec *codec = nullptr) const;
|
||||
CommandResult vcsFullySynchronousExec(const Utils::FilePath &workingDir,
|
||||
CommandResult vcsSynchronousExec(const Utils::FilePath &workingDir,
|
||||
const Utils::CommandLine &cmdLine, unsigned flags = 0,
|
||||
int timeoutS = -1, QTextCodec *codec = nullptr) const;
|
||||
|
||||
@@ -95,13 +95,6 @@ protected:
|
||||
virtual void annotateRevisionRequested(const Utils::FilePath &workingDirectory, const QString &file,
|
||||
const QString &change, int line);
|
||||
|
||||
// Synchronous VCS execution using Utils::SynchronousProcess, with
|
||||
// log windows updating (using VcsBasePlugin::runVcs with flags)
|
||||
CommandResult vcsSynchronousExec(const Utils::FilePath &workingDir,
|
||||
const QStringList &args,
|
||||
unsigned flags = 0,
|
||||
QTextCodec *outputCodec = nullptr) const;
|
||||
|
||||
private:
|
||||
void saveSettings();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user