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

Adapt to upstream changes

Browse Source 
Change-Id: Iaa94ecf5614aa1fa86f288b7db9141efbb06318d
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
Christian Stenger
2022-03-09 08:18:50 +01:00
parent d68b17e7ea
commit 8cec0274a5
2 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
plugins/fossil/fossilclient.cpp
View File

@@ -36,7 +36,9 @@
#include <utils/algorithm.h>
#include <utils/fileutils.h>
#include <utils/hostosinfo.h>
#include <utils/processenums.h>
#include <utils/qtcassert.h>
#include <utils/qtcprocess.h>
#include <utils/utilsicons.h>
#include <QSyntaxHighlighter>
@@ -263,7 +265,7 @@ unsigned int FossilClient::synchronousBinaryVersion() const
QtcProcess proc;
vcsFullySynchronousExec(proc, FilePath(), args);
if (proc.result() != QtcProcess::Finished)
if (proc.result() != ProcessResult::Finished)
return 0;
QString output = proc.stdOut();
@@ -302,7 +304,7 @@ BranchInfo FossilClient::synchronousCurrentBranch(const FilePath &workingDirecto
// First try to get the current branch from the list of open branches
QtcProcess proc;
vcsFullySynchronousExec(proc, workingDirectory, {"branch", "list"});
if (proc.result() != QtcProcess::Finished)
if (proc.result() != ProcessResult::Finished)
return BranchInfo();
const QString output = sanitizeFossilOutput(proc.stdOut());
@@ -314,7 +316,7 @@ BranchInfo FossilClient::synchronousCurrentBranch(const FilePath &workingDirecto
// If not available from open branches, request it from the list of closed branches.
QtcProcess proc;
vcsFullySynchronousExec(proc, workingDirectory, {"branch", "list", "--closed"});
if (proc.result() != QtcProcess::Finished)
if (proc.result() != ProcessResult::Finished)
return BranchInfo();
const QString output = sanitizeFossilOutput(proc.stdOut());
@@ -337,7 +339,7 @@ QList<BranchInfo> FossilClient::synchronousBranchQuery(const FilePath &workingDi
// First get list of open branches
QtcProcess proc;
vcsFullySynchronousExec(proc, workingDirectory, {"branch", "list"});
if (proc.result() != QtcProcess::Finished)
if (proc.result() != ProcessResult::Finished)
return QList<BranchInfo>();
QString output = sanitizeFossilOutput(proc.stdOut());
@@ -345,7 +347,7 @@ QList<BranchInfo> FossilClient::synchronousBranchQuery(const FilePath &workingDi
// Append a list of closed branches.
vcsFullySynchronousExec(proc, workingDirectory, {"branch", "list", "--closed"});
if (proc.result() != QtcProcess::Finished)
if (proc.result() != ProcessResult::Finished)
return QList<BranchInfo>();
output = sanitizeFossilOutput(proc.stdOut());
@@ -386,7 +388,7 @@ RevisionInfo FossilClient::synchronousRevisionQuery(const FilePath &workingDirec
QtcProcess proc;
vcsFullySynchronousExec(proc, workingDirectory, args, ShellCommand::SuppressCommandLogging);
if (proc.result() != QtcProcess::Finished)
if (proc.result() != ProcessResult::Finished)
return RevisionInfo();
const QString output = sanitizeFossilOutput(proc.stdOut());
@@ -450,7 +452,7 @@ QStringList FossilClient::synchronousTagQuery(const FilePath &workingDirectory,
QtcProcess proc;
vcsFullySynchronousExec(proc, workingDirectory, args);
if (proc.result() != QtcProcess::Finished)
if (proc.result() != ProcessResult::Finished)
return QStringList();
const QString output = sanitizeFossilOutput(proc.stdOut());
@@ -473,7 +475,7 @@ RepositorySettings FossilClient::synchronousSettingsQuery(const FilePath &workin
QtcProcess proc;
vcsFullySynchronousExec(proc, workingDirectory, args);
if (proc.result() != QtcProcess::Finished)
if (proc.result() != ProcessResult::Finished)
return RepositorySettings();
const QString output = sanitizeFossilOutput(proc.stdOut());
@@ -528,7 +530,7 @@ bool FossilClient::synchronousSetSetting(const FilePath &workingDirectory,
QtcProcess proc;
vcsFullySynchronousExec(proc, workingDirectory, args);
return (proc.result() == QtcProcess::Finished);
return (proc.result() == ProcessResult::Finished);
}
@@ -585,7 +587,7 @@ QString FossilClient::synchronousUserDefaultQuery(const FilePath &workingDirecto
QtcProcess proc;
vcsFullySynchronousExec(proc, workingDirectory, args);
if (proc.result() != QtcProcess::Finished)
if (proc.result() != ProcessResult::Finished)
return QString();
QString output = sanitizeFossilOutput(proc.stdOut());
@@ -602,7 +604,7 @@ bool FossilClient::synchronousSetUserDefault(const FilePath &workingDirectory, c
const QStringList args({"user", "default", userName, "--user", userName});
QtcProcess proc;
vcsFullySynchronousExec(proc, workingDirectory, args);
return (proc.result() == QtcProcess::Finished);
return (proc.result() == ProcessResult::Finished);
}
QString FossilClient::synchronousGetRepositoryURL(const FilePath &workingDirectory)
@@ -614,7 +616,7 @@ QString FossilClient::synchronousGetRepositoryURL(const FilePath &workingDirecto
QtcProcess proc;
vcsFullySynchronousExec(proc, workingDirectory, args);
if (proc.result() != QtcProcess::Finished)
if (proc.result() != ProcessResult::Finished)
return QString();
QString output = sanitizeFossilOutput(proc.stdOut());
@@ -668,7 +670,7 @@ bool FossilClient::synchronousCreateRepository(const FilePath &workingDirectory,
args << extraOptions << repoFilePath.toUserOutput();
QtcProcess proc;
vcsFullySynchronousExec(proc, workingDirectory, args);
if (proc.result() != QtcProcess::Finished)
if (proc.result() != ProcessResult::Finished)
return false;
QString output = sanitizeFossilOutput(proc.stdOut());
@@ -681,7 +683,7 @@ bool FossilClient::synchronousCreateRepository(const FilePath &workingDirectory,
args << "open" << repoFilePath.toUserOutput();
vcsFullySynchronousExec(proc, workingDirectory, args);
if (proc.result() != QtcProcess::Finished)
if (proc.result() != ProcessResult::Finished)
return false;
output = sanitizeFossilOutput(proc.stdOut());
@@ -695,7 +697,7 @@ bool FossilClient::synchronousCreateRepository(const FilePath &workingDirectory,
args << "user" << "default" << adminUser << "--user" << adminUser;
vcsFullySynchronousExec(proc, workingDirectory, args);
if (proc.result() != QtcProcess::Finished)
if (proc.result() != ProcessResult::Finished)
return false;
QString output = sanitizeFossilOutput(proc.stdOut());
@@ -722,7 +724,7 @@ bool FossilClient::synchronousMove(const FilePath &workingDir,
args << extraOptions << from << to;
QtcProcess proc;
vcsFullySynchronousExec(proc, workingDir, args);
return (proc.result() == QtcProcess::Finished);
return (proc.result() == ProcessResult::Finished);
}
bool FossilClient::synchronousPull(const FilePath &workingDir, const QString &srcLocation, const QStringList &extraOptions)
@@ -744,7 +746,7 @@ bool FossilClient::synchronousPull(const FilePath &workingDir, const QString &sr
| VcsBase::VcsCommand::ShowSuccessMessage;
QtcProcess proc;
vcsSynchronousExec(proc, workingDir, args, flags);
const bool success = (proc.result() == QtcProcess::Finished);
const bool success = (proc.result() == ProcessResult::Finished);
if (success)
emit changed(workingDir.toVariant());
return success;
@@ -769,7 +771,7 @@ bool FossilClient::synchronousPush(const FilePath &workingDir, const QString &ds
| VcsBase::VcsCommand::ShowSuccessMessage;
QtcProcess proc;
vcsSynchronousExec(proc, workingDir, args, flags);
return (proc.result() == QtcProcess::Finished);
return (proc.result() == ProcessResult::Finished);
}
void FossilClient::commit(const FilePath &repositoryRoot, const QStringList &files,
@@ -857,7 +859,7 @@ bool FossilClient::managesFile(const FilePath &workingDirectory, const QString &
const QStringList args({"finfo", fileName});
QtcProcess proc;
vcsFullySynchronousExec(proc, workingDirectory, args);
if (proc.result() != QtcProcess::Finished)
if (proc.result() != ProcessResult::Finished)
return false;
QString output = sanitizeFossilOutput(proc.stdOut());
return !output.startsWith("no history for file", Qt::CaseInsensitive);