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

Perforce: Allow delay-created settings

Browse Source 
... in theory. The first argument of the connect() call in
perforceplugin.cpp:555 currently spoils the fun.

Change-Id: I041c7707264d8ba64098c37f8fbb5ee4ea1e1753
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
hjk
2023-08-08 18:18:02 +02:00
parent 130f92c4d9
commit 5a9cc840d5
3 changed files with 67 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

97
src/plugins/perforce/perforceplugin.cpp
View File

@@ -340,9 +340,6 @@ public:
mutable QString m_tempFilePattern; mutable QString m_tempFilePattern;
QAction *m_menuAction = nullptr; QAction *m_menuAction = nullptr;
PerforceSettings m_settings;
PerforceSettingsPage m_settingsPage{&m_settings};
ManagedDirectoryCache m_managedDirectoryCache; ManagedDirectoryCache m_managedDirectoryCache;
VcsSubmitEditorFactory submitEditorFactory { VcsSubmitEditorFactory submitEditorFactory {
@@ -379,8 +376,6 @@ PerforcePluginPrivate::PerforcePluginPrivate()
dd = this; dd = this;
m_settings.readSettings();
const QString prefix = QLatin1String("p4"); const QString prefix = QLatin1String("p4");
m_commandLocator = new CommandLocator("Perforce", prefix, prefix, this); m_commandLocator = new CommandLocator("Perforce", prefix, prefix, this);
m_commandLocator->setDescription(Tr::tr("Triggers a Perforce version control operation.")); m_commandLocator->setDescription(Tr::tr("Triggers a Perforce version control operation."));
@@ -556,8 +551,8 @@ PerforcePluginPrivate::PerforcePluginPrivate()
connect(m_filelogAction, &QAction::triggered, this, &PerforcePluginPrivate::filelogFile); connect(m_filelogAction, &QAction::triggered, this, &PerforcePluginPrivate::filelogFile);
perforceContainer->addAction(command); perforceContainer->addAction(command);
QObject::connect(&m_settings, &AspectContainer::applied, this, [this] { QObject::connect(&settings(), &AspectContainer::applied, this, [this] {
m_settings.clearTopLevel(); settings().clearTopLevel();
applySettings(); applySettings();
}); });
} }
@@ -633,7 +628,7 @@ void PerforcePluginPrivate::diffCurrentProject()
void PerforcePluginPrivate::diffAllOpened() void PerforcePluginPrivate::diffAllOpened()
{ {
p4Diff(m_settings.topLevel(), QStringList()); p4Diff(settings().topLevel(), QStringList());
} }
void PerforcePluginPrivate::updateCurrentProject() void PerforcePluginPrivate::updateCurrentProject()
@@ -645,7 +640,7 @@ void PerforcePluginPrivate::updateCurrentProject()
void PerforcePluginPrivate::updateAll() void PerforcePluginPrivate::updateAll()
{ {
updateCheckout(m_settings.topLevel()); updateCheckout(settings().topLevel());
} }
void PerforcePluginPrivate::revertCurrentProject() void PerforcePluginPrivate::revertCurrentProject()
@@ -695,7 +690,7 @@ void PerforcePluginPrivate::updateCheckout(const FilePath &workingDir, const QSt
void PerforcePluginPrivate::printOpenedFileList() void PerforcePluginPrivate::printOpenedFileList()
{ {
const PerforceResponse perforceResponse = runP4Cmd(m_settings.topLevel(), {"opened"}, const PerforceResponse perforceResponse = runP4Cmd(settings().topLevel(), {"opened"},
CommandToWindow|StdErrToWindow|ErrorToWindow); CommandToWindow|StdErrToWindow|ErrorToWindow);
if (perforceResponse.error || perforceResponse.stdOut.isEmpty()) if (perforceResponse.error || perforceResponse.stdOut.isEmpty())
return; return;
@@ -791,7 +786,7 @@ IEditor *PerforcePluginPrivate::openPerforceSubmitEditor(const QString &fileName
submitEditor->restrictToProjectFiles(depotFileNames); submitEditor->restrictToProjectFiles(depotFileNames);
connect(submitEditor, &VcsBaseSubmitEditor::diffSelectedFiles, connect(submitEditor, &VcsBaseSubmitEditor::diffSelectedFiles,
this, &PerforcePluginPrivate::slotSubmitDiff); this, &PerforcePluginPrivate::slotSubmitDiff);
submitEditor->setCheckScriptWorkingDirectory(m_settings.topLevel()); submitEditor->setCheckScriptWorkingDirectory(settings().topLevel());
return editor; return editor;
} }
@@ -804,7 +799,7 @@ void PerforcePluginPrivate::printPendingChanges()
const int i = dia.changeNumber(); const int i = dia.changeNumber();
QStringList args(QLatin1String("submit")); QStringList args(QLatin1String("submit"));
args << QLatin1String("-c") << QString::number(i); args << QLatin1String("-c") << QString::number(i);
runP4Cmd(m_settings.topLevel(), args, runP4Cmd(settings().topLevel(), args,
CommandToWindow|StdOutToWindow|StdErrToWindow|ErrorToWindow); CommandToWindow|StdOutToWindow|StdErrToWindow|ErrorToWindow);
} }
} }
@@ -893,8 +888,8 @@ void PerforcePluginPrivate::filelog(const FilePath &workingDir, const QString &f
QTextCodec *codec = VcsBaseEditor::getCodec(workingDir, QStringList(fileName)); QTextCodec *codec = VcsBaseEditor::getCodec(workingDir, QStringList(fileName));
QStringList args; QStringList args;
args << QLatin1String("filelog") << QLatin1String("-li"); args << QLatin1String("filelog") << QLatin1String("-li");
if (m_settings.logCount() > 0) if (settings().logCount() > 0)
args << "-m" << QString::number(m_settings.logCount()); args << "-m" << QString::number(settings().logCount());
if (!fileName.isEmpty()) if (!fileName.isEmpty())
args.append(fileName); args.append(fileName);
const PerforceResponse result = runP4Cmd(workingDir, args, const PerforceResponse result = runP4Cmd(workingDir, args,
@@ -915,8 +910,8 @@ void PerforcePluginPrivate::changelists(const FilePath &workingDir, const QStrin
QTextCodec *codec = VcsBaseEditor::getCodec(workingDir, QStringList(fileName)); QTextCodec *codec = VcsBaseEditor::getCodec(workingDir, QStringList(fileName));
QStringList args; QStringList args;
args << QLatin1String("changelists") << QLatin1String("-lit"); args << QLatin1String("changelists") << QLatin1String("-lit");
if (m_settings.logCount() > 0) if (settings().logCount() > 0)
args << "-m" << QString::number(m_settings.logCount()); args << "-m" << QString::number(settings().logCount());
if (!fileName.isEmpty()) if (!fileName.isEmpty())
args.append(fileName); args.append(fileName);
const PerforceResponse result = runP4Cmd(workingDir, args, const PerforceResponse result = runP4Cmd(workingDir, args,
@@ -961,7 +956,7 @@ bool PerforcePluginPrivate::managesDirectory(const FilePath &directory, FilePath
const bool rc = const_cast<PerforcePluginPrivate *>(this)->managesDirectoryFstat(directory); const bool rc = const_cast<PerforcePluginPrivate *>(this)->managesDirectoryFstat(directory);
if (topLevel) { if (topLevel) {
if (rc) if (rc)
*topLevel = m_settings.topLevelSymLinkTarget(); *topLevel = settings().topLevelSymLinkTarget();
else else
topLevel->clear(); topLevel->clear();
} }
@@ -985,20 +980,20 @@ bool PerforcePluginPrivate::managesDirectoryFstat(const FilePath &directory)
setTopLevel(entry.m_topLevel); setTopLevel(entry.m_topLevel);
return entry.m_isManaged; return entry.m_isManaged;
} }
if (!m_settings.isValid()) { if (!settings().isValid()) {
if (m_settings.topLevel().isEmpty()) if (settings().topLevel().isEmpty())
getTopLevel(directory, true); getTopLevel(directory, true);
if (!m_settings.isValid()) if (!settings().isValid())
return false; return false;
} }
// Determine value and insert into cache // Determine value and insert into cache
bool managed = false; bool managed = false;
do { do {
// Quick check: Must be at or below top level and not "../../other_path" // Quick check: Must be at or below top level and not "../../other_path"
const QString relativeDirArgs = m_settings.relativeToTopLevelArguments(directory.toString()); const QString relativeDirArgs = settings().relativeToTopLevelArguments(directory.toString());
if (!relativeDirArgs.isEmpty() && relativeDirArgs.startsWith(QLatin1String(".."))) { if (!relativeDirArgs.isEmpty() && relativeDirArgs.startsWith(QLatin1String(".."))) {
if (!m_settings.defaultEnv()) if (!settings().defaultEnv())
break; break;
else else
getTopLevel(directory, true); getTopLevel(directory, true);
@@ -1006,14 +1001,14 @@ bool PerforcePluginPrivate::managesDirectoryFstat(const FilePath &directory)
// Is it actually managed by perforce? // Is it actually managed by perforce?
QStringList args; QStringList args;
args << QLatin1String("fstat") << QLatin1String("-m1") << perforceRelativeFileArguments(relativeDirArgs); args << QLatin1String("fstat") << QLatin1String("-m1") << perforceRelativeFileArguments(relativeDirArgs);
const PerforceResponse result = runP4Cmd(m_settings.topLevel(), args, const PerforceResponse result = runP4Cmd(settings().topLevel(), args,
RunFullySynchronous); RunFullySynchronous);
managed = result.stdOut.contains(QLatin1String("depotFile")) managed = result.stdOut.contains(QLatin1String("depotFile"))
|| result.stdErr.contains(QLatin1String("... - no such file(s)")); || result.stdErr.contains(QLatin1String("... - no such file(s)"));
} while (false); } while (false);
m_managedDirectoryCache.insert(directory, DirectoryCacheEntry(managed, m_settings.topLevel())); m_managedDirectoryCache.insert(directory, DirectoryCacheEntry(managed, settings().topLevel()));
return managed; return managed;
} }
@@ -1117,7 +1112,7 @@ bool PerforcePluginPrivate::isVcsFileOrDirectory(const FilePath &filePath) const
bool PerforcePluginPrivate::isConfigured() const bool PerforcePluginPrivate::isConfigured() const
{ {
const FilePath binary = m_settings.p4BinaryPath(); const FilePath binary = settings().p4BinaryPath();
return !binary.isEmpty() && binary.isExecutableFile(); return !binary.isEmpty() && binary.isExecutableFile();
} }
@@ -1152,7 +1147,7 @@ bool PerforcePluginPrivate::vcsOpen(const FilePath &filePath)
IVersionControl::SettingsFlags PerforcePluginPrivate::settingsFlags() const IVersionControl::SettingsFlags PerforcePluginPrivate::settingsFlags() const
{ {
SettingsFlags rc; SettingsFlags rc;
if (m_settings.autoOpen()) if (settings().autoOpen())
rc |= AutoOpen; rc |= AutoOpen;
return rc; return rc;
} }
@@ -1228,7 +1223,7 @@ PerforceResponse PerforcePluginPrivate::synchronousProcess(const FilePath &worki
// Run, connect stderr to the output window // Run, connect stderr to the output window
Process process; Process process;
const int timeOutS = (flags & LongTimeOut) ? m_settings.longTimeOutS() : m_settings.timeOutS(); const int timeOutS = (flags & LongTimeOut) ? settings().longTimeOutS() : settings().timeOutS();
process.setTimeoutS(timeOutS); process.setTimeoutS(timeOutS);
if (outputCodec) if (outputCodec)
process.setCodec(outputCodec); process.setCodec(outputCodec);
@@ -1249,7 +1244,7 @@ PerforceResponse PerforcePluginPrivate::synchronousProcess(const FilePath &worki
process.setStdOutCallback([](const QString &lines) { VcsOutputWindow::append(lines); }); process.setStdOutCallback([](const QString &lines) { VcsOutputWindow::append(lines); });
} }
process.setTimeOutMessageBoxEnabled(true); process.setTimeOutMessageBoxEnabled(true);
process.setCommand({m_settings.p4BinaryPath(), args}); process.setCommand({settings().p4BinaryPath(), args});
process.runBlocking(EventLoopMode::On); process.runBlocking(EventLoopMode::On);
PerforceResponse response; PerforceResponse response;
@@ -1269,7 +1264,7 @@ PerforceResponse PerforcePluginPrivate::synchronousProcess(const FilePath &worki
response.message = msgCrash(); response.message = msgCrash();
break; break;
case ProcessResult::StartFailed: case ProcessResult::StartFailed:
response.message = msgNotStarted(m_settings.p4BinaryPath()); response.message = msgNotStarted(settings().p4BinaryPath());
break; break;
case ProcessResult::Hang: case ProcessResult::Hang:
response.message = msgCrash(); response.message = msgCrash();
@@ -1293,19 +1288,19 @@ PerforceResponse PerforcePluginPrivate::fullySynchronousProcess(const FilePath &
process.setWorkingDirectory(workingDir); process.setWorkingDirectory(workingDir);
PerforceResponse response; PerforceResponse response;
process.setCommand({m_settings.p4BinaryPath(), args}); process.setCommand({settings().p4BinaryPath(), args});
process.setWriteData(stdInput); process.setWriteData(stdInput);
process.start(); process.start();
if (!process.waitForStarted(3000)) { if (!process.waitForStarted(3000)) {
response.error = true; response.error = true;
response.message = msgNotStarted(m_settings.p4BinaryPath()); response.message = msgNotStarted(settings().p4BinaryPath());
return response; return response;
} }
QByteArray stdOut; QByteArray stdOut;
QByteArray stdErr; QByteArray stdErr;
const int timeOutS = (flags & LongTimeOut) ? m_settings.longTimeOutS() : m_settings.timeOutS(); const int timeOutS = (flags & LongTimeOut) ? settings().longTimeOutS() : settings().timeOutS();
if (!process.readDataFromProcess(&stdOut, &stdErr, timeOutS)) { if (!process.readDataFromProcess(&stdOut, &stdErr, timeOutS)) {
process.stop(); process.stop();
process.waitForFinished(); process.waitForFinished();
@@ -1341,14 +1336,14 @@ PerforceResponse PerforcePluginPrivate::runP4Cmd(const FilePath &workingDir,
const QByteArray &stdInput, const QByteArray &stdInput,
QTextCodec *outputCodec) const QTextCodec *outputCodec) const
{ {
if (!m_settings.isValid()) { if (!settings().isValid()) {
PerforceResponse invalidConfigResponse; PerforceResponse invalidConfigResponse;
invalidConfigResponse.error = true; invalidConfigResponse.error = true;
invalidConfigResponse.message = Tr::tr("Perforce is not correctly configured."); invalidConfigResponse.message = Tr::tr("Perforce is not correctly configured.");
VcsOutputWindow::appendError(invalidConfigResponse.message); VcsOutputWindow::appendError(invalidConfigResponse.message);
return invalidConfigResponse; return invalidConfigResponse;
} }
QStringList actualArgs = m_settings.commonP4Arguments(workingDir.toString()); QStringList actualArgs = settings().commonP4Arguments(workingDir.toString());
QString errorMessage; QString errorMessage;
QSharedPointer<TempFileSaver> tempFile = createTemporaryArgumentFile(extraArgs, &errorMessage); QSharedPointer<TempFileSaver> tempFile = createTemporaryArgumentFile(extraArgs, &errorMessage);
if (!tempFile.isNull()) { if (!tempFile.isNull()) {
@@ -1362,7 +1357,7 @@ PerforceResponse PerforcePluginPrivate::runP4Cmd(const FilePath &workingDir,
actualArgs.append(args); actualArgs.append(args);
if (flags & CommandToWindow) if (flags & CommandToWindow)
VcsOutputWindow::appendCommand(workingDir, {m_settings.p4BinaryPath(), actualArgs}); VcsOutputWindow::appendCommand(workingDir, {settings().p4BinaryPath(), actualArgs});
if (flags & ShowBusyCursor) if (flags & ShowBusyCursor)
QGuiApplication::setOverrideCursor(QCursor(Qt::WaitCursor)); QGuiApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
@@ -1410,7 +1405,7 @@ IEditor *PerforcePluginPrivate::showOutputInEditor(const QString &title,
void PerforcePluginPrivate::slotSubmitDiff(const QStringList &files) void PerforcePluginPrivate::slotSubmitDiff(const QStringList &files)
{ {
p4Diff(m_settings.topLevel(), files); p4Diff(settings().topLevel(), files);
} }
// Parameter widget controlling whitespace diff mode, associated with a parameter // Parameter widget controlling whitespace diff mode, associated with a parameter
@@ -1525,7 +1520,7 @@ void PerforcePluginPrivate::vcsDescribe(const FilePath &source, const QString &n
: VcsBaseEditor::getCodec(source); : VcsBaseEditor::getCodec(source);
QStringList args; QStringList args;
args << QLatin1String("describe") << QLatin1String("-du") << n; args << QLatin1String("describe") << QLatin1String("-du") << n;
const PerforceResponse result = runP4Cmd(m_settings.topLevel(), args, CommandToWindow|StdErrToWindow|ErrorToWindow, const PerforceResponse result = runP4Cmd(settings().topLevel(), args, CommandToWindow|StdErrToWindow|ErrorToWindow,
{}, {}, codec); {}, {}, codec);
if (!result.error) if (!result.error)
showOutputInEditor(Tr::tr("p4 describe %1").arg(n), result.stdOut, diffEditorParameters.id, source, codec); showOutputInEditor(Tr::tr("p4 describe %1").arg(n), result.stdOut, diffEditorParameters.id, source, codec);
@@ -1565,7 +1560,7 @@ bool PerforcePluginPrivate::activateCommit()
QStringList submitArgs; QStringList submitArgs;
submitArgs << QLatin1String("submit") << QLatin1String("-i"); submitArgs << QLatin1String("submit") << QLatin1String("-i");
const PerforceResponse submitResponse = runP4Cmd(m_settings.topLevelSymLinkTarget(), submitArgs, const PerforceResponse submitResponse = runP4Cmd(settings().topLevelSymLinkTarget(), submitArgs,
LongTimeOut|RunFullySynchronous|CommandToWindow|StdErrToWindow|ErrorToWindow|ShowBusyCursor, LongTimeOut|RunFullySynchronous|CommandToWindow|StdErrToWindow|ErrorToWindow|ShowBusyCursor,
{}, reader.data()); {}, reader.data());
if (submitResponse.error) { if (submitResponse.error) {
@@ -1582,11 +1577,11 @@ bool PerforcePluginPrivate::activateCommit()
QString PerforcePluginPrivate::clientFilePath(const QString &serverFilePath) QString PerforcePluginPrivate::clientFilePath(const QString &serverFilePath)
{ {
QTC_ASSERT(m_settings.isValid(), return QString()); QTC_ASSERT(settings().isValid(), return QString());
QStringList args; QStringList args;
args << QLatin1String("fstat") << serverFilePath; args << QLatin1String("fstat") << serverFilePath;
const PerforceResponse response = runP4Cmd(m_settings.topLevelSymLinkTarget(), args, const PerforceResponse response = runP4Cmd(settings().topLevelSymLinkTarget(), args,
ShowBusyCursor|RunFullySynchronous|CommandToWindow|StdErrToWindow|ErrorToWindow); ShowBusyCursor|RunFullySynchronous|CommandToWindow|StdErrToWindow|ErrorToWindow);
if (response.error) if (response.error)
return {}; return {};
@@ -1598,10 +1593,10 @@ QString PerforcePluginPrivate::clientFilePath(const QString &serverFilePath)
QString PerforcePluginPrivate::pendingChangesData() QString PerforcePluginPrivate::pendingChangesData()
{ {
QTC_ASSERT(m_settings.isValid(), return QString()); QTC_ASSERT(settings().isValid(), return QString());
QStringList args = QStringList(QLatin1String("info")); QStringList args = QStringList(QLatin1String("info"));
const PerforceResponse userResponse = runP4Cmd(m_settings.topLevelSymLinkTarget(), args, const PerforceResponse userResponse = runP4Cmd(settings().topLevelSymLinkTarget(), args,
RunFullySynchronous|CommandToWindow|StdErrToWindow|ErrorToWindow); RunFullySynchronous|CommandToWindow|StdErrToWindow|ErrorToWindow);
if (userResponse.error) if (userResponse.error)
return {}; return {};
@@ -1614,7 +1609,7 @@ QString PerforcePluginPrivate::pendingChangesData()
return {}; return {};
args.clear(); args.clear();
args << QLatin1String("changes") << QLatin1String("-s") << QLatin1String("pending") << QLatin1String("-u") << user; args << QLatin1String("changes") << QLatin1String("-s") << QLatin1String("pending") << QLatin1String("-u") << user;
const PerforceResponse dataResponse = runP4Cmd(m_settings.topLevelSymLinkTarget(), args, const PerforceResponse dataResponse = runP4Cmd(settings().topLevelSymLinkTarget(), args,
RunFullySynchronous|CommandToWindow|StdErrToWindow|ErrorToWindow); RunFullySynchronous|CommandToWindow|StdErrToWindow|ErrorToWindow);
return dataResponse.error ? QString() : dataResponse.stdOut; return dataResponse.error ? QString() : dataResponse.stdOut;
} }
@@ -1641,7 +1636,7 @@ QString PerforcePlugin::fileNameFromPerforceName(const QString& perforceName,
unsigned flags = RunFullySynchronous; unsigned flags = RunFullySynchronous;
if (!quiet) if (!quiet)
flags |= CommandToWindow|StdErrToWindow|ErrorToWindow; flags |= CommandToWindow|StdErrToWindow|ErrorToWindow;
const PerforceResponse response = dd->runP4Cmd(dd->m_settings.topLevelSymLinkTarget(), args, flags); const PerforceResponse response = dd->runP4Cmd(settings().topLevelSymLinkTarget(), args, flags);
if (response.error) { if (response.error) {
*errorMessage = msgWhereFailed(perforceName, response.message); *errorMessage = msgWhereFailed(perforceName, response.message);
return {}; return {};
@@ -1659,15 +1654,15 @@ QString PerforcePlugin::fileNameFromPerforceName(const QString& perforceName,
return {}; return {};
} }
const QString p4fileSpec = output.mid(output.lastIndexOf(QLatin1Char(' ')) + 1); const QString p4fileSpec = output.mid(output.lastIndexOf(QLatin1Char(' ')) + 1);
return dd->m_settings.mapToFileSystem(p4fileSpec); return settings().mapToFileSystem(p4fileSpec);
} }
void PerforcePluginPrivate::setTopLevel(const FilePath &topLevel) void PerforcePluginPrivate::setTopLevel(const FilePath &topLevel)
{ {
if (m_settings.topLevel() == topLevel) if (settings().topLevel() == topLevel)
return; return;
m_settings.setTopLevel(topLevel.toString()); settings().setTopLevel(topLevel.toString());
const QString msg = Tr::tr("Perforce repository: %1").arg(topLevel.toUserOutput()); const QString msg = Tr::tr("Perforce repository: %1").arg(topLevel.toUserOutput());
VcsOutputWindow::appendSilently(msg); VcsOutputWindow::appendSilently(msg);
@@ -1675,7 +1670,7 @@ void PerforcePluginPrivate::setTopLevel(const FilePath &topLevel)
void PerforcePluginPrivate::applySettings() void PerforcePluginPrivate::applySettings()
{ {
m_settings.writeSettings(); settings().writeSettings();
m_managedDirectoryCache.clear(); m_managedDirectoryCache.clear();
getTopLevel(); getTopLevel();
emit configurationChanged(); emit configurationChanged();
@@ -1689,7 +1684,7 @@ void PerforcePluginPrivate::slotTopLevelFailed(const QString &errorMessage)
void PerforcePluginPrivate::getTopLevel(const FilePath &workingDirectory, bool isSync) void PerforcePluginPrivate::getTopLevel(const FilePath &workingDirectory, bool isSync)
{ {
// Run a new checker // Run a new checker
if (m_settings.p4BinaryPath().isEmpty()) if (settings().p4BinaryPath().isEmpty())
return; return;
auto checker = new PerforceChecker(dd); auto checker = new PerforceChecker(dd);
connect(checker, &PerforceChecker::failed, dd, &PerforcePluginPrivate::slotTopLevelFailed); connect(checker, &PerforceChecker::failed, dd, &PerforcePluginPrivate::slotTopLevelFailed);
@@ -1697,8 +1692,8 @@ void PerforcePluginPrivate::getTopLevel(const FilePath &workingDirectory, bool i
connect(checker, &PerforceChecker::succeeded, dd, &PerforcePluginPrivate::setTopLevel); connect(checker, &PerforceChecker::succeeded, dd, &PerforcePluginPrivate::setTopLevel);
connect(checker, &PerforceChecker::succeeded,checker, &QObject::deleteLater); connect(checker, &PerforceChecker::succeeded,checker, &QObject::deleteLater);
checker->start(m_settings.p4BinaryPath(), workingDirectory, checker->start(settings().p4BinaryPath(), workingDirectory,
m_settings.commonP4Arguments(QString()), 30000); settings().commonP4Arguments(QString()), 30000);
if (isSync) if (isSync)
checker->waitForFinished(); checker->waitForFinished();

26
src/plugins/perforce/perforcesettings.cpp
View File

@@ -30,6 +30,12 @@ static QString defaultCommand()
return QLatin1String("p4" QTC_HOST_EXE_SUFFIX); return QLatin1String("p4" QTC_HOST_EXE_SUFFIX);
} }
PerforceSettings &settings()
{
static PerforceSettings theSettings;
return theSettings;
}
PerforceSettings::PerforceSettings() PerforceSettings::PerforceSettings()
{ {
setSettingsGroup("Perforce"); setSettingsGroup("Perforce");
@@ -138,6 +144,8 @@ PerforceSettings::PerforceSettings()
st st
}; };
}); });
readSettings();
} }
// --------------------PerforceSettings // --------------------PerforceSettings
@@ -270,13 +278,19 @@ QString PerforceSettings::mapToFileSystem(const QString &perforceFilePath) const
// SettingsPage // SettingsPage
PerforceSettingsPage::PerforceSettingsPage(PerforceSettings *settings) class PerforceSettingsPage final : public Core::IOptionsPage
{ {
setId(VcsBase::Constants::VCS_ID_PERFORCE); public:
setDisplayName(Tr::tr("Perforce")); explicit PerforceSettingsPage()
setCategory(VcsBase::Constants::VCS_SETTINGS_CATEGORY); {
setSettings(settings); setId(VcsBase::Constants::VCS_ID_PERFORCE);
setDisplayName(Tr::tr("Perforce"));
setCategory(VcsBase::Constants::VCS_SETTINGS_CATEGORY);
setSettingsProvider([] { return &settings(); });
} }
};
const PerforceSettingsPage settingsPage;
} // Perforce::Internal } // Perforce::Internal

6
src/plugins/perforce/perforcesettings.h
View File

@@ -84,10 +84,6 @@ private:
QDir *m_topLevelDir = nullptr; QDir *m_topLevelDir = nullptr;
}; };
class PerforceSettingsPage final : public Core::IOptionsPage PerforceSettings &settings();
{
public:
explicit PerforceSettingsPage(PerforceSettings *settings);
};
} // Perforce::Internal } // Perforce::Internal