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

CvsPlugin: Introduce convenient s_defaultFlags variable

Browse Source 
Change-Id: Id87acec45e4822f53d5e1ac78a3485cbe5c2a285
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Jarek Kobus
2022-07-14 00:26:40 +02:00
parent 84de21b702
commit 85bf11a7af
1 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -113,6 +113,8 @@ const char CVS_SUBMIT_MIMETYPE[] = "text/vnd.qtcreator.cvs.submit";
const char CVSCOMMITEDITOR_ID[] = "CVS Commit Editor"; const char CVSCOMMITEDITOR_ID[] = "CVS Commit Editor";
const char CVSCOMMITEDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("VCS", "CVS Commit Editor"); const char CVSCOMMITEDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("VCS", "CVS Commit Editor");
const int s_defaultFlags = ShellCommand::SshPasswordPrompt | ShellCommand::ShowStdOut;
class CvsResponse class CvsResponse
{ {
public: public:
@@ -870,8 +872,8 @@ void CvsPluginPrivate::revertAll()
return; return;
QStringList args; QStringList args;
args << QLatin1String("update") << QLatin1String("-C") << state.topLevel().toString(); args << QLatin1String("update") << QLatin1String("-C") << state.topLevel().toString();
const CvsResponse revertResponse = runCvs(state.topLevel(), args, m_settings.timeout.value(), const auto revertResponse = runCvs(state.topLevel(), args, m_settings.timeout.value(),
ShellCommand::SshPasswordPrompt | ShellCommand::ShowStdOut); s_defaultFlags);
if (revertResponse.result == CvsResponse::Ok) if (revertResponse.result == CvsResponse::Ok)
emit repositoryChanged(state.topLevel()); emit repositoryChanged(state.topLevel());
else else
@@ -907,9 +909,8 @@ void CvsPluginPrivate::revertCurrentFile()
// revert // revert
args.clear(); args.clear();
args << QLatin1String("update") << QLatin1String("-C") << state.relativeCurrentFile(); args << QLatin1String("update") << QLatin1String("-C") << state.relativeCurrentFile();
const CvsResponse revertResponse = const auto revertResponse = runCvs(state.currentFileTopLevel(), args,
runCvs(state.currentFileTopLevel(), args, m_settings.timeout.value(), m_settings.timeout.value(), s_defaultFlags);
ShellCommand::SshPasswordPrompt | ShellCommand::ShowStdOut);
if (revertResponse.result == CvsResponse::Ok) if (revertResponse.result == CvsResponse::Ok)
emit filesChanged(QStringList(state.currentFile())); emit filesChanged(QStringList(state.currentFile()));
} }
@@ -1018,8 +1019,8 @@ bool CvsPluginPrivate::commit(const QString &messageFile,
QStringList args = QStringList(QLatin1String("commit")); QStringList args = QStringList(QLatin1String("commit"));
args << QLatin1String("-F") << messageFile; args << QLatin1String("-F") << messageFile;
args.append(fileList); args.append(fileList);
const CvsResponse response = runCvs(m_commitRepository, args, 10 * m_settings.timeout.value(), const auto response = runCvs(m_commitRepository, args, 10 * m_settings.timeout.value(),
ShellCommand::SshPasswordPrompt | ShellCommand::ShowStdOut); s_defaultFlags);
return response.result == CvsResponse::Ok ; return response.result == CvsResponse::Ok ;
} }
@@ -1096,8 +1097,7 @@ bool CvsPluginPrivate::update(const FilePath &topLevel, const QString &file)
args.push_back(QLatin1String("-dR")); args.push_back(QLatin1String("-dR"));
if (!file.isEmpty()) if (!file.isEmpty())
args.append(file); args.append(file);
const CvsResponse response = runCvs(topLevel, args, 10 * m_settings.timeout.value(), const auto response = runCvs(topLevel, args, 10 * m_settings.timeout.value(), s_defaultFlags);
ShellCommand::SshPasswordPrompt | ShellCommand::ShowStdOut);
const bool ok = response.result == CvsResponse::Ok; const bool ok = response.result == CvsResponse::Ok;
if (ok) if (ok)
emit repositoryChanged(topLevel); emit repositoryChanged(topLevel);
@@ -1142,8 +1142,7 @@ bool CvsPluginPrivate::edit(const FilePath &topLevel, const QStringList &files)
{ {
QStringList args(QLatin1String("edit")); QStringList args(QLatin1String("edit"));
args.append(files); args.append(files);
const CvsResponse response = runCvs(topLevel, args, m_settings.timeout.value(), const auto response = runCvs(topLevel, args, m_settings.timeout.value(), s_defaultFlags);
ShellCommand::ShowStdOut | ShellCommand::SshPasswordPrompt);
return response.result == CvsResponse::Ok; return response.result == CvsResponse::Ok;
} }
@@ -1181,8 +1180,7 @@ bool CvsPluginPrivate::unedit(const FilePath &topLevel, const QStringList &files
if (modified) if (modified)
args.append(QLatin1String("-y")); args.append(QLatin1String("-y"));
args.append(files); args.append(files);
const CvsResponse response = runCvs(topLevel, args, m_settings.timeout.value(), const auto response = runCvs(topLevel, args, m_settings.timeout.value(), s_defaultFlags);
ShellCommand::ShowStdOut | ShellCommand::SshPasswordPrompt);
return response.result == CvsResponse::Ok; return response.result == CvsResponse::Ok;
} }
@@ -1490,8 +1488,7 @@ bool CvsPluginPrivate::vcsAdd(const FilePath &workingDir, const QString &rawFile
{ {
QStringList args; QStringList args;
args << QLatin1String("add") << rawFileName; args << QLatin1String("add") << rawFileName;
const CvsResponse response = runCvs(workingDir, args, m_settings.timeout.value(), const auto response = runCvs(workingDir, args, m_settings.timeout.value(), s_defaultFlags);
ShellCommand::SshPasswordPrompt | ShellCommand::ShowStdOut);
return response.result == CvsResponse::Ok; return response.result == CvsResponse::Ok;
} }
@@ -1499,8 +1496,7 @@ bool CvsPluginPrivate::vcsDelete(const FilePath &workingDir, const QString &rawF
{ {
QStringList args; QStringList args;
args << QLatin1String("remove") << QLatin1String("-f") << rawFileName; args << QLatin1String("remove") << QLatin1String("-f") << rawFileName;
const CvsResponse response = runCvs(workingDir, args, m_settings.timeout.value(), const auto response = runCvs(workingDir, args, m_settings.timeout.value(), s_defaultFlags);
ShellCommand::SshPasswordPrompt | ShellCommand::ShowStdOut);
return response.result == CvsResponse::Ok; return response.result == CvsResponse::Ok;
} }