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

Cvs: Remove some unneeded indirections

Browse Source 
Change-Id: Ia2265d1a46c6141b1412f65d9548e3ad04f6a6a8
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
hjk
2020-01-24 12:25:15 +01:00
parent 6eb3fa4580
commit 4f8f156aa1
1 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/plugins/cvs/cvsplugin.cpp
View File

@@ -221,7 +221,7 @@ CvsPluginPrivate::CvsPluginPrivate()
m_client = new CvsClient(&m_settings); m_client = new CvsClient(&m_settings);
new SettingsPage(versionControl(), &m_settings, this); new SettingsPage(vcsCtrl, &m_settings, this);
new VcsSubmitEditorFactory(&submitParameters, new VcsSubmitEditorFactory(&submitParameters,
[]() { return new CvsSubmitEditor(&submitParameters); }, this); []() { return new CvsSubmitEditor(&submitParameters); }, this);
@@ -449,7 +449,7 @@ bool CvsPluginPrivate::submitEditorAboutToClose()
// Prompt user. Force a prompt unless submit was actually invoked (that // Prompt user. Force a prompt unless submit was actually invoked (that
// is, the editor was closed or shutdown). // is, the editor was closed or shutdown).
const VcsBaseSubmitEditor::PromptSubmitResult answer = editor->promptSubmit( const VcsBaseSubmitEditor::PromptSubmitResult answer = editor->promptSubmit(
this, client()->settings().boolPointer(CvsSettings::promptOnSubmitKey), this, m_settings.boolPointer(CvsSettings::promptOnSubmitKey),
!m_submitActionTriggered); !m_submitActionTriggered);
m_submitActionTriggered = false; m_submitActionTriggered = false;
switch (answer) { switch (answer) {
@@ -556,7 +556,7 @@ void CvsPluginPrivate::revertAll()
QStringList args; QStringList args;
args << QLatin1String("update") << QLatin1String("-C") << state.topLevel(); args << QLatin1String("update") << QLatin1String("-C") << state.topLevel();
const CvsResponse revertResponse = const CvsResponse revertResponse =
runCvs(state.topLevel(), args, client()->vcsTimeoutS(), runCvs(state.topLevel(), args, m_client->vcsTimeoutS(),
VcsCommand::SshPasswordPrompt | VcsCommand::ShowStdOut); VcsCommand::SshPasswordPrompt | VcsCommand::ShowStdOut);
if (revertResponse.result == CvsResponse::Ok) if (revertResponse.result == CvsResponse::Ok)
cvsVersionControl()->emitRepositoryChanged(state.topLevel()); cvsVersionControl()->emitRepositoryChanged(state.topLevel());
@@ -572,7 +572,7 @@ void CvsPluginPrivate::revertCurrentFile()
QStringList args; QStringList args;
args << QLatin1String("diff") << state.relativeCurrentFile(); args << QLatin1String("diff") << state.relativeCurrentFile();
const CvsResponse diffResponse = const CvsResponse diffResponse =
runCvs(state.currentFileTopLevel(), args, client()->vcsTimeoutS(), 0); runCvs(state.currentFileTopLevel(), args, m_client->vcsTimeoutS(), 0);
switch (diffResponse.result) { switch (diffResponse.result) {
case CvsResponse::Ok: case CvsResponse::Ok:
return; // Not modified, diff exit code 0 return; // Not modified, diff exit code 0
@@ -594,7 +594,7 @@ void CvsPluginPrivate::revertCurrentFile()
args.clear(); args.clear();
args << QLatin1String("update") << QLatin1String("-C") << state.relativeCurrentFile(); args << QLatin1String("update") << QLatin1String("-C") << state.relativeCurrentFile();
const CvsResponse revertResponse = const CvsResponse revertResponse =
runCvs(state.currentFileTopLevel(), args, client()->vcsTimeoutS(), runCvs(state.currentFileTopLevel(), args, m_client->vcsTimeoutS(),
VcsCommand::SshPasswordPrompt | VcsCommand::ShowStdOut); VcsCommand::SshPasswordPrompt | VcsCommand::ShowStdOut);
if (revertResponse.result == CvsResponse::Ok) if (revertResponse.result == CvsResponse::Ok)
cvsVersionControl()->emitFilesChanged(QStringList(state.currentFile())); cvsVersionControl()->emitFilesChanged(QStringList(state.currentFile()));
@@ -659,7 +659,7 @@ void CvsPluginPrivate::startCommit(const QString &workingDir, const QString &fil
// where we are, so, have stdout/stderr channels merged. // where we are, so, have stdout/stderr channels merged.
QStringList args = QStringList(QLatin1String("status")); QStringList args = QStringList(QLatin1String("status"));
const CvsResponse response = const CvsResponse response =
runCvs(workingDir, args, client()->vcsTimeoutS(), VcsCommand::MergeOutputChannels); runCvs(workingDir, args, m_client->vcsTimeoutS(), VcsCommand::MergeOutputChannels);
if (response.result != CvsResponse::Ok) if (response.result != CvsResponse::Ok)
return; return;
// Get list of added/modified/deleted files and purge out undesired ones // Get list of added/modified/deleted files and purge out undesired ones
@@ -705,7 +705,7 @@ bool CvsPluginPrivate::commit(const QString &messageFile,
args << QLatin1String("-F") << messageFile; args << QLatin1String("-F") << messageFile;
args.append(fileList); args.append(fileList);
const CvsResponse response = const CvsResponse response =
runCvs(m_commitRepository, args, 10 * client()->vcsTimeoutS(), runCvs(m_commitRepository, args, 10 * m_client->vcsTimeoutS(),
VcsCommand::SshPasswordPrompt | VcsCommand::ShowStdOut); VcsCommand::SshPasswordPrompt | VcsCommand::ShowStdOut);
return response.result == CvsResponse::Ok ; return response.result == CvsResponse::Ok ;
} }
@@ -743,7 +743,7 @@ void CvsPluginPrivate::filelog(const QString &workingDir,
args << QLatin1String("log"); args << QLatin1String("log");
args.append(file); args.append(file);
const CvsResponse response = const CvsResponse response =
runCvs(workingDir, args, client()->vcsTimeoutS(), runCvs(workingDir, args, m_client->vcsTimeoutS(),
VcsCommand::SshPasswordPrompt, codec); VcsCommand::SshPasswordPrompt, codec);
if (response.result != CvsResponse::Ok) if (response.result != CvsResponse::Ok)
return; return;
@@ -784,7 +784,7 @@ bool CvsPluginPrivate::update(const QString &topLevel, const QString &file)
if (!file.isEmpty()) if (!file.isEmpty())
args.append(file); args.append(file);
const CvsResponse response = const CvsResponse response =
runCvs(topLevel, args, 10 * client()->vcsTimeoutS(), runCvs(topLevel, args, 10 * m_client->vcsTimeoutS(),
VcsCommand::SshPasswordPrompt | VcsCommand::ShowStdOut); VcsCommand::SshPasswordPrompt | VcsCommand::ShowStdOut);
const bool ok = response.result == CvsResponse::Ok; const bool ok = response.result == CvsResponse::Ok;
if (ok) if (ok)
@@ -831,7 +831,7 @@ bool CvsPluginPrivate::edit(const QString &topLevel, const QStringList &files)
QStringList args(QLatin1String("edit")); QStringList args(QLatin1String("edit"));
args.append(files); args.append(files);
const CvsResponse response = const CvsResponse response =
runCvs(topLevel, args, client()->vcsTimeoutS(), runCvs(topLevel, args, m_client->vcsTimeoutS(),
VcsCommand::ShowStdOut | VcsCommand::SshPasswordPrompt); VcsCommand::ShowStdOut | VcsCommand::SshPasswordPrompt);
return response.result == CvsResponse::Ok; return response.result == CvsResponse::Ok;
} }
@@ -843,7 +843,7 @@ bool CvsPluginPrivate::diffCheckModified(const QString &topLevel, const QStringL
QStringList args(QLatin1String("-q")); QStringList args(QLatin1String("-q"));
args << QLatin1String("diff"); args << QLatin1String("diff");
args.append(files); args.append(files);
const CvsResponse response = runCvs(topLevel, args, client()->vcsTimeoutS(), 0); const CvsResponse response = runCvs(topLevel, args, m_client->vcsTimeoutS(), 0);
if (response.result == CvsResponse::OtherError) if (response.result == CvsResponse::OtherError)
return false; return false;
*modified = response.result == CvsResponse::NonNullExitCode; *modified = response.result == CvsResponse::NonNullExitCode;
@@ -871,7 +871,7 @@ bool CvsPluginPrivate::unedit(const QString &topLevel, const QStringList &files)
args.append(QLatin1String("-y")); args.append(QLatin1String("-y"));
args.append(files); args.append(files);
const CvsResponse response = const CvsResponse response =
runCvs(topLevel, args, client()->vcsTimeoutS(), runCvs(topLevel, args, m_client->vcsTimeoutS(),
VcsCommand::ShowStdOut | VcsCommand::SshPasswordPrompt); VcsCommand::ShowStdOut | VcsCommand::SshPasswordPrompt);
return response.result == CvsResponse::Ok; return response.result == CvsResponse::Ok;
} }
@@ -890,7 +890,7 @@ void CvsPluginPrivate::annotate(const QString &workingDir, const QString &file,
args << QLatin1String("-r") << revision; args << QLatin1String("-r") << revision;
args << file; args << file;
const CvsResponse response = const CvsResponse response =
runCvs(workingDir, args, client()->vcsTimeoutS(), runCvs(workingDir, args, m_client->vcsTimeoutS(),
VcsCommand::SshPasswordPrompt, codec); VcsCommand::SshPasswordPrompt, codec);
if (response.result != CvsResponse::Ok) if (response.result != CvsResponse::Ok)
return; return;
@@ -919,7 +919,7 @@ bool CvsPluginPrivate::status(const QString &topLevel, const QString &file, cons
if (!file.isEmpty()) if (!file.isEmpty())
args.append(file); args.append(file);
const CvsResponse response = const CvsResponse response =
runCvs(topLevel, args, client()->vcsTimeoutS(), 0); runCvs(topLevel, args, m_client->vcsTimeoutS(), 0);
const bool ok = response.result == CvsResponse::Ok; const bool ok = response.result == CvsResponse::Ok;
if (ok) if (ok)
showOutputInEditor(title, response.stdOut, OtherContent, topLevel, nullptr); showOutputInEditor(title, response.stdOut, OtherContent, topLevel, nullptr);
@@ -993,7 +993,7 @@ bool CvsPluginPrivate::describe(const QString &toplevel, const QString &file, co
QStringList args; QStringList args;
args << QLatin1String("log") << (QLatin1String("-r") + changeNr) << file; args << QLatin1String("log") << (QLatin1String("-r") + changeNr) << file;
const CvsResponse logResponse = const CvsResponse logResponse =
runCvs(toplevel, args, client()->vcsTimeoutS(), VcsCommand::SshPasswordPrompt); runCvs(toplevel, args, m_client->vcsTimeoutS(), VcsCommand::SshPasswordPrompt);
if (logResponse.result != CvsResponse::Ok) { if (logResponse.result != CvsResponse::Ok) {
*errorMessage = logResponse.message; *errorMessage = logResponse.message;
return false; return false;
@@ -1003,7 +1003,7 @@ bool CvsPluginPrivate::describe(const QString &toplevel, const QString &file, co
*errorMessage = msgLogParsingFailed(); *errorMessage = msgLogParsingFailed();
return false; return false;
} }
if (client()->settings().boolValue(CvsSettings::describeByCommitIdKey)) { if (m_settings.boolValue(CvsSettings::describeByCommitIdKey)) {
// Run a log command over the repo, filtering by the commit date // Run a log command over the repo, filtering by the commit date
// and commit id, collecting all files touched by the commit. // and commit id, collecting all files touched by the commit.
const QString commitId = fileLog.front().revisions.front().commitId; const QString commitId = fileLog.front().revisions.front().commitId;
@@ -1015,7 +1015,7 @@ bool CvsPluginPrivate::describe(const QString &toplevel, const QString &file, co
args << QLatin1String("log") << QLatin1String("-d") << (dateS + QLatin1Char('<') + nextDayS); args << QLatin1String("log") << QLatin1String("-d") << (dateS + QLatin1Char('<') + nextDayS);
const CvsResponse repoLogResponse = const CvsResponse repoLogResponse =
runCvs(toplevel, args, 10 * client()->vcsTimeoutS(), VcsCommand::SshPasswordPrompt); runCvs(toplevel, args, 10 * m_client->vcsTimeoutS(), VcsCommand::SshPasswordPrompt);
if (repoLogResponse.result != CvsResponse::Ok) { if (repoLogResponse.result != CvsResponse::Ok) {
*errorMessage = repoLogResponse.message; *errorMessage = repoLogResponse.message;
return false; return false;
@@ -1052,7 +1052,7 @@ bool CvsPluginPrivate::describe(const QString &repositoryPath,
QStringList args(QLatin1String("log")); QStringList args(QLatin1String("log"));
args << (QLatin1String("-r") + it->revisions.front().revision) << it->file; args << (QLatin1String("-r") + it->revisions.front().revision) << it->file;
const CvsResponse logResponse = const CvsResponse logResponse =
runCvs(repositoryPath, args, client()->vcsTimeoutS(), VcsCommand::SshPasswordPrompt); runCvs(repositoryPath, args, m_client->vcsTimeoutS(), VcsCommand::SshPasswordPrompt);
if (logResponse.result != CvsResponse::Ok) { if (logResponse.result != CvsResponse::Ok) {
*errorMessage = logResponse.message; *errorMessage = logResponse.message;
return false; return false;
@@ -1065,11 +1065,11 @@ bool CvsPluginPrivate::describe(const QString &repositoryPath,
if (!isFirstRevision(revision)) { if (!isFirstRevision(revision)) {
const QString previousRev = previousRevision(revision); const QString previousRev = previousRevision(revision);
QStringList args(QLatin1String("diff")); QStringList args(QLatin1String("diff"));
args << client()->settings().stringValue(CvsSettings::diffOptionsKey) args << m_settings.stringValue(CvsSettings::diffOptionsKey)
<< QLatin1String("-r") << previousRev << QLatin1String("-r") << QLatin1String("-r") << previousRev << QLatin1String("-r")
<< it->revisions.front().revision << it->file; << it->revisions.front().revision << it->file;
const CvsResponse diffResponse = const CvsResponse diffResponse =
runCvs(repositoryPath, args, client()->vcsTimeoutS(), 0, codec); runCvs(repositoryPath, args, m_client->vcsTimeoutS(), 0, codec);
switch (diffResponse.result) { switch (diffResponse.result) {
case CvsResponse::Ok: case CvsResponse::Ok:
case CvsResponse::NonNullExitCode: // Diff exit code != 0 case CvsResponse::NonNullExitCode: // Diff exit code != 0
@@ -1117,7 +1117,7 @@ CvsResponse CvsPluginPrivate::runCvs(const QString &workingDirectory,
unsigned flags, unsigned flags,
QTextCodec *outputCodec) const QTextCodec *outputCodec) const
{ {
const FilePath executable = client()->vcsBinary(); const FilePath executable = m_client->vcsBinary();
CvsResponse response; CvsResponse response;
if (executable.isEmpty()) { if (executable.isEmpty()) {
response.result = CvsResponse::OtherError; response.result = CvsResponse::OtherError;
@@ -1126,7 +1126,7 @@ CvsResponse CvsPluginPrivate::runCvs(const QString &workingDirectory,
} }
// Run, connect stderr to the output window // Run, connect stderr to the output window
const SynchronousProcessResponse sp_resp = const SynchronousProcessResponse sp_resp =
runVcs(workingDirectory, {executable, client()->settings().addOptions(arguments)}, runVcs(workingDirectory, {executable, m_settings.addOptions(arguments)},
timeOutS, flags, outputCodec); timeOutS, flags, outputCodec);
response.result = CvsResponse::OtherError; response.result = CvsResponse::OtherError;
@@ -1185,7 +1185,7 @@ bool CvsPluginPrivate::vcsAdd(const QString &workingDir, const QString &rawFileN
QStringList args; QStringList args;
args << QLatin1String("add") << rawFileName; args << QLatin1String("add") << rawFileName;
const CvsResponse response = const CvsResponse response =
runCvs(workingDir, args, client()->vcsTimeoutS(), runCvs(workingDir, args, m_client->vcsTimeoutS(),
VcsCommand::SshPasswordPrompt | VcsCommand::ShowStdOut); VcsCommand::SshPasswordPrompt | VcsCommand::ShowStdOut);
return response.result == CvsResponse::Ok; return response.result == CvsResponse::Ok;
} }
@@ -1195,7 +1195,7 @@ bool CvsPluginPrivate::vcsDelete(const QString &workingDir, const QString &rawFi
QStringList args; QStringList args;
args << QLatin1String("remove") << QLatin1String("-f") << rawFileName; args << QLatin1String("remove") << QLatin1String("-f") << rawFileName;
const CvsResponse response = const CvsResponse response =
runCvs(workingDir, args, client()->vcsTimeoutS(), runCvs(workingDir, args, m_client->vcsTimeoutS(),
VcsCommand::SshPasswordPrompt | VcsCommand::ShowStdOut); VcsCommand::SshPasswordPrompt | VcsCommand::ShowStdOut);
return response.result == CvsResponse::Ok; return response.result == CvsResponse::Ok;
} }
@@ -1236,7 +1236,7 @@ bool CvsPluginPrivate::managesFile(const QString &workingDirectory, const QStrin
QStringList args; QStringList args;
args << QLatin1String("status") << fileName; args << QLatin1String("status") << fileName;
const CvsResponse response = const CvsResponse response =
runCvs(workingDirectory, args, client()->vcsTimeoutS(), VcsCommand::SshPasswordPrompt); runCvs(workingDirectory, args, m_client->vcsTimeoutS(), VcsCommand::SshPasswordPrompt);
if (response.result != CvsResponse::Ok) if (response.result != CvsResponse::Ok)
return false; return false;
return !response.stdOut.contains(QLatin1String("Status: Unknown")); return !response.stdOut.contains(QLatin1String("Status: Unknown"));