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

2
src/plugins/bazaar/bazaarplugin.cpp
View File

@@ -920,7 +920,7 @@ bool BazaarPluginPrivate::vcsMove(const FilePath &from, const FilePath &to)
bool BazaarPluginPrivate::vcsCreateRepository(const FilePath &directory) bool BazaarPluginPrivate::vcsCreateRepository(const FilePath &directory)
{ {
return m_client.synchronousCreateRepository(directory.toString()); return m_client.synchronousCreateRepository(directory);
} }
void BazaarPluginPrivate::vcsAnnotate(const FilePath &file, int line) void BazaarPluginPrivate::vcsAnnotate(const FilePath &file, int line)

4
src/plugins/coreplugin/vcsmanager.cpp
View File

@@ -203,12 +203,12 @@ static QString absoluteWithNoTrailingSlash(const QString &directory)
return res; return res;
} }
void VcsManager::resetVersionControlForDirectory(const QString &inputDirectory) void VcsManager::resetVersionControlForDirectory(const FilePath &inputDirectory)
{ {
if (inputDirectory.isEmpty()) if (inputDirectory.isEmpty())
return; return;
const QString directory = absoluteWithNoTrailingSlash(inputDirectory); const QString directory = absoluteWithNoTrailingSlash(inputDirectory.toString());
d->resetCache(directory); d->resetCache(directory);
emit m_instance->repositoryChanged(directory); emit m_instance->repositoryChanged(directory);
} }

2
src/plugins/coreplugin/vcsmanager.h
View File

@@ -63,7 +63,7 @@ public:
static const QList<IVersionControl *> versionControls(); static const QList<IVersionControl *> versionControls();
static IVersionControl *versionControl(Utils::Id id); static IVersionControl *versionControl(Utils::Id id);
static void resetVersionControlForDirectory(const QString &inputDirectory); static void resetVersionControlForDirectory(const Utils::FilePath &inputDirectory);
static IVersionControl *findVersionControlForDirectory(const QString &directory, static IVersionControl *findVersionControlForDirectory(const QString &directory,
QString *topLevelDirectory = nullptr); QString *topLevelDirectory = nullptr);
static QString findTopLevelForDirectory(const QString &directory); static QString findTopLevelForDirectory(const QString &directory);

2
src/plugins/git/gitclient.cpp
View File

@@ -1529,7 +1529,7 @@ bool GitClient::synchronousReset(const QString &workingDirectory,
} }
// Initialize repository // Initialize repository
bool GitClient::synchronousInit(const QString &workingDirectory) bool GitClient::synchronousInit(const FilePath &workingDirectory)
{ {
QtcProcess proc; QtcProcess proc;
vcsFullySynchronousExec(proc, workingDirectory, QStringList{"init"}); vcsFullySynchronousExec(proc, workingDirectory, QStringList{"init"});

2
src/plugins/git/gitclient.h
View File

@@ -200,7 +200,7 @@ public:
QStringList *files, QStringList *ignoredFiles, QString *errorMessage); QStringList *files, QStringList *ignoredFiles, QString *errorMessage);
bool synchronousApplyPatch(const QString &workingDirectory, const QString &file, bool synchronousApplyPatch(const QString &workingDirectory, const QString &file,
QString *errorMessage, const QStringList &extraArguments = QStringList()); QString *errorMessage, const QStringList &extraArguments = QStringList());
bool synchronousInit(const QString &workingDirectory); bool synchronousInit(const Utils::FilePath &workingDirectory);
bool synchronousCheckoutFiles(const QString &workingDirectory, QStringList files = QStringList(), bool synchronousCheckoutFiles(const QString &workingDirectory, QStringList files = QStringList(),
QString revision = QString(), QString *errorMessage = nullptr, QString revision = QString(), QString *errorMessage = nullptr,
bool revertStaging = true); bool revertStaging = true);

2
src/plugins/git/gitplugin.cpp
View File

@@ -1899,7 +1899,7 @@ bool GitPluginPrivate::vcsMove(const FilePath &from, const FilePath &to)
bool GitPluginPrivate::vcsCreateRepository(const FilePath &directory) bool GitPluginPrivate::vcsCreateRepository(const FilePath &directory)
{ {
return m_gitClient.synchronousInit(directory.toString()); return m_gitClient.synchronousInit(directory);
} }
QString GitPluginPrivate::vcsTopic(const FilePath &directory) QString GitPluginPrivate::vcsTopic(const FilePath &directory)

2
src/plugins/mercurial/mercurialclient.cpp
View File

@@ -112,7 +112,7 @@ bool MercurialClient::manifestSync(const QString &repository, const QString &rel
} }
//bool MercurialClient::clone(const QString &directory, const QString &url) //bool MercurialClient::clone(const QString &directory, const QString &url)
bool MercurialClient::synchronousClone(const QString &workingDir, bool MercurialClient::synchronousClone(const FilePath &workingDir,
const QString &srcLocation, const QString &srcLocation,
const QString &dstLocation, const QString &dstLocation,
const QStringList &extraOptions) const QStringList &extraOptions)

2
src/plugins/mercurial/mercurialclient.h
View File

@@ -42,7 +42,7 @@ class MercurialClient : public VcsBase::VcsBaseClient
public: public:
explicit MercurialClient(MercurialSettings *settings); explicit MercurialClient(MercurialSettings *settings);
bool synchronousClone(const QString &workingDir, bool synchronousClone(const Utils::FilePath &workingDir,
const QString &srcLocation, const QString &srcLocation,
const QString &dstLocation, const QString &dstLocation,
const QStringList &extraOptions = QStringList()) override; const QStringList &extraOptions = QStringList()) override;

2
src/plugins/mercurial/mercurialplugin.cpp
View File

@@ -821,7 +821,7 @@ bool MercurialPluginPrivate::vcsMove(const FilePath &from, const FilePath &to)
bool MercurialPluginPrivate::vcsCreateRepository(const FilePath &directory) bool MercurialPluginPrivate::vcsCreateRepository(const FilePath &directory)
{ {
return m_client.synchronousCreateRepository(directory.toString()); return m_client.synchronousCreateRepository(directory);
} }
void MercurialPluginPrivate::vcsAnnotate(const FilePath &filePath, int line) void MercurialPluginPrivate::vcsAnnotate(const FilePath &filePath, int line)

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

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

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

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