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 package org.eclipse.jgit.revwalk;
45
46 import java.io.IOException;
47 import java.text.MessageFormat;
48 import java.util.LinkedList;
49
50 import org.eclipse.jgit.errors.IncorrectObjectTypeException;
51 import org.eclipse.jgit.errors.MissingObjectException;
52 import org.eclipse.jgit.internal.JGitText;
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70 class MergeBaseGenerator extends Generator {
71 private static final int PARSED = RevWalk.PARSED;
72 private static final int IN_PENDING = RevWalk.SEEN;
73 private static final int POPPED = RevWalk.TEMP_MARK;
74 private static final int MERGE_BASE = RevWalk.REWRITE;
75
76 private final RevWalk walker;
77 private final DateRevQueue pending;
78
79 private int branchMask;
80 private int recarryTest;
81 private int recarryMask;
82 private int mergeBaseAncestor = -1;
83 private LinkedList<RevCommit> ret = new LinkedList<>();
84
85 private CarryStack stack;
86
87 MergeBaseGenerator(RevWalk w) {
88 super(w.isFirstParent());
89 walker = w;
90 pending = new DateRevQueue(firstParent);
91 }
92
93 void init(AbstractRevQueue p) throws IOException {
94 try {
95 for (;;) {
96 final RevCommit c = p.next();
97 if (c == null)
98 break;
99 add(c);
100 }
101
102
103
104 recarryTest = branchMask | POPPED;
105 recarryMask = branchMask | POPPED | MERGE_BASE;
106 mergeBaseAncestor = walker.allocFlag();
107
108 for (;;) {
109 RevCommit c = _next();
110 if (c == null) {
111 break;
112 }
113 ret.add(c);
114 }
115 } finally {
116
117
118
119 walker.freeFlag(branchMask | mergeBaseAncestor);
120 }
121 }
122
123 private void add(RevCommit c) {
124 final int flag = walker.allocFlag();
125 branchMask |= flag;
126 if ((c.flags & branchMask) != 0) {
127
128
129
130
131 throw new IllegalStateException(MessageFormat.format(JGitText.get().staleRevFlagsOn, c.name()));
132 }
133 c.flags |= flag;
134 pending.add(c);
135 }
136
137 @Override
138 int outputType() {
139 return 0;
140 }
141
142 private RevCommit _next() throws MissingObjectException,
143 IncorrectObjectTypeException, IOException {
144 for (;;) {
145 final RevCommit c = pending.next();
146 if (c == null) {
147 return null;
148 }
149
150 for (RevCommit p : c.parents) {
151 if ((p.flags & IN_PENDING) != 0)
152 continue;
153 if ((p.flags & PARSED) == 0)
154 p.parseHeaders(walker);
155 p.flags |= IN_PENDING;
156 pending.add(p);
157 }
158
159 int carry = c.flags & branchMask;
160 boolean mb = carry == branchMask;
161 if (mb) {
162
163
164
165
166 carry |= MERGE_BASE | mergeBaseAncestor;
167 }
168 carryOntoHistory(c, carry);
169
170 if ((c.flags & MERGE_BASE) != 0) {
171
172
173
174
175
176 if (pending.everbodyHasFlag(MERGE_BASE))
177 return null;
178 continue;
179 }
180 c.flags |= POPPED;
181
182 if (mb) {
183 c.flags |= MERGE_BASE;
184 return c;
185 }
186 }
187 }
188
189 @Override
190 RevCommit next() throws MissingObjectException,
191 IncorrectObjectTypeException, IOException {
192 while (!ret.isEmpty()) {
193 RevCommit commit = ret.remove();
194 if ((commit.flags & mergeBaseAncestor) == 0) {
195 return commit;
196 }
197 }
198 return null;
199 }
200
201 private void carryOntoHistory(RevCommit c, int carry) {
202 stack = null;
203 for (;;) {
204 carryOntoHistoryInnerLoop(c, carry);
205 if (stack == null) {
206 break;
207 }
208 c = stack.c;
209 carry = stack.carry;
210 stack = stack.prev;
211 }
212 }
213
214 private void carryOntoHistoryInnerLoop(RevCommit c, int carry) {
215 for (;;) {
216 RevCommit[] parents = c.parents;
217 if (parents == null || parents.length == 0) {
218 break;
219 }
220
221 int e = parents.length - 1;
222 for (int i = 0; i < e; i++) {
223 RevCommit p = parents[i];
224 if (carryOntoOne(p, carry) == CONTINUE) {
225
226 stack = new CarryStack(stack, p, carry);
227 }
228
229
230
231 }
232
233 c = parents[e];
234 if (carryOntoOne(c, carry) != CONTINUE) {
235 break;
236 }
237 }
238 }
239
240 private static final int CONTINUE = 0;
241 private static final int HAVE_ALL = 1;
242 private static final int CONTINUE_ON_STACK = 2;
243
244 private int carryOntoOne(RevCommit p, int carry) {
245
246
247
248
249
250 int rc = (p.flags & carry) == carry ? HAVE_ALL : CONTINUE;
251 p.flags |= carry;
252
253 if ((p.flags & recarryMask) == recarryTest) {
254
255
256
257
258 p.flags &= ~POPPED;
259 pending.add(p);
260 stack = new CarryStack(stack, p, branchMask | MERGE_BASE);
261 return CONTINUE_ON_STACK;
262 }
263 return rc;
264 }
265
266 private static class CarryStack {
267 final CarryStack prev;
268 final RevCommit c;
269 final int carry;
270
271 CarryStack(CarryStack prev, RevCommit c, int carry) {
272 this.prev = prev;
273 this.c = c;
274 this.carry = carry;
275 }
276 }
277 }