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

VcsBase: Move RunFlags into separate header

Browse Source 
It is going to be used outside of VcsCommand, too.
Use RunFlags enum as an argument to several functions
instead of unsigned.

Change-Id: I355c80a845a9b5982108fbde3412754392dce702
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Jarek Kobus
2022-10-05 19:08:53 +02:00
parent 3811236903
commit eec0679234
20 changed files with 196 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/vcsbase/vcscommand.h
View File

@@ -4,6 +4,7 @@
#pragma once
#include "vcsbase_global.h"
#include "vcsenums.h"
#include <utils/filepath.h>
#include <utils/processenums.h>
@@ -81,21 +82,6 @@ class VCSBASE_EXPORT VcsCommand final : public QObject
Q_OBJECT
public:
// Convenience to synchronously run commands
enum RunFlags {
ShowStdOut = 0x1, // Show standard output.
MergeOutputChannels = 0x2, // see QProcess: Merge stderr/stdout.
SuppressStdErr = 0x4, // Suppress standard error output.
SuppressFailMessage = 0x8, // No message about command failure.
SuppressCommandLogging = 0x10, // No command log entry.
ShowSuccessMessage = 0x20, // Show message about successful completion of command.
ForceCLocale = 0x40, // Force C-locale for commands whose output is parsed.
SilentOutput = 0x80, // Suppress user notifications about the output happening.
UseEventLoop = 0x100, // Use event loop when executed in UI thread.
ExpectRepoChanges = 0x200, // Expect changes in repository by the command
NoOutput = SuppressStdErr | SuppressFailMessage | SuppressCommandLogging
};
VcsCommand(const Utils::FilePath &workingDirectory, const Utils::Environment &environment);
~VcsCommand() override;
@@ -106,7 +92,7 @@ public:
const Utils::ExitCodeInterpreter &interpreter = {});
void start();
void addFlags(unsigned f);
void addFlags(RunFlags f);
void setCodec(QTextCodec *codec);
@@ -115,7 +101,7 @@ public:
static CommandResult runBlocking(const Utils::FilePath &workingDirectory,
const Utils::Environment &environmentconst,
const Utils::CommandLine &command, unsigned flags,
const Utils::CommandLine &command, RunFlags flags,
int timeoutS, QTextCodec *codec);
void cancel();