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

Git: FilePathify GitClient::tryLauchingGitK and surroundings

Browse Source 
Change-Id: Icdbd0aab546824c9213402169a165290dd86d3c5
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
hjk
2021-08-12 12:22:52 +02:00
parent 3174218535
commit ab98f31a1d
2 changed files with 22 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -759,9 +759,9 @@ static inline QString msgParseFilesFailed()
return GitClient::tr("Cannot parse the file output."); return GitClient::tr("Cannot parse the file output.");
} }
static inline QString msgCannotLaunch(const QString &binary) static QString msgCannotLaunch(const FilePath &binary)
{ {
return GitClient::tr("Cannot launch \"%1\".").arg(QDir::toNativeSeparators(binary)); return GitClient::tr("Cannot launch \"%1\".").arg(binary.toUserOutput());
} }
static inline void msgCannotRun(const QString &message, QString *errorMessage) static inline void msgCannotRun(const QString &message, QString *errorMessage)
@@ -2532,36 +2532,29 @@ QStringList GitClient::synchronousRepositoryBranches(const QString &repositoryUR
void GitClient::launchGitK(const FilePath &workingDirectory, const QString &fileName) const void GitClient::launchGitK(const FilePath &workingDirectory, const QString &fileName) const
{ {
const QFileInfo binaryInfo = vcsBinary().toFileInfo(); FilePath foundBinDir = vcsBinary().parentDir();
QDir foundBinDir(binaryInfo.dir());
const bool foundBinDirIsBinDir = foundBinDir.dirName() == "bin";
Environment env = processEnvironment(); Environment env = processEnvironment();
if (tryLauchingGitK(env, workingDirectory, fileName, foundBinDir.path())) if (tryLauchingGitK(env, workingDirectory, fileName, foundBinDir))
return; return;
QString gitkPath = foundBinDir.path() + "/gitk"; VcsOutputWindow::appendSilently(msgCannotLaunch(foundBinDir / "gitk"));
VcsOutputWindow::appendSilently(msgCannotLaunch(gitkPath));
if (foundBinDirIsBinDir) { if (foundBinDir.fileName() == "bin") {
foundBinDir.cdUp(); foundBinDir = foundBinDir.parentDir();
const QString binDirName = foundBinDir.dirName(); const QString binDirName = foundBinDir.fileName();
if (binDirName == "usr" || binDirName.startsWith("mingw")) if (binDirName == "usr" || binDirName.startsWith("mingw"))
foundBinDir.cdUp(); foundBinDir = foundBinDir.parentDir();
if (tryLauchingGitK(env, workingDirectory, fileName, if (tryLauchingGitK(env, workingDirectory, fileName, foundBinDir / "cmd"))
foundBinDir.path() + "/cmd")) {
return; return;
}
gitkPath = foundBinDir.path() + "/cmd/gitk"; VcsOutputWindow::appendSilently(msgCannotLaunch(foundBinDir / "cmd/gitk"));
VcsOutputWindow::appendSilently(msgCannotLaunch(gitkPath));
} }
Environment sysEnv = Environment::systemEnvironment(); Environment sysEnv = Environment::systemEnvironment();
const FilePath exec = sysEnv.searchInPath("gitk"); const FilePath exec = sysEnv.searchInPath("gitk");
if (!exec.isEmpty() && tryLauchingGitK(env, workingDirectory, fileName, if (!exec.isEmpty() && tryLauchingGitK(env, workingDirectory, fileName, exec.parentDir()))
exec.parentDir().toString())) {
return; return;
}
VcsOutputWindow::appendError(msgCannotLaunch("gitk")); VcsOutputWindow::appendError(msgCannotLaunch("gitk"));
} }
@@ -2576,15 +2569,15 @@ void GitClient::launchRepositoryBrowser(const FilePath &workingDirectory) const
bool GitClient::tryLauchingGitK(const Environment &env, bool GitClient::tryLauchingGitK(const Environment &env,
const FilePath &workingDirectory, const FilePath &workingDirectory,
const QString &fileName, const QString &fileName,
const QString &gitBinDirectory) const const FilePath &gitBinDirectory) const
{ {
QString binary = gitBinDirectory + "/gitk"; FilePath binary = gitBinDirectory.pathAppended("gitk").withExecutableSuffix();
QStringList arguments; QStringList arguments;
if (HostOsInfo::isWindowsHost()) { if (HostOsInfo::isWindowsHost()) {
// If git/bin is in path, use 'wish' shell to run. Otherwise (git/cmd), directly run gitk // If git/bin is in path, use 'wish' shell to run. Otherwise (git/cmd), directly run gitk
QString wish = gitBinDirectory + "/wish"; FilePath wish = gitBinDirectory.pathAppended("wish").withExecutableSuffix();
if (QFileInfo::exists(wish + ".exe")) { if (wish.withExecutableSuffix().exists()) {
arguments << binary; arguments << binary.toString();
binary = wish; binary = wish;
} }
} }
@@ -2593,7 +2586,7 @@ bool GitClient::tryLauchingGitK(const Environment &env,
arguments.append(ProcessArgs::splitArgs(gitkOpts, HostOsInfo::hostOs())); arguments.append(ProcessArgs::splitArgs(gitkOpts, HostOsInfo::hostOs()));
if (!fileName.isEmpty()) if (!fileName.isEmpty())
arguments << "--" << fileName; arguments << "--" << fileName;
VcsOutputWindow::appendCommand(workingDirectory, {FilePath::fromString(binary), arguments}); VcsOutputWindow::appendCommand(workingDirectory, {binary, arguments});
// This should always use QProcess::startDetached (as not to kill // This should always use QProcess::startDetached (as not to kill
// the child), but that does not have an environment parameter. // the child), but that does not have an environment parameter.
bool success = false; bool success = false;
@@ -2601,7 +2594,7 @@ bool GitClient::tryLauchingGitK(const Environment &env,
auto process = new QProcess; auto process = new QProcess;
process->setWorkingDirectory(workingDirectory.toString()); process->setWorkingDirectory(workingDirectory.toString());
process->setProcessEnvironment(env.toProcessEnvironment()); process->setProcessEnvironment(env.toProcessEnvironment());
process->start(binary, arguments); process->start(binary.toString(), arguments);
success = process->waitForStarted(); success = process->waitForStarted();
if (success) if (success)
connect(process, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished), connect(process, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished),
@@ -2609,7 +2602,7 @@ bool GitClient::tryLauchingGitK(const Environment &env,
else else
delete process; delete process;
} else { } else {
success = QProcess::startDetached(binary, arguments, workingDirectory.toString()); success = QProcess::startDetached(binary.toString(), arguments, workingDirectory.toString());
} }
return success; return success;

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

@@ -405,7 +405,7 @@ private:
bool tryLauchingGitK(const Utils::Environment &env, bool tryLauchingGitK(const Utils::Environment &env,
const Utils::FilePath &workingDirectory, const Utils::FilePath &workingDirectory,
const QString &fileName, const QString &fileName,
const QString &gitBinDirectory) const; const Utils::FilePath &gitBinDirectory) const;
bool cleanList(const Utils::FilePath &workingDirectory, const QString &modulePath, bool cleanList(const Utils::FilePath &workingDirectory, const QString &modulePath,
const QString &flag, QStringList *files, QString *errorMessage); const QString &flag, QStringList *files, QString *errorMessage);