1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
|
/****************************************************************************
**
** 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 <utils/completingtextedit.h>
#include <utils/utilsicons.h>
#include <QRegExpValidator>
#include <QTextEdit>
#include <QDir>
#include <QGroupBox>
#include <QRegExp>
#include <QVBoxLayout>
#include <QMenu>
namespace Git {
namespace Internal {
// ------------------
GitSubmitEditorWidget::GitSubmitEditorWidget() :
m_gitSubmitPanel(new QWidget)
{
m_gitSubmitPanelUi.setupUi(m_gitSubmitPanel);
new GitSubmitHighlighter(descriptionEdit());
m_emailValidator = new QRegExpValidator(QRegExp("[^@ ]+@[^@ ]+\\.[a-zA-Z]+"), this);
const QPixmap error = Utils::Icons::CRITICAL.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("(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;
rc.signOff = m_gitSubmitPanelUi.signOffCheckBox->isChecked();
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);
m_gitSubmitPanelUi.signOffCheckBox->setChecked(data.signOff);
authorInformationChanged();
}
bool GitSubmitEditorWidget::canSubmit(QString *whyNot) const
{
if (m_gitSubmitPanelUi.invalidAuthorLabel->isVisible()) {
if (whyNot)
*whyNot = tr("Invalid author");
return false;
}
if (m_gitSubmitPanelUi.invalidEmailLabel->isVisible()) {
if (whyNot)
*whyNot = tr("Invalid email");
return false;
}
if (m_hasUnmerged) {
if (whyNot)
*whyNot = tr("Unresolved merge conflicts");
return false;
}
return SubmitEditorWidget::canSubmit(whyNot);
}
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 = '\n';
const QChar hash = '#';
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
|
