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

FossilPlugin: Fix revertCurrentFile()

Browse Source 
We didn't mean to execute empty dialog, but RevertDialog.
Add RevertDialog::revision() helper.

Amends 521a23df6e

Change-Id: I4c27baa0d5b2a9360048fd90e4feb1759c6363df
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Jarek Kobus
2023-08-04 10:52:34 +02:00
parent 5646f76ea8
commit 8d554aba1a
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/plugins/fossil/fossilplugin.cpp
View File

@@ -247,8 +247,10 @@ class RevertDialog : public QDialog
{ {
public: public:
RevertDialog(const QString &title, QWidget *parent = nullptr); RevertDialog(const QString &title, QWidget *parent = nullptr);
QString revision() const { return m_revisionLineEdit->text(); }
QLineEdit *m_revisionLineEdit; private:
QLineEdit *m_revisionLineEdit = nullptr;
}; };
FossilPlugin::~FossilPlugin() FossilPlugin::~FossilPlugin()
@@ -429,15 +431,11 @@ void FossilPluginPrivate::revertCurrentFile()
const VcsBase::VcsBasePluginState state = currentState(); const VcsBase::VcsBasePluginState state = currentState();
QTC_ASSERT(state.hasFile(), return); QTC_ASSERT(state.hasFile(), return);
QDialog dialog(Core::ICore::dialogParent()); RevertDialog dialog(Tr::tr("Revert"), Core::ICore::dialogParent());
if (dialog.exec() == QDialog::Accepted) {
auto revisionLineEdit = new QLineEdit; m_client.revertFile(state.currentFileTopLevel(), state.relativeCurrentFile(),
dialog.revision());
if (dialog.exec() != QDialog::Accepted) }
return;
m_client.revertFile(state.currentFileTopLevel(),
state.relativeCurrentFile(),
revisionLineEdit->text());
} }
void FossilPluginPrivate::statusCurrentFile() void FossilPluginPrivate::statusCurrentFile()
@@ -512,7 +510,7 @@ void FossilPluginPrivate::revertAll()
RevertDialog dialog(Tr::tr("Revert"), Core::ICore::dialogParent()); RevertDialog dialog(Tr::tr("Revert"), Core::ICore::dialogParent());
if (dialog.exec() == QDialog::Accepted) if (dialog.exec() == QDialog::Accepted)
m_client.revertAll(state.topLevel(), dialog.m_revisionLineEdit->text()); m_client.revertAll(state.topLevel(), dialog.revision());
} }
void FossilPluginPrivate::statusMulti() void FossilPluginPrivate::statusMulti()
@@ -628,7 +626,7 @@ void FossilPluginPrivate::update()
RevertDialog dialog(Tr::tr("Update"), Core::ICore::dialogParent()); RevertDialog dialog(Tr::tr("Update"), Core::ICore::dialogParent());
if (dialog.exec() == QDialog::Accepted) if (dialog.exec() == QDialog::Accepted)
m_client.update(state.topLevel(), dialog.m_revisionLineEdit->text()); m_client.update(state.topLevel(), dialog.revision());
} }
void FossilPluginPrivate::configureRepository() void FossilPluginPrivate::configureRepository()