forked from qt-creator/qt-creator
* Update files in src/plugins Change-Id: Ia5d77fad7d19d4bb3498e78661982f68729adb22 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
235 lines
8.0 KiB
C++
235 lines
8.0 KiB
C++
/****************************************************************************
|
|
**
|
|
** Copyright (C) 2016 The Qt Company Ltd.
|
|
** Contact: https://www.qt.io/licensing/
|
|
**
|
|
** This file is part of Qt Creator.
|
|
**
|
|
** Commercial License Usage
|
|
** Licensees holding valid commercial Qt licenses may use this file in
|
|
** accordance with the commercial license agreement provided with the
|
|
** Software or, alternatively, in accordance with the terms contained in
|
|
** a written agreement between you and The Qt Company. For licensing terms
|
|
** and conditions see https://www.qt.io/terms-conditions. For further
|
|
** information use the contact form at https://www.qt.io/contact-us.
|
|
**
|
|
** GNU General Public License Usage
|
|
** Alternatively, this file may be used under the terms of the GNU
|
|
** General Public License version 3 as published by the Free Software
|
|
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
|
|
** included in the packaging of this file. Please review the following
|
|
** information to ensure the GNU General Public License requirements will
|
|
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
|
|
**
|
|
****************************************************************************/
|
|
|
|
#include "commitdata.h"
|
|
#include "gitsubmiteditorwidget.h"
|
|
#include "githighlighters.h"
|
|
#include "logchangedialog.h"
|
|
|
|
#include <coreplugin/coreconstants.h>
|
|
#include <coreplugin/coreicons.h>
|
|
#include <utils/completingtextedit.h>
|
|
|
|
#include <QRegExpValidator>
|
|
#include <QTextEdit>
|
|
|
|
#include <QDir>
|
|
#include <QGroupBox>
|
|
#include <QRegExp>
|
|
#include <QVBoxLayout>
|
|
#include <QMenu>
|
|
|
|
namespace Git {
|
|
namespace Internal {
|
|
|
|
// ------------------
|
|
GitSubmitEditorWidget::GitSubmitEditorWidget() :
|
|
m_pushAction(NoPush),
|
|
m_gitSubmitPanel(new QWidget),
|
|
m_logChangeWidget(0),
|
|
m_hasUnmerged(false),
|
|
m_isInitialized(false)
|
|
{
|
|
m_gitSubmitPanelUi.setupUi(m_gitSubmitPanel);
|
|
new GitSubmitHighlighter(descriptionEdit());
|
|
|
|
m_emailValidator = new QRegExpValidator(QRegExp(QLatin1String("[^@ ]+@[^@ ]+\\.[a-zA-Z]+")), this);
|
|
const QPixmap error = Core::Icons::ERROR.pixmap();
|
|
m_gitSubmitPanelUi.invalidAuthorLabel->setPixmap(error);
|
|
m_gitSubmitPanelUi.invalidEmailLabel->setToolTip(tr("Provide a valid email to commit."));
|
|
m_gitSubmitPanelUi.invalidEmailLabel->setPixmap(error);
|
|
|
|
connect(m_gitSubmitPanelUi.authorLineEdit, &QLineEdit::textChanged,
|
|
this, &GitSubmitEditorWidget::authorInformationChanged);
|
|
connect(m_gitSubmitPanelUi.emailLineEdit, &QLineEdit::textChanged,
|
|
this, &GitSubmitEditorWidget::authorInformationChanged);
|
|
}
|
|
|
|
void GitSubmitEditorWidget::setPanelInfo(const GitSubmitEditorPanelInfo &info)
|
|
{
|
|
m_gitSubmitPanelUi.repositoryLabel->setText(QDir::toNativeSeparators(info.repository));
|
|
if (info.branch.contains(QLatin1String("(no branch)")))
|
|
m_gitSubmitPanelUi.branchLabel->setText(QString::fromLatin1("<span style=\"color:red\">%1</span>")
|
|
.arg(tr("Detached HEAD")));
|
|
else
|
|
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,
|
|
const GitSubmitEditorPanelData &data,
|
|
const GitSubmitEditorPanelInfo &info,
|
|
bool enablePush)
|
|
{
|
|
if (m_isInitialized)
|
|
return;
|
|
m_isInitialized = true;
|
|
if (commitType == FixupCommit) {
|
|
auto logChangeGroupBox = new QGroupBox(tr("Select Change"));
|
|
auto logChangeLayout = new QVBoxLayout;
|
|
logChangeGroupBox->setLayout(logChangeLayout);
|
|
m_logChangeWidget = new LogChangeWidget;
|
|
m_logChangeWidget->init(repository);
|
|
connect(m_logChangeWidget, &LogChangeWidget::commitActivated, this, &GitSubmitEditorWidget::show);
|
|
logChangeLayout->addWidget(m_logChangeWidget);
|
|
insertLeftWidget(logChangeGroupBox);
|
|
m_gitSubmitPanelUi.editGroup->hide();
|
|
hideDescription();
|
|
}
|
|
insertTopWidget(m_gitSubmitPanel);
|
|
setPanelData(data);
|
|
setPanelInfo(info);
|
|
|
|
if (enablePush) {
|
|
auto menu = new QMenu(this);
|
|
connect(menu->addAction(tr("&Commit only")), &QAction::triggered,
|
|
this, &GitSubmitEditorWidget::commitOnlySlot);
|
|
connect(menu->addAction(tr("Commit and &Push")), &QAction::triggered,
|
|
this, &GitSubmitEditorWidget::commitAndPushSlot);
|
|
connect(menu->addAction(tr("Commit and Push to &Gerrit")), &QAction::triggered,
|
|
this, &GitSubmitEditorWidget::commitAndPushToGerritSlot);
|
|
addSubmitButtonMenu(menu);
|
|
}
|
|
}
|
|
|
|
void GitSubmitEditorWidget::refreshLog(const QString &repository)
|
|
{
|
|
if (m_logChangeWidget)
|
|
m_logChangeWidget->init(repository);
|
|
}
|
|
|
|
GitSubmitEditorPanelData GitSubmitEditorWidget::panelData() const
|
|
{
|
|
GitSubmitEditorPanelData rc;
|
|
const QString author = m_gitSubmitPanelUi.authorLineEdit->text();
|
|
const QString email = m_gitSubmitPanelUi.emailLineEdit->text();
|
|
if (author != m_originalAuthor || email != m_originalEmail) {
|
|
rc.author = author;
|
|
rc.email = email;
|
|
}
|
|
rc.bypassHooks = m_gitSubmitPanelUi.bypassHooksCheckBox->isChecked();
|
|
rc.pushAction = m_pushAction;
|
|
return rc;
|
|
}
|
|
|
|
void GitSubmitEditorWidget::setPanelData(const GitSubmitEditorPanelData &data)
|
|
{
|
|
m_originalAuthor = data.author;
|
|
m_originalEmail = data.email;
|
|
m_gitSubmitPanelUi.authorLineEdit->setText(data.author);
|
|
m_gitSubmitPanelUi.emailLineEdit->setText(data.email);
|
|
m_gitSubmitPanelUi.bypassHooksCheckBox->setChecked(data.bypassHooks);
|
|
authorInformationChanged();
|
|
}
|
|
|
|
bool GitSubmitEditorWidget::canSubmit() const
|
|
{
|
|
if (m_gitSubmitPanelUi.invalidAuthorLabel->isVisible()
|
|
|| m_gitSubmitPanelUi.invalidEmailLabel->isVisible()
|
|
|| m_hasUnmerged)
|
|
return false;
|
|
return SubmitEditorWidget::canSubmit();
|
|
}
|
|
|
|
QString GitSubmitEditorWidget::cleanupDescription(const QString &input) const
|
|
{
|
|
// We need to manually purge out comment lines starting with
|
|
// hash '#' since git does not do that when using -F.
|
|
const QChar newLine = QLatin1Char('\n');
|
|
const QChar hash = QLatin1Char('#');
|
|
QString message = input;
|
|
for (int pos = 0; pos < message.size(); ) {
|
|
const int newLinePos = message.indexOf(newLine, pos);
|
|
const int startOfNextLine = newLinePos == -1 ? message.size() : newLinePos + 1;
|
|
if (message.at(pos) == hash)
|
|
message.remove(pos, startOfNextLine - pos);
|
|
else
|
|
pos = startOfNextLine;
|
|
}
|
|
return message;
|
|
|
|
}
|
|
|
|
QString GitSubmitEditorWidget::commitName() const
|
|
{
|
|
if (m_pushAction == NormalPush)
|
|
return tr("&Commit and Push");
|
|
else if (m_pushAction == PushToGerrit)
|
|
return tr("&Commit and Push to Gerrit");
|
|
|
|
return tr("&Commit");
|
|
}
|
|
|
|
void GitSubmitEditorWidget::authorInformationChanged()
|
|
{
|
|
bool bothEmpty = m_gitSubmitPanelUi.authorLineEdit->text().isEmpty() &&
|
|
m_gitSubmitPanelUi.emailLineEdit->text().isEmpty();
|
|
|
|
m_gitSubmitPanelUi.invalidAuthorLabel->
|
|
setVisible(m_gitSubmitPanelUi.authorLineEdit->text().isEmpty() && !bothEmpty);
|
|
m_gitSubmitPanelUi.invalidEmailLabel->
|
|
setVisible(!emailIsValid() && !bothEmpty);
|
|
|
|
updateSubmitAction();
|
|
}
|
|
|
|
void GitSubmitEditorWidget::commitOnlySlot()
|
|
{
|
|
m_pushAction = NoPush;
|
|
updateSubmitAction();
|
|
}
|
|
|
|
void GitSubmitEditorWidget::commitAndPushSlot()
|
|
{
|
|
m_pushAction = NormalPush;
|
|
updateSubmitAction();
|
|
}
|
|
|
|
void GitSubmitEditorWidget::commitAndPushToGerritSlot()
|
|
{
|
|
m_pushAction = PushToGerrit;
|
|
updateSubmitAction();
|
|
}
|
|
|
|
bool GitSubmitEditorWidget::emailIsValid() const
|
|
{
|
|
int pos = m_gitSubmitPanelUi.emailLineEdit->cursorPosition();
|
|
QString text = m_gitSubmitPanelUi.emailLineEdit->text();
|
|
return m_emailValidator->validate(text, pos) == QValidator::Acceptable;
|
|
}
|
|
|
|
} // namespace Internal
|
|
} // namespace Git
|