motiejus
/
jgit
1
Fork 0
Code Releases Activity

Merge "Fix tag sorting in PlotWalk"

This commit is contained in:
Christian Halstrick 2010-07-28 17:13:27 -04:00 committed by Code Review
parent 4ed2f94013 d0f8d1e819
commit fba2437111
2 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
org.eclipse.jgit/src/org/eclipse/jgit/revplot/PlotCommit.java
View File

@ -65,19 +65,16 @@ public class PlotCommit<L extends PlotLane> extends RevCommit {
PlotCommit[] children;
final Ref[] refs;
Ref[] refs;
/**
* Create a new commit.
*
* @param id
* the identity of this commit.
* @param tags
* the tags associated with this commit, null for no tags
*/
protected PlotCommit(final AnyObjectId id, final Ref[] tags) {
protected PlotCommit(final AnyObjectId id) {
super(id);
this.refs = tags;
passingLanes = NO_LANES;
children = NO_CHILDREN;
}

24
org.eclipse.jgit/src/org/eclipse/jgit/revplot/PlotWalk.java
View File

@ -45,12 +45,15 @@
package org.eclipse.jgit.revplot;
import java.io.IOException;
import java.util.Arrays;
import java.util.Collection;
import java.util.Comparator;
import java.util.Map;
import java.util.Set;
import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.errors.IncorrectObjectTypeException;
import org.eclipse.jgit.errors.MissingObjectException;
import org.eclipse.jgit.lib.AnyObjectId;
import org.eclipse.jgit.lib.PersonIdent;
import org.eclipse.jgit.lib.Ref;
@ -93,23 +96,26 @@ public void sort(final RevSort s, final boolean use) {
@Override
protected RevCommit createCommit(final AnyObjectId id) {
return new PlotCommit(id, getTags(id));
return new PlotCommit(id);
}
/**
* @param commitId
* @return return the list of knows tags referring to this commit
*/
protected Ref[] getTags(final AnyObjectId commitId) {
@Override
public RevCommit next() throws MissingObjectException,
IncorrectObjectTypeException, IOException {
PlotCommit<?> pc = (PlotCommit) super.next();
if (pc != null)
pc.refs = getTags(pc);
return pc;
}
private Ref[] getTags(final AnyObjectId commitId) {
Collection<Ref> list = reverseRefMap.get(commitId);
Ref[] tags;
if (list == null)
tags = null;
else {
tags = list.toArray(new Ref[list.size()]);
// TODO hotfix, this results in a loop and consequently stack overflow
// when opening the history view in EGit
// Arrays.sort(tags, new PlotRefComparator());
Arrays.sort(tags, new PlotRefComparator());
}
return tags;
}