// the RevWalk must be reset by the caller upon return!
private ArrayList<RevCommit> findCommits(
RevWalk walk,
ArrayList<RevCommit> included,
ArrayList<RevCommit> excluded,
boolean getBody,
long after)
throws MissingObjectException, IncorrectObjectTypeException, IOException {
ArrayList<RevCommit> commits = new ArrayList<RevCommit>();
commits.ensureCapacity(allBranches.size()); // heuristic workaround
walk.sort(RevSort.COMMIT_TIME_DESC, true);
walk.sort(RevSort.TOPO, true);
walk.setRetainBody(getBody);
if (after > 0) walk.setRevFilter(CommitTimeRevFilter.after(after));
else walk.setRevFilter(null);
walk.markStart(included);
RevCommit c;
Iterator<RevCommit> it = excluded.iterator();
while (it.hasNext()) {
walk.markUninteresting(it.next());
}
it = walk.iterator();
while (it.hasNext()) {
c = it.next();
if (getBody) walk.parseBody(c);
// addUnique(commits, c); // commits are naturally ordered by SHA-1
commits.add(c);
}
return commits.size() > 0 ? commits : null;
}
/**
* Returns a list of commits since the minimum date starting from the specified object id.
*
* @param repository
* @param objectId if unspecified, HEAD is assumed.
* @param minimumDate
* @return list of commits
*/
public static List<RevCommit> getRevLog(
Repository repository, String objectId, Date minimumDate) {
List<RevCommit> list = new ArrayList<RevCommit>();
if (!hasCommits(repository)) {
return list;
}
try {
// resolve branch
ObjectId branchObject;
if (objectId == null) {
branchObject = getDefaultBranch(repository);
} else {
branchObject = repository.resolve(objectId);
}
RevWalk rw = new RevWalk(repository);
rw.markStart(rw.parseCommit(branchObject));
rw.setRevFilter(CommitTimeRevFilter.after(minimumDate));
Iterable<RevCommit> revlog = rw;
for (RevCommit rev : revlog) {
list.add(rev);
}
rw.dispose();
} catch (Throwable t) {
// todo
Logger.error(t, t.getMessage());
}
return list;
}
private void negotiateBegin() throws IOException {
walk.resetRetain(REACHABLE, ADVERTISED);
walk.markStart(reachableCommits);
walk.sort(RevSort.COMMIT_TIME_DESC);
walk.setRevFilter(
new RevFilter() {
@Override
public RevFilter clone() {
return this;
}
@Override
public boolean include(final RevWalk walker, final RevCommit c) {
final boolean remoteKnowsIsCommon = c.has(COMMON);
if (c.has(ADVERTISED)) {
// Remote advertised this, and we have it, hence common.
// Whether or not the remote knows that fact is tested
// before we added the flag. If the remote doesn't know
// we have to still send them this object.
//
c.add(COMMON);
}
return !remoteKnowsIsCommon;
}
});
}
private void markReachable(final Set<ObjectId> have, final int maxTime) throws IOException {
for (final Ref r : local.getAllRefs().values()) {
try {
final RevCommit o = walk.parseCommit(r.getObjectId());
o.add(REACHABLE);
reachableCommits.add(o);
} catch (IOException readError) {
// If we cannot read the value of the ref skip it.
}
}
for (final ObjectId id : have) {
try {
final RevCommit o = walk.parseCommit(id);
o.add(REACHABLE);
reachableCommits.add(o);
} catch (IOException readError) {
// If we cannot read the value of the ref skip it.
}
}
if (maxTime > 0) {
// Mark reachable commits until we reach maxTime. These may
// wind up later matching up against things we want and we
// can avoid asking for something we already happen to have.
//
final Date maxWhen = new Date(maxTime * 1000L);
walk.sort(RevSort.COMMIT_TIME_DESC);
walk.markStart(reachableCommits);
walk.setRevFilter(CommitTimeRevFilter.after(maxWhen));
for (; ; ) {
final RevCommit c = walk.next();
if (c == null) break;
if (c.has(ADVERTISED) && !c.has(COMMON)) {
// This is actually going to be a common commit, but
// our peer doesn't know that fact yet.
//
c.add(COMMON);
c.carry(COMMON);
reachableCommits.add(c);
}
}
}
}
@NotNull
public SortedSet<RevCommit> calculate(@NotNull String branchName, @Nullable RevFilter revFilter)
throws IOException {
Ref head = myRepository.getRef(branchName);
if (head == null) {
throw new IllegalArgumentException("Branch does not exist: [branchName: " + branchName + "]");
}
myRevWalk.markStart(myRevWalk.parseCommit(head.getObjectId()));
myRevWalk.setRevFilter(revFilter);
SortedSet<RevCommit> roots = new TreeSet<>(REV_COMMIT_COMPARATOR);
for (RevCommit commit : myRevWalk) {
roots.add(commit);
}
myRevWalk.reset();
myRevWalk.dispose();
return roots;
}
/**
* Create an iterator to walk the merge base of two commits.
*
* @param aIdx index of the first commit in {@link #sourceObjects}.
* @param bIdx index of the second commit in {@link #sourceObjects}.
* @return the new iterator
* @throws IncorrectObjectTypeException one of the input objects is not a commit.
* @throws IOException objects are missing or multiple merge bases were found.
*/
protected AbstractTreeIterator mergeBase(final int aIdx, final int bIdx) throws IOException {
if (sourceCommits[aIdx] == null)
throw new IncorrectObjectTypeException(sourceObjects[aIdx], Constants.TYPE_COMMIT);
if (sourceCommits[bIdx] == null)
throw new IncorrectObjectTypeException(sourceObjects[bIdx], Constants.TYPE_COMMIT);
walk.reset();
walk.setRevFilter(RevFilter.MERGE_BASE);
walk.markStart(sourceCommits[aIdx]);
walk.markStart(sourceCommits[bIdx]);
final RevCommit base = walk.next();
if (base == null) return new EmptyTreeIterator();
final RevCommit base2 = walk.next();
if (base2 != null) {
throw new IOException(
MessageFormat.format(
JGitText.get().multipleMergeBasesFor,
sourceCommits[aIdx].name(),
sourceCommits[bIdx].name(),
base.name(),
base2.name()));
}
return openTree(base.getTree());
}
@Override
public void execute() throws BuildException {
if (_property == null) {
throw new BuildException("Property attribute is required", getLocation());
}
if (_path == null) {
throw new BuildException("Path attribute is required", getLocation());
}
File gitDir = PathUtil.getGitDir(_gitDir, getProject(), getLocation());
String relativePath = PathUtil.toRelativePath(gitDir, _path);
if (_useCache) {
String hash = _hashes.get(relativePath);
if (hash != null) {
Project currentProject = getProject();
currentProject.setNewProperty(_property, hash);
return;
}
}
try (Repository repository = RepositoryCache.open(FileKey.exact(gitDir, FS.DETECTED))) {
RevWalk revWalk = new RevWalk(repository);
revWalk.setRetainBody(false);
revWalk.markStart(revWalk.parseCommit(repository.resolve(Constants.HEAD)));
if (_ignoreFileName == null) {
revWalk.setRevFilter(MaxCountRevFilter.create(1));
} else {
revWalk.setRevFilter(MaxCountRevFilter.create(2));
}
revWalk.setTreeFilter(
AndTreeFilter.create(PathFilter.create(relativePath), TreeFilter.ANY_DIFF));
RevCommit revCommit = revWalk.next();
if (revCommit == null) {
throw new IllegalStateException("Unable to find any commit under " + _path);
}
if (hasIgnoreFile(repository, revCommit, relativePath)) {
RevCommit secondRevCommit = revWalk.next();
if (secondRevCommit != null) {
revCommit = secondRevCommit;
}
}
Project currentProject = getProject();
String hash = revCommit.name();
currentProject.setNewProperty(_property, hash);
if (_useCache) {
_hashes.put(relativePath, hash);
}
revWalk.dispose();
} catch (Exception e) {
throw new BuildException("Unable to get head hash for path " + _path, e);
}
}
