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

VCS: Partially use FilePath in VcsBaseClient

Browse Source 
Change-Id: I024b051ab98ece42ec011bd1c92887a946925c1a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
hjk
2021-07-30 09:24:21 +02:00
parent 44e841c453
commit ecbd9f4558
11 changed files with 35 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -144,6 +144,20 @@ QString VcsBaseClientImpl::stripLastNewline(const QString &in)
return in;
}
void VcsBaseClientImpl::vcsFullySynchronousExec(QtcProcess &proc,
const QString &workingDir, const QStringList &args,
unsigned flags, int timeoutS, QTextCodec *codec) const
{
vcsFullySynchronousExec(proc, workingDir, {vcsBinary(), args}, flags, timeoutS, codec);
}
void VcsBaseClientImpl::vcsFullySynchronousExec(QtcProcess &proc,
const FilePath &workingDir, const QStringList &args,
unsigned flags, int timeoutS, QTextCodec *codec) const
{
vcsFullySynchronousExec(proc, workingDir.toString(), {vcsBinary(), args}, flags, timeoutS, codec);
}
void VcsBaseClientImpl::vcsFullySynchronousExec(QtcProcess &proc,
const QString &workingDir, const CommandLine &cmdLine,
unsigned flags, int timeoutS, QTextCodec *codec) const
@@ -156,7 +170,7 @@ void VcsBaseClientImpl::vcsFullySynchronousExec(QtcProcess &proc,
command.runCommand(proc, cmdLine);
}
void VcsBaseClientImpl::resetCachedVcsInfo(const QString &workingDir)
void VcsBaseClientImpl::resetCachedVcsInfo(const FilePath &workingDir)
{
Core::VcsManager::resetVersionControlForDirectory(workingDir);
}
@@ -174,13 +188,6 @@ void VcsBaseClientImpl::annotateRevisionRequested(const QString &workingDirector
annotate(workingDirectory, file, changeCopy, line);
}
void VcsBaseClientImpl::vcsFullySynchronousExec(QtcProcess &proc,
const QString &workingDir, const QStringList &args,
unsigned flags, int timeoutS, QTextCodec *codec) const
{
vcsFullySynchronousExec(proc, workingDir, {vcsBinary(), args}, flags, timeoutS, codec);
}
VcsCommand *VcsBaseClientImpl::vcsExec(const QString &workingDirectory, const QStringList &arguments,
VcsBaseEditorWidget *editor, bool useOutputToWindow,
unsigned additionalFlags, const QVariant &cookie) const
@@ -254,7 +261,7 @@ VcsBaseClient::VcsBaseClient(VcsBaseSettings *baseSettings)
qRegisterMetaType<QVariant>();
}
bool VcsBaseClient::synchronousCreateRepository(const QString &workingDirectory,
bool VcsBaseClient::synchronousCreateRepository(const FilePath &workingDirectory,
const QStringList &extraOptions)
{
QStringList args(vcsCommandString(CreateRepositoryCommand));
@@ -270,7 +277,7 @@ bool VcsBaseClient::synchronousCreateRepository(const QString &workingDirectory,
return true;
}
bool VcsBaseClient::synchronousClone(const QString &workingDir,
bool VcsBaseClient::synchronousClone(const FilePath &workingDir,
const QString &srcLocation,
const QString &dstLocation,
const QStringList &extraOptions)

13
src/plugins/vcsbase/vcsbaseclient.h
View File

@@ -101,6 +101,9 @@ public:
void vcsFullySynchronousExec(Utils::QtcProcess &process,
const QString &workingDir, const Utils::CommandLine &cmdLine,
unsigned flags = 0, int timeoutS = -1, QTextCodec *codec = nullptr) const;
void vcsFullySynchronousExec(Utils::QtcProcess &process,
const Utils::FilePath &workingDir, const QStringList &args,
unsigned flags = 0, int timeoutS = -1, QTextCodec *codec = nullptr) const;
// Simple helper to execute a single command using createCommand and enqueueJob.
@@ -109,7 +112,7 @@ public:
unsigned additionalFlags = 0, const QVariant &cookie = QVariant()) const;
protected:
void resetCachedVcsInfo(const QString &workingDir);
void resetCachedVcsInfo(const Utils::FilePath &workingDir);
virtual void annotateRevisionRequested(const QString &workingDirectory, const QString &file,
const QString &change, int line);
@@ -142,12 +145,12 @@ public:
explicit VcsBaseClient(VcsBaseSettings *baseSettings);
virtual bool synchronousCreateRepository(const QString &workingDir,
const QStringList &extraOptions = QStringList());
virtual bool synchronousClone(const QString &workingDir,
virtual bool synchronousCreateRepository(const Utils::FilePath &workingDir,
const QStringList &extraOptions = {});
virtual bool synchronousClone(const Utils::FilePath &workingDir,
const QString &srcLocation,
const QString &dstLocation,
const QStringList &extraOptions = QStringList());
const QStringList &extraOptions = {});
virtual bool synchronousAdd(const QString &workingDir, const QString &fileName,
const QStringList &extraOptions = QStringList());
virtual bool synchronousRemove(const QString &workingDir, const QString &fileName,