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
|
/*******************************************************************************
* Copyright (C) 2014, Maik Schreiber <blizzy@blizzy.de>
*
* 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
*
* Contributors:
* Maik Schreiber - initial implementation
*******************************************************************************/
package org.eclipse.egit.core;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.eclipse.jgit.errors.IncorrectObjectTypeException;
import org.eclipse.jgit.errors.MissingObjectException;
import org.eclipse.jgit.errors.StopWalkException;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.revwalk.RevWalk;
import org.eclipse.jgit.revwalk.filter.RevFilter;
/**
* Utility class for working with commits.
*/
public class CommitUtil {
private CommitUtil() {
// non instanciable utility class
}
/**
* Sorts commits in parent-first order.
*
* @param commits
* the commits to sort
* @return a new list containing the sorted commits
*/
public static List<RevCommit> sortCommits(Collection<RevCommit> commits) {
Map<RevCommit, RevCommit> parentToChild = new HashMap<RevCommit, RevCommit>();
RevCommit firstCommit = null;
for (RevCommit commit : commits) {
RevCommit parentCommit = commit.getParent(0);
parentToChild.put(parentCommit, commit);
if (!commits.contains(parentCommit))
firstCommit = commit;
}
List<RevCommit> sortedCommits = new ArrayList<RevCommit>();
sortedCommits.add(firstCommit);
RevCommit parentCommit = firstCommit;
for (;;) {
RevCommit childCommit = parentToChild.get(parentCommit);
if (childCommit == null)
break;
sortedCommits.add(childCommit);
parentCommit = childCommit;
}
return sortedCommits;
}
/**
* Returns whether a commit is on the current branch, ie. if it is reachable
* from the current HEAD.
*
* @param commit
* the commit to check
* @param repository
* the repository
* @return true if the commit is reachable from HEAD
* @throws IOException
* if there is an I/O error
*/
public static boolean isCommitInCurrentBranch(RevCommit commit,
Repository repository) throws IOException {
return areCommitsInCurrentBranch(Collections.singleton(commit),
repository);
}
/**
* Returns whether the commits are on the current branch, ie. if they are
* reachable from the current HEAD.
*
* @param commits
* the commits to check
* @param repository
* the repository
* @return true if the commits are reachable from HEAD
* @throws IOException
* if there is an I/O error
*/
public static boolean areCommitsInCurrentBranch(
Collection<RevCommit> commits, Repository repository)
throws IOException {
try (RevWalk walk = new RevWalk(repository)) {
ObjectId headCommitId = repository.resolve(Constants.HEAD);
RevCommit headCommit = walk.parseCommit(headCommitId);
for (final RevCommit commit : commits) {
walk.reset();
walk.markStart(headCommit);
RevFilter revFilter = new RevFilter() {
@Override
public boolean include(RevWalk walker, RevCommit cmit)
throws StopWalkException, MissingObjectException,
IncorrectObjectTypeException, IOException {
return cmit.equals(commit);
}
@Override
public RevFilter clone() {
return null;
}
};
walk.setRevFilter(revFilter);
if (walk.next() == null)
return false;
}
return true;
}
}
}
|
