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

GitClient: Don't call blocking waitForStarted()

Browse Source 
Connect to done() signal in order to detect the start
failure and try to start a gitk from different path.
All trials of starting gitk are done sequentially
and non-blocking.

Give process a parent in order to avoid process leak
on shutdown.

Change-Id: I1d74bfeaca23d38643f3d2f262428732314aefe4
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Jarek Kobus
2022-06-22 11:21:50 +02:00
parent 14965f5792
commit a1ad64a50b
2 changed files with 69 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -113,6 +113,7 @@ class GITSHARED_EXPORT GitClient : public VcsBase::VcsBaseClientImpl
public:
enum CommandInProgress { NoCommand, Revert, CherryPick,
Rebase, Merge, RebaseMerge };
enum GitKLaunchTrial { Bin, ParentOfBin, SystemPath, None };
class StashInfo
{
@@ -399,10 +400,15 @@ private:
void connectRepositoryChanged(const QString & repository, VcsBase::VcsCommand *cmd);
bool executeAndHandleConflicts(const Utils::FilePath &workingDirectory, const QStringList &arguments,
const QString &abortCommand = {}) const;
bool tryLauchingGitK(const Utils::Environment &env,
const Utils::FilePath &workingDirectory,
const QString &fileName,
const Utils::FilePath &gitBinDirectory) const;
void tryLaunchingGitK(const Utils::Environment &env,
const Utils::FilePath &workingDirectory,
const QString &fileName,
GitKLaunchTrial trial = GitKLaunchTrial::Bin) const;
void handleGitKFailedToStart(const Utils::Environment &env,
const Utils::FilePath &workingDirectory,
const QString &fileName,
const GitKLaunchTrial oldTrial,
const Utils::FilePath &oldGitBinDir) const;
bool cleanList(const Utils::FilePath &workingDirectory, const QString &modulePath,
const QString &flag, QStringList *files, QString *errorMessage);