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
|
/*
* Copyright (C) 2009, Google Inc. 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.revwalk;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.fail;
import org.eclipse.jgit.revwalk.filter.RevFilter;
import org.eclipse.jgit.treewalk.filter.TreeFilter;
import org.junit.Test;
public class RevWalkMergeBaseTest extends RevWalkTestCase {
@Test
public void testNone() throws Exception {
final RevCommit c1 = commit(commit(commit()));
final RevCommit c2 = commit(commit(commit()));
rw.setRevFilter(RevFilter.MERGE_BASE);
markStart(c1);
markStart(c2);
assertNull(rw.next());
}
@Test
public void testDisallowTreeFilter() throws Exception {
final RevCommit c1 = commit();
final RevCommit c2 = commit();
rw.setRevFilter(RevFilter.MERGE_BASE);
rw.setTreeFilter(TreeFilter.ANY_DIFF);
markStart(c1);
markStart(c2);
try {
assertNull(rw.next());
fail("did not throw IllegalStateException");
} catch (IllegalStateException ise) {
// expected result
}
}
@Test
public void testSimple() throws Exception {
final RevCommit a = commit();
final RevCommit b = commit(a);
final RevCommit c1 = commit(commit(commit(commit(commit(b)))));
final RevCommit c2 = commit(commit(commit(commit(commit(b)))));
rw.setRevFilter(RevFilter.MERGE_BASE);
markStart(c1);
markStart(c2);
assertCommit(b, rw.next());
assertNull(rw.next());
}
@Test
public void testMultipleHeads_SameBase1() throws Exception {
final RevCommit a = commit();
final RevCommit b = commit(a);
final RevCommit c1 = commit(commit(commit(commit(commit(b)))));
final RevCommit c2 = commit(commit(commit(commit(commit(b)))));
final RevCommit c3 = commit(commit(commit(b)));
rw.setRevFilter(RevFilter.MERGE_BASE);
markStart(c1);
markStart(c2);
markStart(c3);
assertCommit(b, rw.next());
assertNull(rw.next());
}
@Test
public void testMultipleHeads_SameBase2() throws Exception {
final RevCommit a = commit();
final RevCommit b = commit(a);
final RevCommit c = commit(b);
final RevCommit d1 = commit(commit(commit(commit(commit(b)))));
final RevCommit d2 = commit(commit(commit(commit(commit(c)))));
final RevCommit d3 = commit(commit(commit(c)));
rw.setRevFilter(RevFilter.MERGE_BASE);
markStart(d1);
markStart(d2);
markStart(d3);
assertCommit(b, rw.next());
assertNull(rw.next());
}
@Test
public void testCrissCross() throws Exception {
// See http://marc.info/?l=git&m=111463358500362&w=2 for a nice
// description of what this test is creating. We don't have a
// clean merge base for d,e as they each merged the parents b,c
// in different orders.
//
final RevCommit a = commit();
final RevCommit b = commit(a);
final RevCommit c = commit(a);
final RevCommit d = commit(b, c);
final RevCommit e = commit(c, b);
rw.setRevFilter(RevFilter.MERGE_BASE);
markStart(d);
markStart(e);
assertCommit(c, rw.next());
assertCommit(b, rw.next());
assertNull(rw.next());
}
@Test
public void testInconsistentCommitTimes() throws Exception {
// When commit times are inconsistent (a parent is younger than a child)
// make sure that not both, parent and child, are reported as merge
// base. In the following repo the merge base between C,D should be B.
// But when A is younger than B the MergeBaseGenerator used to generate
// A before it detected that B is also a merge base.
//
// +---C
// / /
// A---B---D
final RevCommit a = commit(2);
final RevCommit b = commit(-1, a);
final RevCommit c = commit(2, b, a);
final RevCommit d = commit(1, b);
rw.setRevFilter(RevFilter.MERGE_BASE);
markStart(d);
markStart(c);
assertCommit(b, rw.next());
assertNull(rw.next());
}
}
|
