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
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
|
// Copyright (C) 2016 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
#include "gitsubmiteditor.h"
#include "gitclient.h"
#include "gitplugin.h"
#include "gitsubmiteditorwidget.h"
#include "gittr.h"
#include <coreplugin/editormanager/editormanager.h>
#include <coreplugin/fileutils.h>
#include <coreplugin/iversioncontrol.h>
#include <coreplugin/progressmanager/taskprogress.h>
#include <utils/async.h>
#include <utils/environment.h>
#include <utils/fileutils.h>
#include <utils/qtcassert.h>
#include <utils/stringutils.h>
#include <vcsbase/submitfilemodel.h>
#include <vcsbase/vcsbaseeditor.h>
#include <vcsbase/vcsoutputwindow.h>
#include <QApplication>
#include <QClipboard>
#include <QDebug>
#include <QStringList>
#include <QTimer>
using namespace Core;
using namespace Tasking;
using namespace Utils;
using namespace VcsBase;
namespace Git::Internal {
const char TASK_UPDATE_COMMIT[] = "Git.UpdateCommit";
class GitSubmitFileModel : public SubmitFileModel
{
public:
GitSubmitFileModel(QObject *parent = nullptr) : SubmitFileModel(parent)
{ }
void updateSelections(SubmitFileModel *source) override
{
QTC_ASSERT(source, return);
auto gitSource = static_cast<GitSubmitFileModel *>(source);
int j = 0;
for (int i = 0; i < rowCount() && j < source->rowCount(); ++i) {
CommitData::StateFilePair stateFile = stateFilePair(i);
for (; j < source->rowCount(); ++j) {
CommitData::StateFilePair sourceStateFile = gitSource->stateFilePair(j);
if (stateFile == sourceStateFile) {
if (isCheckable(i) && source->isCheckable(j))
setChecked(i, source->checked(j));
break;
} else if (((stateFile.first & UntrackedFile)
== (sourceStateFile.first & UntrackedFile))
&& (stateFile < sourceStateFile)) {
break;
}
}
}
}
private:
CommitData::StateFilePair stateFilePair(int row) const
{
return CommitData::StateFilePair(static_cast<FileStates>(extraData(row).toInt()), file(row));
}
};
static Result<CommitData> fetchCommitData(CommitType commitType, const FilePath &workingDirectory)
{
return gitClient().getCommitData(commitType, workingDirectory);
}
/* The problem with git is that no diff can be obtained to for a random
* multiselection of staged/unstaged files; it requires the --cached
* option for staged files. So, we sort apart the diff file lists
* according to a type flag we add to the model. */
GitSubmitEditor::GitSubmitEditor() :
VcsBaseSubmitEditor(new GitSubmitEditorWidget)
{
connect(this, &VcsBaseSubmitEditor::diffSelectedRows, this, &GitSubmitEditor::slotDiffSelected);
connect(submitEditorWidget(), &GitSubmitEditorWidget::showRequested, this, &GitSubmitEditor::showCommit);
connect(submitEditorWidget(), &GitSubmitEditorWidget::logRequested, this, &GitSubmitEditor::showLog);
connect(submitEditorWidget(), &GitSubmitEditorWidget::fileActionRequested,
this, &GitSubmitEditor::performFileAction);
connect(versionControl(), &IVersionControl::repositoryChanged,
this, &GitSubmitEditor::forceUpdateFileModel);
}
GitSubmitEditor::~GitSubmitEditor() = default;
GitSubmitEditorWidget *GitSubmitEditor::submitEditorWidget()
{
return static_cast<GitSubmitEditorWidget *>(widget());
}
const GitSubmitEditorWidget *GitSubmitEditor::submitEditorWidget() const
{
return static_cast<GitSubmitEditorWidget *>(widget());
}
void GitSubmitEditor::setCommitData(const CommitData &d)
{
using IVCF = IVersionControl::FileState;
m_commitEncoding = d.commitEncoding;
m_workingDirectory = d.panelInfo.repository;
m_commitType = d.commitType;
m_amenHash = d.amendHash;
GitSubmitEditorWidget *w = submitEditorWidget();
w->initialize(m_workingDirectory, d);
w->setHasUnmerged(false);
setEmptyFileListEnabled(m_commitType == AmendCommit); // Allow for just correcting the message
m_model = new GitSubmitFileModel(this);
m_model->setRepositoryRoot(d.panelInfo.repository);
m_model->setFileStatusQualifier([](const QString &, const QVariant &extraData) {
const FileStates state = static_cast<FileStates>(extraData.toInt());
if (state & (UnmergedFile | UnmergedThem | UnmergedUs))
return IVCF::Unmerged;
if (state.testFlag(UntrackedFile))
return IVCF::Untracked;
if (state.testFlag(AddedFile))
return IVCF::Added;
if (state.testFlag(ModifiedFile) || state.testFlag(TypeChangedFile))
return IVCF::Modified;
if (state.testFlag(DeletedFile))
return IVCF::Deleted;
if (state.testFlag(RenamedFile))
return IVCF::Renamed;
return IVCF::Unknown;
} );
if (!d.files.isEmpty()) {
for (QList<CommitData::StateFilePair>::const_iterator it = d.files.constBegin();
it != d.files.constEnd(); ++it) {
const FileStates state = it->first;
const QString file = it->second;
CheckMode checkMode;
if (state & UnmergedFile) {
checkMode = Uncheckable;
w->setHasUnmerged(true);
} else if (state & StagedFile) {
checkMode = Checked;
} else {
checkMode = Unchecked;
}
m_model->addFile(file, CommitData::stateDisplayName(state), checkMode,
QVariant(static_cast<int>(state)));
}
}
setFileModel(m_model);
}
void GitSubmitEditor::slotDiffSelected(const QList<int> &rows)
{
// Sort it apart into unmerged/staged/unstaged files
QStringList unmergedFiles;
QStringList unstagedFiles;
QStringList stagedFiles;
for (int row : rows) {
const QString fileName = m_model->file(row);
const FileStates state = static_cast<FileStates>(m_model->extraData(row).toInt());
if (state & UnmergedFile) {
unmergedFiles.push_back(fileName);
} else if (state & StagedFile) {
if (state & (RenamedFile | CopiedFile)) {
const int arrow = fileName.indexOf(" -> ");
if (arrow != -1) {
stagedFiles.push_back(fileName.left(arrow));
stagedFiles.push_back(fileName.mid(arrow + 4));
continue;
}
}
stagedFiles.push_back(fileName);
} else if (state == UntrackedFile) {
EditorManager::openEditor(m_workingDirectory.pathAppended(fileName));
} else {
unstagedFiles.push_back(fileName);
}
}
if (!unstagedFiles.empty() || !stagedFiles.empty())
gitClient().diffFiles(m_workingDirectory, unstagedFiles, stagedFiles);
if (!unmergedFiles.empty())
gitClient().merge(m_workingDirectory, unmergedFiles);
}
void GitSubmitEditor::showCommit(const QString &commit)
{
if (!m_workingDirectory.isEmpty())
gitClient().show(m_workingDirectory, commit);
}
void GitSubmitEditor::showLog(const QStringList &range)
{
if (!m_workingDirectory.isEmpty())
gitClient().log(m_workingDirectory, {}, false, range);
}
void GitSubmitEditor::addToGitignore(const FilePath &relativePath)
{
const FilePath fullPath = m_workingDirectory.resolvePath(relativePath);
const FilePath gitignorePath = gitClient().findGitignoreFor(fullPath);
const QString pattern = "/" + relativePath.path();
const TextEncoding fallbackEncoding = VcsBaseEditor::getEncoding(m_workingDirectory);
TextFileFormat format;
TextFileFormat::ReadResult readResult = format.readFile(gitignorePath, fallbackEncoding);
if (readResult.code != TextFileFormat::ReadSuccess) {
const QString message = Tr::tr("Cannot read \"%1\", reason %2.")
.arg(gitignorePath.toUserOutput(), readResult.error);
VcsOutputWindow::appendError(m_workingDirectory, message);
return;
}
QStringList lines = readResult.content.split('\n');
insertSorted(&lines, pattern);
const Result<> writeResult = format.writeFile(gitignorePath, lines.join('\n'));
if (!writeResult) {
const QString message = Tr::tr("Cannot write \"%1\", reason %2.")
.arg(gitignorePath.toUserOutput(), writeResult.error());
VcsOutputWindow::appendError(m_workingDirectory, message);
}
}
void GitSubmitEditor::performFileAction(const Utils::FilePath &filePath, FileAction action)
{
if (m_workingDirectory.isEmpty())
return;
bool refresh = false;
const FilePath fullPath = m_workingDirectory.pathAppended(filePath.toUrlishString());
auto markAsResolved = [this, &refresh](const Utils::FilePath &filePath) {
// Check if file still contains conflict markers
if (!gitClient().isConflictFree(m_workingDirectory, filePath))
return;
// Otherwise mark as resolved
gitClient().addFile(m_workingDirectory, filePath.toUrlishString());
refresh = true;
};
switch (action) {
case FileRevertAll:
case FileRevertUnstaged:
case FileRevertDeletion: {
const QStringList files = {filePath.toUrlishString()};
const bool revertStaging = action != FileRevertUnstaged;
const bool success = gitClient().synchronousCheckoutFiles(m_workingDirectory, files,
{}, nullptr, revertStaging);
if (success) {
const QString message = (action == FileRevertDeletion)
? Tr::tr("File \"%1\" recovered.\n").arg(filePath.toUserOutput())
: Tr::tr("File \"%1\" reverted.\n").arg(filePath.toUserOutput());
VcsOutputWindow::appendMessage(m_workingDirectory, message);
refresh = true;
}
break;
}
case FileRemove: {
const Result<> success = fullPath.removeFile();
if (!success) {
const QString message = Tr::tr("Error removing file: \"%1\": %2")
.arg(filePath.toUserOutput(), success.error());
VcsOutputWindow::appendError(m_workingDirectory, message);
}
refresh = true;
break;
}
case FileAddGitignore:
addToGitignore(filePath);
refresh = true;
break;
case FileCopyClipboard:
setClipboardAndSelection(filePath.toUserOutput());
break;
case FileOpenEditor:
EditorManager::openEditor(fullPath);
break;
case FileStage:
gitClient().addFile(m_workingDirectory, filePath.toUrlishString());
refresh = true;
break;
case FileUnstage:
gitClient().synchronousReset(m_workingDirectory, {filePath.toUrlishString()});
refresh = true;
break;
case FileMergeTool:
gitClient().merge(m_workingDirectory, {filePath.toUrlishString()});
break;
case FileMergeResolved:
markAsResolved(filePath);
break;
case FileMergeOurs:
gitClient().synchronousCheckoutFiles(m_workingDirectory, {filePath.toUrlishString()},
"--ours");
markAsResolved(filePath);
break;
case FileMergeTheirs:
gitClient().synchronousCheckoutFiles(m_workingDirectory, {filePath.toUrlishString()},
"--theirs");
markAsResolved(filePath);
break;
case FileMergeRecover:
gitClient().addFile(m_workingDirectory, filePath.toUrlishString());
refresh = true;
break;
case FileMergeRemove:
gitClient().synchronousDelete(m_workingDirectory, false, {filePath.toUrlishString()});
refresh = true;
break;
}
if (refresh)
QTimer::singleShot(100, this, &GitSubmitEditor::forceUpdateFileModel);
}
void GitSubmitEditor::updateFileModel()
{
// Commit data is set when the editor is initialized, and updateFileModel immediately follows,
// when the editor is activated. Avoid another call to git status
if (m_firstUpdate) {
m_firstUpdate = false;
return;
}
GitSubmitEditorWidget *w = submitEditorWidget();
if (w->updateInProgress() || m_workingDirectory.isEmpty())
return;
w->setUpdateInProgress(true);
using ResultType = Result<CommitData>;
// TODO: Check if fetch works OK from separate thread, refactor otherwise
const auto onSetup = [this](Async<ResultType> &task) {
task.setConcurrentCallData(&fetchCommitData,m_commitType,
m_workingDirectory);
};
const auto onDone = [this](const Async<ResultType> &task) {
const ResultType result = task.result();
GitSubmitEditorWidget *w = submitEditorWidget();
if (result) {
setCommitData(result.value());
w->refreshLog(m_workingDirectory);
w->setEnabled(true);
} else {
// Nothing to commit left!
VcsOutputWindow::appendError(m_workingDirectory, result.error());
m_model->clear();
w->setEnabled(false);
}
w->setUpdateInProgress(false);
};
const auto onTreeSetup = [](TaskTree &taskTree) {
auto progress = new TaskProgress(&taskTree);
progress->setDisplayName(Tr::tr("Refreshing Commit Data"));
progress->setId(TASK_UPDATE_COMMIT);
};
m_taskTreeRunner.start(
{AsyncTask<ResultType>(onSetup, onDone, CallDone::OnSuccess)},
onTreeSetup);
}
void GitSubmitEditor::forceUpdateFileModel()
{
GitSubmitEditorWidget *w = submitEditorWidget();
if (w->updateInProgress())
QTimer::singleShot(10, this, [this] { forceUpdateFileModel(); });
else
updateFileModel();
}
GitSubmitEditorPanelData GitSubmitEditor::panelData() const
{
return submitEditorWidget()->panelData();
}
QString GitSubmitEditor::amendHash() const
{
const QString commit = submitEditorWidget()->amendHash();
return commit.isEmpty() ? m_amenHash : commit;
}
QByteArray GitSubmitEditor::fileContents() const
{
const QString &text = description();
// Do the encoding convert, When use user-defined encoding
// e.g. git config --global i18n.commitencoding utf-8
if (m_commitEncoding.isValid())
return m_commitEncoding.encode(text);
// Using utf-8 as the default encoding
return text.toUtf8();
}
} // Git::Internal
|