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
|
// 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 "commitdata.h"
#include "gittr.h"
#include <utils/algorithm.h>
#include <utils/qtcassert.h>
namespace Git::Internal {
QString GitSubmitEditorPanelData::authorString() const
{
if (email.isEmpty())
return author;
return author + " <" + email + ">";
}
CommitData::CommitData(CommitType type)
: commitType(type)
{
}
static FileStates stateFor(const QChar &c)
{
switch (c.unicode()) {
case ' ':
return EmptyFileState;
case 'M':
return ModifiedFile;
case 'A':
return AddedFile;
case 'D':
return DeletedFile;
case 'R':
return RenamedFile;
case 'C':
return CopiedFile;
case 'U':
return UnmergedFile;
case 'T':
return TypeChangedFile;
case '?':
return UntrackedFile;
default:
return UnknownFileState;
}
}
bool operator<(const CommitData::StateFilePair &a, const CommitData::StateFilePair &b)
{
if ((a.first & UnmergedFile) && !(b.first & UnmergedFile))
return false;
if ((b.first & UnmergedFile) && !(a.first & UnmergedFile))
return true;
return a.second < b.second;
}
bool CommitData::checkLine(const QString &stateInfo, const QString &file)
{
QTC_ASSERT(stateInfo.size() == 2, return false);
if (stateInfo == "??") {
files.push_back({FileStates(UntrackedFile), file});
return true;
}
FileStates xState = stateFor(stateInfo.at(0));
FileStates yState = stateFor(stateInfo.at(1));
if (xState == UnknownFileState || yState == UnknownFileState)
return false;
bool isMerge = (xState == UnmergedFile || yState == UnmergedFile
|| ((xState == yState) && (xState == AddedFile || xState == DeletedFile)));
if (isMerge) {
if (xState == yState) {
if (xState == UnmergedFile)
xState = ModifiedFile;
files.push_back({xState | UnmergedFile | UnmergedUs | UnmergedThem, file});
} else if (xState == UnmergedFile) {
files.push_back({yState | UnmergedFile | UnmergedThem, file});
} else {
files.push_back({xState | UnmergedFile | UnmergedUs, file});
}
} else {
if (xState != EmptyFileState)
files.push_back({xState | StagedFile, file});
if (yState != EmptyFileState) {
QString newFile = file;
if (xState & (RenamedFile | CopiedFile))
newFile = file.mid(file.indexOf(" -> ") + 4);
files.push_back({yState, newFile});
}
}
Utils::sort(files);
return true;
}
/* Parse a git status file list:
* \code
## branch_name
XY file
\endcode */
bool CommitData::parseFilesFromStatus(const QString &output)
{
const QStringList lines = output.split('\n');
for (const QString &line : lines) {
if (line.isEmpty())
continue;
if (line.startsWith("## ")) {
// Branch indication:
panelInfo.branch = line.mid(3);
continue;
}
QTC_ASSERT(line.at(2) == ' ', continue);
QString file = line.mid(3);
if (file.startsWith('"'))
file.remove(0, 1).chop(1);
if (!checkLine(line.mid(0, 2), file))
return false;
}
return true;
}
QStringList CommitData::filterFiles(const FileStates &state) const
{
QStringList result;
for (const StateFilePair &p : files) {
if (state == (p.first & ~(UnmergedFile | UnmergedUs | UnmergedThem)))
result.append(p.second);
}
return result;
}
QString CommitData::stateDisplayName(const FileStates &state)
{
QString resultState;
if (state == UntrackedFile)
return Tr::tr("untracked");
if (state & StagedFile)
resultState = Tr::tr("staged + ");
if (state & ModifiedFile)
resultState.append(Tr::tr("modified"));
else if (state & AddedFile)
resultState.append(Tr::tr("added"));
else if (state & DeletedFile)
resultState.append(Tr::tr("deleted"));
else if (state & RenamedFile)
resultState.append(Tr::tr("renamed"));
else if (state & CopiedFile)
resultState.append(Tr::tr("copied"));
else if (state & TypeChangedFile)
resultState.append(Tr::tr("typechange"));
if (state & UnmergedUs) {
if (state & UnmergedThem)
resultState.append(Tr::tr(" by both"));
else
resultState.append(Tr::tr(" by us"));
} else if (state & UnmergedThem) {
resultState.append(Tr::tr(" by them"));
}
return resultState;
}
} // Git::Internal
|
