blob: 20fc3c339cc15221e8ef858691397ae6a2bc3763 (
plain)
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
|
/*
* Copyright (C) 2009, Christian Halstrick <christian.halstrick@sap.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.util.Iterator;
import java.util.List;
import org.eclipse.jgit.diff.Sequence;
import org.eclipse.jgit.merge.MergeChunk.ConflictState;
import org.eclipse.jgit.util.IntList;
/**
* The result of merging a number of {@link org.eclipse.jgit.diff.Sequence}
* objects. These sequences have one common predecessor sequence. The result of
* a merge is a list of MergeChunks. Each MergeChunk contains either a range (a
* subsequence) from one of the merged sequences, a range from the common
* predecessor or a conflicting range from one of the merged sequences. A
* conflict will be reported as multiple chunks, one for each conflicting range.
* The first chunk for a conflict is marked specially to distinguish the border
* between two consecutive conflicts.
* <p>
* This class does not know anything about how to present the merge result to
* the end-user. MergeFormatters have to be used to construct something human
* readable.
*
* @param <S>
* type of sequence.
*/
public class MergeResult<S extends Sequence> implements Iterable<MergeChunk> {
private final List<S> sequences;
final IntList chunks = new IntList();
private boolean containsConflicts = false;
/**
* Creates a new empty MergeResult
*
* @param sequences
* contains the common predecessor sequence at position 0
* followed by the merged sequences. This list should not be
* modified anymore during the lifetime of this
* {@link org.eclipse.jgit.merge.MergeResult}.
*/
public MergeResult(List<S> sequences) {
this.sequences = sequences;
}
/**
* Adds a new range from one of the merged sequences or from the common
* predecessor. This method can add conflicting and non-conflicting ranges
* controlled by the conflictState parameter
*
* @param srcIdx
* determines from which sequence this range comes. An index of
* x specifies the x+1 element in the list of sequences
* specified to the constructor
* @param begin
* the first element from the specified sequence which should be
* included in the merge result. Indexes start with 0.
* @param end
* specifies the end of the range to be added. The element this
* index points to is the first element which not added to the
* merge result. All elements between begin (including begin) and
* this element are added.
* @param conflictState
* when set to NO_CONLICT a non-conflicting range is added.
* This will end implicitly all open conflicts added before.
*/
public void add(int srcIdx, int begin, int end, ConflictState conflictState) {
chunks.add(conflictState.ordinal());
chunks.add(srcIdx);
chunks.add(begin);
chunks.add(end);
if (conflictState != ConflictState.NO_CONFLICT)
containsConflicts = true;
}
/**
* Returns the common predecessor sequence and the merged sequence in one
* list. The common predecessor is the first element in the list
*
* @return the common predecessor at position 0 followed by the merged
* sequences.
*/
public List<S> getSequences() {
return sequences;
}
static final ConflictState[] states = ConflictState.values();
/** {@inheritDoc} */
@Override
public Iterator<MergeChunk> iterator() {
return new Iterator<>() {
int idx;
@Override
public boolean hasNext() {
return (idx < chunks.size());
}
@Override
public MergeChunk next() {
ConflictState state = states[chunks.get(idx++)];
int srcIdx = chunks.get(idx++);
int begin = chunks.get(idx++);
int end = chunks.get(idx++);
return new MergeChunk(srcIdx, begin, end, state);
}
@Override
public void remove() {
throw new UnsupportedOperationException();
}
};
}
/**
* Whether this merge result contains conflicts
*
* @return true if this merge result contains conflicts
*/
public boolean containsConflicts() {
return containsConflicts;
}
/**
* Sets explicitly whether this merge should be seen as containing a
* conflict or not. Needed because during RecursiveMerger we want to do
* content-merges and take the resulting content (even with conflict
* markers!) as new conflict-free content
*
* @param containsConflicts
* whether this merge should be seen as containing a conflict or
* not.
* @since 3.5
*/
protected void setContainsConflicts(boolean containsConflicts) {
this.containsConflicts = containsConflicts;
}
}
|
