forked from qt-creator/qt-creator
VCS: Deduplicate some submit editor closing logic
Change-Id: I622f5703c222a48606fcca3b99e87f9398e6a815 Reviewed-by: André Hartmann <aha_1980@gmx.de>
This commit is contained in:
committed by
Orgad Shaneh
parent
eaad78547c
commit
9b61e484be
@@ -161,7 +161,6 @@ private:
|
||||
void outgoing();
|
||||
void commit();
|
||||
void showCommitWidget(const QList<VcsBase::VcsBaseClient::StatusItem> &status);
|
||||
void commitFromEditor() override;
|
||||
void diffFromEditorSelected(const QStringList &files);
|
||||
|
||||
void createMenu(const Core::Context &context);
|
||||
@@ -193,8 +192,6 @@ private:
|
||||
|
||||
FilePath m_submitRepository;
|
||||
|
||||
bool m_submitActionTriggered = false;
|
||||
|
||||
public:
|
||||
VcsSubmitEditorFactory submitEditorFactory {
|
||||
submitEditorParameters,
|
||||
@@ -647,14 +644,6 @@ void MercurialPluginPrivate::diffFromEditorSelected(const QStringList &files)
|
||||
m_client.diff(m_submitRepository, files);
|
||||
}
|
||||
|
||||
void MercurialPluginPrivate::commitFromEditor()
|
||||
{
|
||||
// Close the submit editor
|
||||
m_submitActionTriggered = true;
|
||||
QTC_ASSERT(submitEditor(), return);
|
||||
Core::EditorManager::closeDocuments({submitEditor()->document()});
|
||||
}
|
||||
|
||||
bool MercurialPluginPrivate::submitEditorAboutToClose()
|
||||
{
|
||||
auto commitEditor = qobject_cast<CommitEditor *>(submitEditor());
|
||||
@@ -662,19 +651,6 @@ bool MercurialPluginPrivate::submitEditorAboutToClose()
|
||||
Core::IDocument *editorFile = commitEditor->document();
|
||||
QTC_ASSERT(editorFile, return true);
|
||||
|
||||
const VcsBaseSubmitEditor::PromptSubmitResult response =
|
||||
commitEditor->promptSubmit(this, !m_submitActionTriggered);
|
||||
m_submitActionTriggered = false;
|
||||
|
||||
switch (response) {
|
||||
case VcsBaseSubmitEditor::SubmitCanceled:
|
||||
return false;
|
||||
case VcsBaseSubmitEditor::SubmitDiscarded:
|
||||
return true;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
const QStringList files = commitEditor->checkedFiles();
|
||||
if (!files.empty()) {
|
||||
//save the commit message
|
||||
|
||||
Reference in New Issue
Block a user