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

Git: Implement "Fixup previous commit"

Browse Source 
Change-Id: Ia2584ff975ed0db614dc878a70ce4adbd5c3ba67
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2013-04-30 23:26:47 +03:00
committed by Orgad Shaneh
parent 5d325f6b1a
commit 8695fe6d7c
11 changed files with 117 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/plugins/git/gitsubmiteditorwidget.cpp
View File

@@ -29,6 +29,7 @@
#include "gitsubmiteditorwidget.h"
#include "commitdata.h"
#include "logchangedialog.h"
#include <texteditor/texteditorsettings.h>
#include <texteditor/fontsettings.h>
@@ -40,7 +41,9 @@
#include <QDebug>
#include <QDir>
#include <QGroupBox>
#include <QRegExp>
#include <QVBoxLayout>
namespace Git {
namespace Internal {
@@ -120,10 +123,11 @@ void GitSubmitHighlighter::highlightBlock(const QString &text)
GitSubmitEditorWidget::GitSubmitEditorWidget(QWidget *parent) :
VcsBase::SubmitEditorWidget(parent),
m_gitSubmitPanel(new QWidget),
m_hasUnmerged(false)
m_logChangeWidget(0),
m_hasUnmerged(false),
m_isInitialized(false)
{
m_gitSubmitPanelUi.setupUi(m_gitSubmitPanel);
insertTopWidget(m_gitSubmitPanel);
new GitSubmitHighlighter(descriptionEdit());
m_emailValidator = new QRegExpValidator(QRegExp(QLatin1String("[^@ ]+@[^@ ]+\\.[a-zA-Z]+")), this);
@@ -144,11 +148,35 @@ void GitSubmitEditorWidget::setPanelInfo(const GitSubmitEditorPanelInfo &info)
m_gitSubmitPanelUi.branchLabel->setText(info.branch);
}
QString GitSubmitEditorWidget::amendSHA1() const
{
return m_logChangeWidget ? m_logChangeWidget->commit() : QString();
}
void GitSubmitEditorWidget::setHasUnmerged(bool e)
{
m_hasUnmerged = e;
}
void GitSubmitEditorWidget::initialize(CommitType commitType, const QString &repository)
{
if (m_isInitialized)
return;
m_isInitialized = true;
if (commitType == FixupCommit) {
QGroupBox *logChangeGroupBox = new QGroupBox(tr("Select Change"));
QVBoxLayout *logChangeLayout = new QVBoxLayout;
logChangeGroupBox->setLayout(logChangeLayout);
m_logChangeWidget = new LogChangeWidget;
m_logChangeWidget->init(repository);
logChangeLayout->addWidget(m_logChangeWidget);
insertTopWidget(logChangeGroupBox);
m_gitSubmitPanelUi.editGroup->hide();
hideDescription();
}
insertTopWidget(m_gitSubmitPanel);
}
GitSubmitEditorPanelData GitSubmitEditorWidget::panelData() const
{
GitSubmitEditorPanelData rc;