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

Git: Initialize GitClient on first access

Browse Source 
This does not change the current timing of construction a lot as
the GerritPlugin may need it immediately in some cases, in any
case the gitGrep instance will need it.

There's nothing big going on at destruction time, so the prolonged
lifetime until really close to the end does not hurt.

The reason here is that this way we will avoid cases like in change
5e5b90a9a1.

Change-Id: I326d83c1a3d21114322ac6cce8d9e9b782faacdc
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
hjk
2023-07-25 16:09:50 +02:00
parent 8d5897b8eb
commit 778a1d75ba
24 changed files with 255 additions and 280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/git/gerrit/gerritplugin.cpp
View File

@@ -101,7 +101,7 @@ FetchContext::FetchContext(const QSharedPointer<GerritChange> &change,
VcsBase::VcsOutputWindow::append(QString::fromLocal8Bit(m_process.readAllRawStandardOutput()));
});
m_process.setWorkingDirectory(repository);
m_process.setEnvironment(GitClient::instance()->processEnvironment());
m_process.setEnvironment(gitClient().processEnvironment());
}
void FetchContext::start()
@@ -136,7 +136,7 @@ void FetchContext::show()
{
const QString title = QString::number(m_change->number) + '/'
+ QString::number(m_change->currentPatchSet.patchSetNumber);
GitClient::instance()->show(m_repository, "FETCH_HEAD", title);
gitClient().show(m_repository, "FETCH_HEAD", title);
}
void FetchContext::cherryPick()
@@ -144,12 +144,12 @@ void FetchContext::cherryPick()
// Point user to errors.
VcsBase::VcsOutputWindow::instance()->popup(IOutputPane::ModeSwitch
| IOutputPane::WithFocus);
GitClient::instance()->synchronousCherryPick(m_repository, "FETCH_HEAD");
gitClient().synchronousCherryPick(m_repository, "FETCH_HEAD");
}
void FetchContext::checkout()
{
GitClient::instance()->checkout(m_repository, "FETCH_HEAD");
gitClient().checkout(m_repository, "FETCH_HEAD");
}
GerritPlugin::GerritPlugin()
@@ -219,7 +219,7 @@ void GerritPlugin::push(const FilePath &topLevel)
dialog.storeTopic();
m_reviewers = dialog.reviewers();
GitClient::instance()->push(topLevel, {dialog.selectedRemoteName(), dialog.pushTarget()});
gitClient().push(topLevel, {dialog.selectedRemoteName(), dialog.pushTarget()});
}
static FilePath currentRepository()
@@ -267,19 +267,19 @@ void GerritPlugin::push()
Utils::FilePath GerritPlugin::gitBinDirectory()
{
return GitClient::instance()->gitBinDirectory();
return gitClient().gitBinDirectory();
}
// Find the branch of a repository.
QString GerritPlugin::branch(const FilePath &repository)
{
return GitClient::instance()->synchronousCurrentLocalBranch(repository);
return gitClient().synchronousCurrentLocalBranch(repository);
}
void GerritPlugin::fetch(const QSharedPointer<GerritChange> &change, int mode)
{
// Locate git.
const Utils::FilePath git = GitClient::instance()->vcsBinary();
const Utils::FilePath git = gitClient().vcsBinary();
if (git.isEmpty()) {
VcsBase::VcsOutputWindow::appendError(Git::Tr::tr("Git is not available."));
return;
@@ -292,7 +292,7 @@ void GerritPlugin::fetch(const QSharedPointer<GerritChange> &change, int mode)
if (!repository.isEmpty()) {
// Check if remote from a working dir is the same as remote from patch
QMap<QString, QString> remotesList = GitClient::instance()->synchronousRemotesList(repository);
QMap<QString, QString> remotesList = gitClient().synchronousRemotesList(repository);
if (!remotesList.isEmpty()) {
const QStringList remotes = remotesList.values();
for (QString remote : remotes) {
@@ -305,7 +305,7 @@ void GerritPlugin::fetch(const QSharedPointer<GerritChange> &change, int mode)
}
if (!verifiedRepository) {
const SubmoduleDataMap submodules = GitClient::instance()->submoduleList(repository);
const SubmoduleDataMap submodules = gitClient().submoduleList(repository);
for (const SubmoduleData &submoduleData : submodules) {
QString remote = submoduleData.url;
if (remote.endsWith(".git"))