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
195
196
197
198
|
/*
* Copyright (C) 2011-2012, Robin Stocker <robin@nibor.org> 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 java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import org.eclipse.jgit.errors.IncorrectObjectTypeException;
import org.eclipse.jgit.errors.MissingObjectException;
import org.eclipse.jgit.internal.JGitText;
import org.eclipse.jgit.lib.NullProgressMonitor;
import org.eclipse.jgit.lib.ProgressMonitor;
import org.eclipse.jgit.lib.Ref;
/**
* Utility methods for {@link org.eclipse.jgit.revwalk.RevWalk}.
*/
public final class RevWalkUtils {
private RevWalkUtils() {
// Utility class
}
/**
* Count the number of commits that are reachable from <code>start</code>
* until a commit that is reachable from <code>end</code> is encountered. In
* other words, count the number of commits that are in <code>start</code>,
* but not in <code>end</code>.
* <p>
* Note that this method calls
* {@link org.eclipse.jgit.revwalk.RevWalk#reset()} at the beginning. Also
* note that the existing rev filter on the walk is left as-is, so be sure
* to set the right rev filter before calling this method.
*
* @param walk
* the rev walk to use
* @param start
* the commit to start counting from
* @param end
* the commit where counting should end, or null if counting
* should be done until there are no more commits
* @return the number of commits
* @throws org.eclipse.jgit.errors.MissingObjectException
* if object is missing
* @throws org.eclipse.jgit.errors.IncorrectObjectTypeException
* if object has unexpected type
* @throws java.io.IOException
* if an IO error occurred
*/
public static int count(final RevWalk walk, final RevCommit start,
final RevCommit end) throws MissingObjectException,
IncorrectObjectTypeException, IOException {
return find(walk, start, end).size();
}
/**
* Find commits that are reachable from <code>start</code> until a commit
* that is reachable from <code>end</code> is encountered. In other words,
* Find of commits that are in <code>start</code>, but not in
* <code>end</code>.
* <p>
* Note that this method calls
* {@link org.eclipse.jgit.revwalk.RevWalk#reset()} at the beginning. Also
* note that the existing rev filter on the walk is left as-is, so be sure
* to set the right rev filter before calling this method.
*
* @param walk
* the rev walk to use
* @param start
* the commit to start counting from
* @param end
* the commit where counting should end, or null if counting
* should be done until there are no more commits
* @return the commits found
* @throws org.eclipse.jgit.errors.MissingObjectException
* if object is missing
* @throws org.eclipse.jgit.errors.IncorrectObjectTypeException
* if object has unexpected type
* @throws java.io.IOException
* if an IO error occurred
*/
public static List<RevCommit> find(final RevWalk walk,
final RevCommit start, final RevCommit end)
throws MissingObjectException, IncorrectObjectTypeException,
IOException {
walk.reset();
walk.markStart(start);
if (end != null)
walk.markUninteresting(end);
List<RevCommit> commits = new ArrayList<>();
for (RevCommit c : walk)
commits.add(c);
return commits;
}
/**
* Find the list of branches a given commit is reachable from when following
* parents.
* <p>
* Note that this method calls
* {@link org.eclipse.jgit.revwalk.RevWalk#reset()} at the beginning.
* <p>
* In order to improve performance this method assumes clock skew among
* committers is never larger than 24 hours.
*
* @param commit
* the commit we are looking at
* @param revWalk
* The RevWalk to be used.
* @param refs
* the set of branches we want to see reachability from
* @return the list of branches a given commit is reachable from
* @throws org.eclipse.jgit.errors.MissingObjectException
* if object is missing
* @throws org.eclipse.jgit.errors.IncorrectObjectTypeException
* if object has unexpected type
* @throws java.io.IOException
* if an IO error occurred
*/
public static List<Ref> findBranchesReachableFrom(RevCommit commit,
RevWalk revWalk, Collection<Ref> refs)
throws MissingObjectException, IncorrectObjectTypeException,
IOException {
return findBranchesReachableFrom(commit, revWalk, refs,
NullProgressMonitor.INSTANCE);
}
/**
* Find the list of branches a given commit is reachable from when following
* parents.
* <p>
* Note that this method calls
* {@link org.eclipse.jgit.revwalk.RevWalk#reset()} at the beginning.
* <p>
* In order to improve performance this method assumes clock skew among
* committers is never larger than 24 hours.
*
* @param commit
* the commit we are looking at
* @param revWalk
* The RevWalk to be used.
* @param refs
* the set of branches we want to see reachability from
* @param monitor
* the callback for progress and cancellation
* @return the list of branches a given commit is reachable from
* @throws org.eclipse.jgit.errors.MissingObjectException
* if object is missing
* @throws org.eclipse.jgit.errors.IncorrectObjectTypeException
* if object has unexpected type
* @throws java.io.IOException
* if an IO error occurred
* @since 5.4
*/
public static List<Ref> findBranchesReachableFrom(RevCommit commit,
RevWalk revWalk, Collection<Ref> refs, ProgressMonitor monitor)
throws MissingObjectException, IncorrectObjectTypeException,
IOException {
// Make sure commit is from the same RevWalk
commit = revWalk.parseCommit(commit.getId());
revWalk.reset();
List<Ref> filteredRefs = new ArrayList<>();
monitor.beginTask(JGitText.get().searchForReachableBranches,
refs.size());
final int SKEW = 24*3600; // one day clock skew
for (Ref ref : refs) {
RevObject maybehead = revWalk.parseAny(ref.getObjectId());
if (!(maybehead instanceof RevCommit))
continue;
RevCommit headCommit = (RevCommit) maybehead;
// 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 (headCommit.getCommitTime() + SKEW < commit.getCommitTime())
continue;
filteredRefs.add(ref);
}
List<Ref> result = revWalk.getMergedInto(commit, filteredRefs, monitor);
monitor.endTask();
return result;
}
}
|
