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
|
/*
* Copyright (C) 2009, Christian Halstrick <christian.halstrick@sap.com>
* Copyright (C) 2014, André de Oliveira <andre.oliveira@liferay.com> and others
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Distribution License v. 1.0 which is available at
* https://www.eclipse.org/org/documents/edl-v10.php.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
package org.eclipse.jgit.merge;
import java.io.IOException;
import java.io.OutputStream;
import java.nio.charset.Charset;
import java.util.List;
import org.eclipse.jgit.diff.RawText;
import org.eclipse.jgit.merge.MergeChunk.ConflictState;
class MergeFormatterPass {
private final EolAwareOutputStream out;
private final MergeResult<RawText> res;
private final List<String> seqName;
private final Charset charset;
private final boolean threeWayMerge;
private final boolean writeBase; // diff3-style requested
private String lastConflictingName; // is set to non-null whenever we are in
// a conflict
/**
* @param out
* the {@link java.io.OutputStream} where to write the textual
* presentation
* @param res
* the merge result which should be presented
* @param seqName
* When a conflict is reported each conflicting range will get a
* name. This name is following the "<<<<<<<
* " or ">>>>>>> " conflict markers. The
* names for the sequences are given in this list
* @param charset
* the character set used when writing conflict metadata
*/
MergeFormatterPass(OutputStream out, MergeResult<RawText> res,
List<String> seqName, Charset charset) {
this(out, res, seqName, charset, false);
}
/**
* @param out
* the {@link java.io.OutputStream} where to write the textual
* presentation
* @param res
* the merge result which should be presented
* @param seqName
* When a conflict is reported each conflicting range will get a
* name. This name is following the "<<<<<<<
* ", "|||||||" or ">>>>>>> " conflict
* markers. The names for the sequences are given in this list
* @param charset
* the character set used when writing conflict metadata
* @param writeBase
* base's contribution should be written in conflicts
*/
MergeFormatterPass(OutputStream out, MergeResult<RawText> res,
List<String> seqName, Charset charset, boolean writeBase) {
this.out = new EolAwareOutputStream(out);
this.res = res;
this.seqName = seqName;
this.charset = charset;
this.threeWayMerge = (res.getSequences().size() == 3);
this.writeBase = writeBase;
}
void formatMerge() throws IOException {
boolean missingNewlineAtEnd = false;
for (MergeChunk chunk : res) {
if (!isBase(chunk) || writeBase) {
RawText seq = res.getSequences().get(chunk.getSequenceIndex());
writeConflictMetadata(chunk);
// the lines with conflict-metadata are written. Now write the
// chunk
for (int i = chunk.getBegin(); i < chunk.getEnd(); i++)
writeLine(seq, i);
missingNewlineAtEnd = seq.isMissingNewlineAtEnd();
}
}
// one possible leftover: if the merge result ended with a conflict we
// have to close the last conflict here
if (lastConflictingName != null)
writeConflictEnd();
if (!missingNewlineAtEnd)
out.beginln();
}
private void writeConflictMetadata(MergeChunk chunk) throws IOException {
if (lastConflictingName != null
&& !isTheirs(chunk) && !isBase(chunk)) {
// found the end of a conflict
writeConflictEnd();
}
if (isOurs(chunk)) {
// found the start of a conflict
writeConflictStart(chunk);
} else if (isTheirs(chunk)) {
// found the theirs conflicting chunk
writeConflictChange(chunk);
} else if (isBase(chunk)) {
// found the base conflicting chunk
writeConflictBase(chunk);
}
}
private void writeConflictEnd() throws IOException {
writeln(">>>>>>> " + lastConflictingName); //$NON-NLS-1$
lastConflictingName = null;
}
private void writeConflictStart(MergeChunk chunk) throws IOException {
lastConflictingName = seqName.get(chunk.getSequenceIndex());
writeln("<<<<<<< " + lastConflictingName); //$NON-NLS-1$
}
private void writeConflictChange(MergeChunk chunk) throws IOException {
/*
* In case of a non-three-way merge I'll add the name of the conflicting
* chunk behind the equal signs. I also append the name of the last
* conflicting chunk after the ending greater-than signs. If somebody
* knows a better notation to present non-three-way merges - feel free
* to correct here.
*/
lastConflictingName = seqName.get(chunk.getSequenceIndex());
writeln(threeWayMerge ? "=======" : "======= " //$NON-NLS-1$ //$NON-NLS-2$
+ lastConflictingName);
}
private void writeConflictBase(MergeChunk chunk) throws IOException {
lastConflictingName = seqName.get(chunk.getSequenceIndex());
writeln("||||||| " + lastConflictingName); //$NON-NLS-1$
}
private void writeln(String s) throws IOException {
out.beginln();
out.write((s + "\n").getBytes(charset)); //$NON-NLS-1$
}
private void writeLine(RawText seq, int i) throws IOException {
out.beginln();
seq.writeLine(out, i);
// still BOL? It was a blank line. But writeLine won't lf, so we do.
if (out.isBeginln())
out.write('\n');
}
private boolean isBase(MergeChunk chunk) {
return chunk.getConflictState() == ConflictState.BASE_CONFLICTING_RANGE;
}
private boolean isOurs(MergeChunk chunk) {
return chunk
.getConflictState() == ConflictState.FIRST_CONFLICTING_RANGE;
}
private boolean isTheirs(MergeChunk chunk) {
return chunk.getConflictState() == ConflictState.NEXT_CONFLICTING_RANGE;
}
}
|