[EGIT PATCH] Showing abbreviated commit hash of the versions in Compare editor.
Signed-off-by: Roger C. Soares <rogersoares@intelinet.com.br>
---
Some more patches, please evaluate.
Don't know what others are working on,
but right now I'm missing a search functionality so
this will probably be my next egit little feature.
cheers
.../GitCompareFileRevisionEditorInput.java | 12 ++++++++++++
.../spearce/egit/ui/internal/GitResourceNode.java | 5 +++++
2 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/GitCompareFileRevisionEditorInput.java b/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/GitCompareFileRevisionEditorInput.java
index eaba1fa..403fdc1 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/GitCompareFileRevisionEditorInput.java
+++ b/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/GitCompareFileRevisionEditorInput.java
@@ -152,6 +152,18 @@ public class GitCompareFileRevisionEditorInput extends CompareEditorInput {
private void initLabels(ICompareInput input) {
CompareConfiguration cc = getCompareConfiguration();
+ if(left != null && left instanceof GitResourceNode) {
+ String ci = ((GitResourceNode)left).getContentIdentifier();
+ if(ci != null) {
+ cc.setLeftLabel(ci.substring(0, 7) + "..");
+ }
+ }
+ if(right != null && right instanceof GitResourceNode) {
+ String ci = ((GitResourceNode)right).getContentIdentifier();
+ if(ci != null) {
+ cc.setRightLabel(ci.substring(0, 7) + "..");
+ }
+ }
if (getLeftRevision() != null) {
String leftLabel = getFileRevisionLabel(getLeftRevision());
cc.setLeftLabel(leftLabel);
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/GitResourceNode.java b/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/GitResourceNode.java
index e19cef5..f25855a 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/GitResourceNode.java
+++ b/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/GitResourceNode.java
@@ -21,6 +21,7 @@ import org.spearce.jgit.lib.TreeEntry;
public class GitResourceNode extends BufferedContent implements IStructureComparator, ITypedElement {
TreeEntry entry;
GitResourceNode[] children;
+ String contentIdentifier;
public GitResourceNode(TreeEntry e) {
entry = e;
@@ -28,6 +29,7 @@ public class GitResourceNode extends BufferedContent implements IStructureCompar
public GitResourceNode(IFileRevision file) {
this(file instanceof GitCommitFileRevision ? ((GitCommitFileRevision)file).getTreeEntry() : null);
+ contentIdentifier = ((GitCommitFileRevision)file).getContentIdentifier();
}
public Object[] getChildren() {
@@ -100,5 +102,8 @@ public class GitResourceNode extends BufferedContent implements IStructureCompar
}
}
+ public String getContentIdentifier() {
+ return contentIdentifier;
+ }
}
--
1.5.3.7