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
177
|
/*
* Copyright (C) 2009, Google Inc.
* Copyright (C) 2008, Robin Rosenberg 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 static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import java.time.Instant;
import java.time.ZoneOffset;
import org.eclipse.jgit.dircache.DirCache;
import org.eclipse.jgit.dircache.DirCacheBuilder;
import org.eclipse.jgit.junit.RepositoryTestCase;
import org.eclipse.jgit.lib.CommitBuilder;
import org.eclipse.jgit.lib.FileMode;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.ObjectInserter;
import org.eclipse.jgit.lib.PersonIdent;
import org.eclipse.jgit.treewalk.TreeWalk;
import org.junit.Test;
public class CherryPickTest extends RepositoryTestCase {
@Test
public void testPick() throws Exception {
// B---O
// \----P---T
//
// Cherry-pick "T" onto "O". This shouldn't introduce "p-fail", which
// was created by "P", nor should it modify "a", which was done by "P".
//
final DirCache treeB = db.readDirCache();
final DirCache treeO = db.readDirCache();
final DirCache treeP = db.readDirCache();
final DirCache treeT = db.readDirCache();
{
final DirCacheBuilder b = treeB.builder();
final DirCacheBuilder o = treeO.builder();
final DirCacheBuilder p = treeP.builder();
final DirCacheBuilder t = treeT.builder();
b.add(createEntry("a", FileMode.REGULAR_FILE));
o.add(createEntry("a", FileMode.REGULAR_FILE));
o.add(createEntry("o", FileMode.REGULAR_FILE));
p.add(createEntry("a", FileMode.REGULAR_FILE, "q"));
p.add(createEntry("p-fail", FileMode.REGULAR_FILE));
t.add(createEntry("a", FileMode.REGULAR_FILE));
t.add(createEntry("t", FileMode.REGULAR_FILE));
b.finish();
o.finish();
p.finish();
t.finish();
}
final ObjectInserter ow = db.newObjectInserter();
final ObjectId B = commit(ow, treeB, new ObjectId[] {});
final ObjectId O = commit(ow, treeO, new ObjectId[] { B });
final ObjectId P = commit(ow, treeP, new ObjectId[] { B });
final ObjectId T = commit(ow, treeT, new ObjectId[] { P });
ThreeWayMerger twm = MergeStrategy.SIMPLE_TWO_WAY_IN_CORE.newMerger(db);
twm.setBase(P);
boolean merge = twm.merge(new ObjectId[] { O, T });
assertTrue(merge);
try (TreeWalk tw = new TreeWalk(db)) {
tw.setRecursive(true);
tw.reset(twm.getResultTreeId());
assertTrue(tw.next());
assertEquals("a", tw.getPathString());
assertCorrectId(treeO, tw);
assertTrue(tw.next());
assertEquals("o", tw.getPathString());
assertCorrectId(treeO, tw);
assertTrue(tw.next());
assertEquals("t", tw.getPathString());
assertCorrectId(treeT, tw);
assertFalse(tw.next());
}
}
@Test
public void testRevert() throws Exception {
// B---P---T
//
// Revert P, this should result in a tree with a
// from B and t from T as the change to a in P
// and addition of t in P is reverted.
//
// We use the standard merge, but change the order
// of the sources.
//
final DirCache treeB = db.readDirCache();
final DirCache treeP = db.readDirCache();
final DirCache treeT = db.readDirCache();
{
final DirCacheBuilder b = treeB.builder();
final DirCacheBuilder p = treeP.builder();
final DirCacheBuilder t = treeT.builder();
b.add(createEntry("a", FileMode.REGULAR_FILE));
p.add(createEntry("a", FileMode.REGULAR_FILE, "q"));
p.add(createEntry("p-fail", FileMode.REGULAR_FILE));
t.add(createEntry("a", FileMode.REGULAR_FILE, "q"));
t.add(createEntry("p-fail", FileMode.REGULAR_FILE));
t.add(createEntry("t", FileMode.REGULAR_FILE));
b.finish();
p.finish();
t.finish();
}
final ObjectInserter ow = db.newObjectInserter();
final ObjectId B = commit(ow, treeB, new ObjectId[] {});
final ObjectId P = commit(ow, treeP, new ObjectId[] { B });
final ObjectId T = commit(ow, treeT, new ObjectId[] { P });
ThreeWayMerger twm = MergeStrategy.SIMPLE_TWO_WAY_IN_CORE.newMerger(db);
twm.setBase(P);
boolean merge = twm.merge(new ObjectId[] { B, T });
assertTrue(merge);
try (TreeWalk tw = new TreeWalk(db)) {
tw.setRecursive(true);
tw.reset(twm.getResultTreeId());
assertTrue(tw.next());
assertEquals("a", tw.getPathString());
assertCorrectId(treeB, tw);
assertTrue(tw.next());
assertEquals("t", tw.getPathString());
assertCorrectId(treeT, tw);
assertFalse(tw.next());
}
}
private static void assertCorrectId(DirCache treeT, TreeWalk tw) {
assertEquals(treeT.getEntry(tw.getPathString()).getObjectId(), tw
.getObjectId(0));
}
private static ObjectId commit(final ObjectInserter odi,
final DirCache treeB,
final ObjectId[] parentIds) throws Exception {
final CommitBuilder c = new CommitBuilder();
c.setTreeId(treeB.writeTree(odi));
c.setAuthor(new PersonIdent("A U Thor", "a.u.thor",
Instant.ofEpochSecond(1), ZoneOffset.UTC));
c.setCommitter(c.getAuthor());
c.setParentIds(parentIds);
c.setMessage("Tree " + c.getTreeId().name());
ObjectId id = odi.insert(c);
odi.flush();
return id;
}
}
|
