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
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
|
/*******************************************************************************
* Copyright (C) 2010, Dariusz Luksza <dariusz@luksza.org>
* Copyright (C) 2012, Robin Stocker <robin@nibor.org>
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
package org.eclipse.egit.core;
import java.io.IOException;
import java.util.Collection;
import java.util.List;
import org.eclipse.core.runtime.Assert;
import org.eclipse.jgit.lib.AnyObjectId;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.Ref;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.lib.RepositoryState;
import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.revwalk.RevWalk;
import org.eclipse.jgit.revwalk.filter.RevFilter;
import org.eclipse.jgit.treewalk.filter.AndTreeFilter;
import org.eclipse.jgit.treewalk.filter.PathFilterGroup;
import org.eclipse.jgit.treewalk.filter.TreeFilter;
/**
* Utility class for obtaining Rev object instances.
*/
public class RevUtils {
private RevUtils() {
// non instanciable utility class
}
/**
* Finds and returns instance of common ancestor commit for given two
* commit's
*
* @param repo repository in which common ancestor should be searched, cannot be null
* @param commit1 left commit id, cannot be null
* @param commit2 right commit id, cannot be null
* @return common ancestor for commit1 and commit2 parameters
* @throws IOException
*/
public static RevCommit getCommonAncestor(Repository repo,
AnyObjectId commit1, AnyObjectId commit2) throws IOException {
Assert.isNotNull(repo);
Assert.isNotNull(commit1);
Assert.isNotNull(commit2);
try (RevWalk rw = new RevWalk(repo)) {
rw.setRetainBody(false);
rw.setRevFilter(RevFilter.MERGE_BASE);
RevCommit srcRev = rw.lookupCommit(commit1);
RevCommit dstRev = rw.lookupCommit(commit2);
rw.markStart(dstRev);
rw.markStart(srcRev);
RevCommit result = rw.next();
if (result != null) {
rw.parseBody(result);
return result;
} else {
return null;
}
}
}
/**
* @param repository
* @param path
* repository-relative path of file with conflicts
* @return an object with the interesting commits for this path
* @throws IOException
*/
public static ConflictCommits getConflictCommits(Repository repository,
String path) throws IOException {
try (RevWalk walk = new RevWalk(repository)) {
RevCommit ourCommit;
RevCommit theirCommit = null;
walk.setTreeFilter(AndTreeFilter.create(
PathFilterGroup.createFromStrings(path),
TreeFilter.ANY_DIFF));
RevCommit head = walk.parseCommit(repository
.resolve(Constants.HEAD));
walk.markStart(head);
ourCommit = walk.next();
RepositoryState state = repository.getRepositoryState();
if (state == RepositoryState.REBASING
|| state == RepositoryState.CHERRY_PICKING) {
ObjectId cherryPickHead = repository.readCherryPickHead();
if (cherryPickHead != null) {
RevCommit cherryPickCommit = walk.parseCommit(cherryPickHead);
theirCommit = cherryPickCommit;
}
} else if (state == RepositoryState.MERGING) {
List<ObjectId> mergeHeads = repository.readMergeHeads();
Assert.isNotNull(mergeHeads);
if (mergeHeads.size() == 1) {
ObjectId mergeHead = mergeHeads.get(0);
RevCommit mergeCommit = walk.parseCommit(mergeHead);
walk.reset();
walk.markStart(mergeCommit);
theirCommit = walk.next();
}
}
return new ConflictCommits(ourCommit, theirCommit);
}
}
/**
* Check if commit is contained in any of the passed refs.
*
* @param repo
* the repo the commit is in
* @param commitId
* the commit ID to search for
* @param refs
* the refs to check
* @return true if the commit is contained, false otherwise
* @throws IOException
*/
public static boolean isContainedInAnyRef(Repository repo,
ObjectId commitId, Collection<Ref> refs) throws IOException {
// It's likely that we don't have to walk commits at all, so
// check refs directly first.
for (Ref ref : refs)
if (commitId.equals(ref.getObjectId()))
return true;
final int skew = 24 * 60 * 60; // one day clock skew
try (RevWalk walk = new RevWalk(repo)) {
RevCommit commit = walk.parseCommit(commitId);
for (Ref ref : refs) {
RevCommit refCommit = walk.parseCommit(ref.getObjectId());
// if commit is in the ref branch, then the tip of ref should be
// newer than the commit we are looking for. Allow for a large
// clock skew.
if (refCommit.getCommitTime() + skew < commit.getCommitTime())
continue;
boolean contained = walk.isMergedInto(commit, refCommit);
if (contained)
return true;
}
walk.dispose();
}
return false;
}
/**
* The interesting commits from ours/theirs for a file in case of a
* conflict.
*/
public static class ConflictCommits {
private final RevCommit ourCommit;
private final RevCommit theirCommit;
private ConflictCommits(RevCommit ourCommit, RevCommit theirCommit) {
this.ourCommit = ourCommit;
this.theirCommit = theirCommit;
}
/**
* @return the commit from "ours" that last modified a file, or
* {@code null} if none found
*/
public RevCommit getOurCommit() {
return ourCommit;
}
/**
* @return the commit from "theirs" that last modified a file, or
* {@code null} if none found
*/
public RevCommit getTheirCommit() {
return theirCommit;
}
}
}
|
