[EGIT PATCH 00/10] Fixes and improvement on Eclipse plugin

@@ -242,9 +242,13 @@ public class GitHistoryPage extends HistoryPage implements IAdaptable,
 					.getFileHistoryFor((IResource) getInput(),
 							IFileHistoryProvider.SINGLE_LINE_OF_DESCENT, null/* monitor */);
 			fileRevisions = fileHistoryFor.getFileRevisions();
-			tree.setData(fileRevisions);
+			tree.clearAll(true);
 			tree.setItemCount(fileRevisions.length);
+			tree.setData(fileRevisions);
+			System.out.println("inputchanged, invoking refresh");
 			viewer.refresh();
+			tree.getParent().layout();
+			tree.getParent().getParent().layout();
 		}
 
 		public void dispose() {

@@ -232,6 +232,8 @@ public class GitHistoryPage extends HistoryPage implements IAdaptable,
 			ILazyTreeContentProvider {
 
 		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+			if (newInput == null)
+				return;
 			System.out.println("inputChanged(" + viewer + "," + oldInput + ","
 					+ newInput);
 			RepositoryProvider provider = RepositoryProvider

@@ -16,10 +16,10 @@
  */
 package org.spearce.jgit.lib;
 
-import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
+import java.io.DataInputStream;
 import java.io.IOException;
-import java.io.InputStreamReader;
+import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.List;
 

@@ -45,6 +45,8 @@ public class Commit implements Treeish {
 
 	private byte[] raw;
 
+	private Charset encoding;
+
 	public Commit(final Repository db) {
 		objdb = db;
 		parentIds = new ArrayList(2);

@@ -132,8 +134,7 @@ public class Commit implements Treeish {
 		// FIXME: handle I/O errors
 		if (raw != null) {
 			try {
-				BufferedReader br = new BufferedReader(new InputStreamReader(
-						new ByteArrayInputStream(raw)));
+				DataInputStream br = new DataInputStream(new ByteArrayInputStream(raw));
 				String n = br.readLine();
 				if (n == null || !n.startsWith("tree ")) {
 					throw new CorruptObjectException(commitId, "no tree");

@@ -144,24 +145,33 @@ public class Commit implements Treeish {
 				if (n == null || !n.startsWith("author ")) {
 					throw new CorruptObjectException(commitId, "no author");
 				}
-				author = new PersonIdent(n.substring("author ".length()));
+				String rawAuthor = n.substring("author ".length());
 				n = br.readLine();
 				if (n == null || !n.startsWith("committer ")) {
 					throw new CorruptObjectException(commitId, "no committer");
 				}
-				committer = new PersonIdent(n.substring("committer ".length()));
+				String rawCommitter = n.substring("committer ".length());
 				n = br.readLine();
-				if (n == null || !n.equals("")) {
-					throw new CorruptObjectException(commitId,
-							"malformed header");
+				if (n != null && n.startsWith(	"encoding"))
+					encoding = Charset.forName(n.substring("encoding ".length()));
+				else
+					if (n == null || !n.equals("")) {
+						throw new CorruptObjectException(commitId,
+								"malformed header:"+n);
 				}
-				StringBuffer tempMessage = new StringBuffer();
-				char[] readBuf = new char[2048];
-				int readLen;
-				while ((readLen = br.read(readBuf)) > 0) {
-					tempMessage.append(readBuf, 0, readLen);
+				byte[] readBuf = new byte[br.available()]; // in-memory stream so this is all bytes left
+				br.read(readBuf);
+				if (encoding != null) {
+					// TODO: this isn't reliable so we need to guess the encoding from the actual content
+					author = new PersonIdent(new String(rawAuthor.getBytes(),encoding));
+					committer = new PersonIdent(new String(rawCommitter.getBytes(),encoding));
+					message = new String(readBuf,encoding);
+				} else {
+					// TODO: use config setting / platform / ascii / iso-latin
+					author = new PersonIdent(new String(rawAuthor.getBytes()));
+					committer = new PersonIdent(new String(rawCommitter.getBytes()));
+					message = new String(readBuf);
 				}
-				message = tempMessage.toString();
 			} catch (IOException e) {
 				e.printStackTrace();
 			} finally {

@@ -183,4 +193,19 @@ public class Commit implements Treeish {
 	public String toString() {
 		return "Commit[" + getCommitId() + " " + getAuthor() + "]";
 	}
+
+	public void setEncoding(String e) {
+		encoding = Charset.forName(e);
+	}
+
+	public void setEncoding(Charset e) {
+		encoding = e;
+	}
+
+	public String getEncoding() {
+		if (encoding != null)
+			return encoding.name();
+		else
+			return null;
+	}
 }

@@ -108,8 +108,11 @@ public class ObjectWriter {
 
 	public ObjectId writeCommit(final Commit c) throws IOException {
 		final ByteArrayOutputStream os = new ByteArrayOutputStream();
+		String encoding = c.getEncoding();
+		if (encoding == null)
+			encoding = Constants.CHARACTER_ENCODING;
 		final OutputStreamWriter w = new OutputStreamWriter(os,
-				Constants.CHARACTER_ENCODING);
+				encoding);
 
 		w.write("tree ");
 		c.getTreeId().copyTo(w);

@@ -130,6 +133,12 @@ public class ObjectWriter {
 		w.write(c.getCommitter().toExternalString());
 		w.write('\n');
 
+		if (!encoding.equals("UTF-8")) {
+			w.write("encoding ");
+			w.write(encoding);
+			w.write('\n');
+		}
+		
 		w.write('\n');
 		w.write(c.getMessage());
 		w.close();

@@ -21,6 +21,8 @@ import java.io.FileInputStream;
 import java.io.FileReader;
 import java.io.FileWriter;
 import java.io.IOException;
+import java.util.Date;
+import java.util.TimeZone;
 
 public class T0003_Basic extends RepositoryTestCase {
 	public void test001_Initalize() {

@@ -385,4 +387,34 @@ public class T0003_Basic extends RepositoryTestCase {
 		assertEquals(new PersonIdent(jauthor, 1154236443000L, -4 * 60), mapTag.getAuthor());
 		assertEquals("b5d3b45a96b340441f5abb9080411705c51cc86c", mapTag.getObjId().toString());
 	}
+	
+	public void test023_createCommitNonAscii() throws IOException {
+		final ObjectId emptyId = new ObjectWriter(db).writeBlob(new byte[0]);
+		final Tree almostEmptyTree = new Tree(db);
+		almostEmptyTree.addEntry(new FileTreeEntry(almostEmptyTree, emptyId, "empty".getBytes(), false));
+		final ObjectId almostEmptyTreeId = new ObjectWriter(db).writeTree(almostEmptyTree);
+		Commit commit = new Commit(db);
+		commit.setTreeId(almostEmptyTreeId);
+		commit.setAuthor(new PersonIdent("Joe H\u00e4cker","joe@example.com",new Date(1900,0,1), TimeZone.getTimeZone("CET")));
+		commit.setCommitter(new PersonIdent("Joe Hacker","joe2@example.com",new Date(1900,0,1), TimeZone.getTimeZone("CET")));
+		commit.setEncoding("UTF-8");
+		commit.setMessage("\u00dcbergeeks");
+		ObjectId cid = new ObjectWriter(db).writeCommit(commit);
+		assertEquals("ed63583834b8a627474ee9f9330434ef37a04825", cid.toString());
+	}
+
+	public void test024_createCommitNonAscii() throws IOException {
+		final ObjectId emptyId = new ObjectWriter(db).writeBlob(new byte[0]);
+		final Tree almostEmptyTree = new Tree(db);
+		almostEmptyTree.addEntry(new FileTreeEntry(almostEmptyTree, emptyId, "empty".getBytes(), false));
+		final ObjectId almostEmptyTreeId = new ObjectWriter(db).writeTree(almostEmptyTree);
+		Commit commit = new Commit(db);
+		commit.setTreeId(almostEmptyTreeId);
+		commit.setAuthor(new PersonIdent("Joe H\u00e4cker","joe@example.com",new Date(1900,0,1), TimeZone.getTimeZone("CET")));
+		commit.setCommitter(new PersonIdent("Joe Hacker","joe2@example.com",new Date(1900,0,1), TimeZone.getTimeZone("CET")));
+		commit.setEncoding("ISO-8859-1");
+		commit.setMessage("\u00dcbergeeks");
+		ObjectId cid = new ObjectWriter(db).writeCommit(commit);
+		assertEquals("afc8532038e7220179127b7e96acf534486798ce", cid.toString());
+	}
 }

@@ -18,6 +18,7 @@ package org.spearce.egit.core.internal.mapping;
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Date;

@@ -34,13 +35,14 @@ import org.spearce.egit.core.project.RepositoryMapping;
 import org.spearce.jgit.lib.Commit;
 import org.spearce.jgit.lib.ObjectId;
 import org.spearce.jgit.lib.Repository;
+import org.spearce.jgit.lib.Tree;
 import org.spearce.jgit.lib.TreeEntry;
 
 public class GitFileHistory extends FileHistory {
 
 	private final IResource resource;
 
-	private final String relativeResourceName;
+	private final String[] relativeResourceName;
 
 	private final int flags;
 

@@ -50,12 +52,11 @@ public class GitFileHistory extends FileHistory {
 		this.resource = resource;
 		this.flags = flags;
 		String prefix = getRepositoryMapping().getSubset();
-		if (prefix != null)
-			prefix = prefix + "/";
-		else
-			prefix = "";
-		relativeResourceName = prefix
-				+ resource.getProjectRelativePath().toString();
+		String[] prefixSegments = prefix!=null ? prefix.split("/") : new String[0];
+		String[] resourceSegments = resource.getProjectRelativePath().segments(); 
+		relativeResourceName = new String[prefixSegments.length + resourceSegments.length];
+		System.arraycopy(prefixSegments, 0, relativeResourceName, 0, prefixSegments.length);
+		System.arraycopy(resourceSegments, 0, relativeResourceName, prefixSegments.length, resourceSegments.length);
 	}
 
 	public IFileRevision[] getContributors(IFileRevision revision) {

@@ -105,7 +106,9 @@ public class GitFileHistory extends FileHistory {
 		try {
 			ObjectId id = repository.resolve("HEAD");
 			Commit commit = repository.mapCommit(id);
-			return collectHistory(new ObjectId(ObjectId.toString(null)),
+			ObjectId[] initialResourceHash = new ObjectId[relativeResourceName.length];
+			Arrays.fill(initialResourceHash, ObjectId.zeroId());
+			return collectHistory(initialResourceHash, null,
 					repository, commit);
 		} catch (IOException e) {
 			e.printStackTrace();

@@ -113,29 +116,49 @@ public class GitFileHistory extends FileHistory {
 		}
 	}
 
-	private Collection collectHistory(ObjectId lastResourceHash,
-			Repository repository, Commit top) {
+	private Collection collectHistory(ObjectId[] lastResourceHash, TreeEntry lastEntry,
+			Repository repository, Commit top) throws IOException {
 		if (top == null)
 			return Collections.EMPTY_LIST;
 		Collection ret = new ArrayList(10000);
 		Commit current = top;
 		Commit previous = top;
+
 		do {
-			TreeEntry currentEntry;
-			try {
-				currentEntry = current.getTree().findMember(
-						relativeResourceName);
-			} catch (IOException e1) {
-				e1.printStackTrace();
-				return ret;
+			TreeEntry currentEntry = lastEntry;
+			ObjectId[] currentResourceHash = new ObjectId[lastResourceHash.length];
+			Tree t = current.getTree();
+			for (int i = 0; i < currentResourceHash.length; ++i) {
+				TreeEntry m = t.findMember(relativeResourceName[i]);
+				if (m != null) {
+					ObjectId id = m.getId();
+					currentResourceHash[i] = id;
+					if (id.equals(lastResourceHash[i])) {
+						while (++i < currentResourceHash.length) {
+							currentResourceHash[i] = lastResourceHash[i];
+						}
+					} else {
+						if (m instanceof Tree) {
+							t = (Tree)m;
+						} else {
+							if (i == currentResourceHash.length - 1) {
+								currentEntry = m;
+							} else {
+								currentEntry = null;
+								while (++i < currentResourceHash.length) {
+									currentResourceHash[i] = ObjectId.zeroId();
+								}
+							}
+						}
+					}
+				} else {
+					for (; i < currentResourceHash.length; ++i) {
+						currentResourceHash[i] = ObjectId.zeroId();
+					}
+				}
 			}
-			ObjectId currentResourceHash;
-			if (currentEntry == null)
-				currentResourceHash = new ObjectId(ObjectId.toString(null));
-			else
-				currentResourceHash = currentEntry.getId();
-
-			if (!currentResourceHash.equals(lastResourceHash))
+			
+			if (!currentResourceHash[currentResourceHash.length-1].equals(lastResourceHash[currentResourceHash.length-1]))
 				ret.add(new GitFileRevision(previous, resource));
 
 			lastResourceHash = currentResourceHash;

@@ -150,7 +173,7 @@ public class GitFileHistory extends FileHistory {
 					Commit mergeParent;
 					try {
 						mergeParent = repository.mapCommit(mergeParentId);
-						ret.addAll(collectHistory(lastResourceHash, repository,
+						ret.addAll(collectHistory(lastResourceHash, currentEntry, repository, 
 								mergeParent));
 						// TODO: this gets us a lot of duplicates that we need
 						// to filter out

@@ -208,8 +231,10 @@ public class GitFileHistory extends FileHistory {
 					return;
 				}
 			}
-			TreeEntry currentEntry = current.getTree().findMember(
-					relativeResourceName);
+			TreeEntry currentEntry = current.getTree();
+			for (int i=0; i < relativeResourceName.length && currentEntry != null; ++i) {
+				((Tree)currentEntry).findMember(relativeResourceName[i]);
+			}
 			if (currentEntry != null)
 				revisions = new IFileRevision[] { new GitFileRevision(current,
 						resource) };

@@ -30,6 +30,10 @@ public class ObjectId implements Comparable {
 		ZEROID_STR = ZEROID.toString();
 	}
 
+	public static ObjectId zeroId() {
+		return ZEROID;
+	}
+	
 	public static final boolean isId(final String id) {
 		if (id.length() != (2 * Constants.OBJECT_ID_LENGTH)) {
 			return false;

@@ -80,6 +84,8 @@ public class ObjectId implements Comparable {
 	}
 
 	private static int compare(final byte[] a, final byte[] b) {
+		if (a==b)
+			return 0;
 		for (int k = 0; k < a.length && k < b.length; k++) {
 			final int ak = a[k] & 0xff;
 			final int bk = b[k] & 0xff;

@@ -25,6 +25,8 @@ import java.io.FileWriter;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Map;
+import java.util.WeakHashMap;
 
 import org.spearce.jgit.errors.IncorrectObjectTypeException;
 import org.spearce.jgit.errors.ObjectWritingException;

@@ -45,6 +47,8 @@ public class Repository {
 
 	private WindowCache windows;
 
+	private Map cache = new WeakHashMap(30000); 
+
 	public Repository(final File d) throws IOException {
 		gitDir = d.getAbsoluteFile();
 		objectsDir = new File(gitDir, "objects");

@@ -185,12 +189,19 @@ public class Repository {
 	}
 
 	public Commit mapCommit(final ObjectId id) throws IOException {
+		Commit ret = (Commit)cache.get(id);
+		if (ret != null)
+			return ret;
+
 		final ObjectLoader or = openObject(id);
 		if (or == null)
 			return null;
 		final byte[] raw = or.getBytes();
-		if (Constants.TYPE_COMMIT.equals(or.getType()))
-			return new Commit(this, id, raw);
+		if (Constants.TYPE_COMMIT.equals(or.getType())) {
+			ret = new Commit(this, id, raw);
+			cache.put(id, ret);
+			return ret;
+		}
 		throw new IncorrectObjectTypeException(id, Constants.TYPE_COMMIT);
 	}
 

@@ -41,7 +41,10 @@ public class GitStorage implements IStorage {
 
 	private TreeEntry entry;
 
+	private ObjectId treeId;
+
 	public GitStorage(ObjectId treeId, IResource resource) {
+		this.treeId = treeId;
 		this.resource = resource;
 		if (treeId == null)
 			return;

@@ -68,13 +71,17 @@ public class GitStorage implements IStorage {
 
 	public InputStream getContents() throws CoreException {
 		try {
-			if (entry == null) {
+			if (treeId == null) {
 				return ((IFile) resource).getContents();
 			} else {
-				ObjectId id = entry.getId();
-				ObjectLoader reader = entry.getRepository().openBlob(id);
-				byte[] bytes = reader.getBytes();
-				return new ByteArrayInputStream(bytes);
+				if (entry == null)
+					return new ByteArrayInputStream(new byte[0]);
+				else {
+					ObjectId id = entry.getId();
+					ObjectLoader reader = entry.getRepository().openBlob(id);
+					byte[] bytes = reader.getBytes();
+					return new ByteArrayInputStream(bytes);
+				}
 			}
 		} catch (FileNotFoundException e) {
 			throw new ResourceException(IResourceStatus.FAILED_READ_LOCAL,

@@ -11,6 +11,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources,
  org.spearce.jgit,
  org.eclipse.core.filesystem
-Export-Package: org.spearce.egit.core.op,
+Export-Package: org.spearce.egit.core.internal.mapping;x-friends:="org.spearce.egit.ui",
+ org.spearce.egit.core.op,
  org.spearce.egit.core.project
 Eclipse-LazyStart: true

@@ -158,7 +158,7 @@ public class GitFileHistory extends FileHistory {
 				}
 			}
 			
-			if (!currentResourceHash[currentResourceHash.length-1].equals(lastResourceHash[currentResourceHash.length-1]))
+			if (currentResourceHash.length == 0 || !currentResourceHash[currentResourceHash.length-1].equals(lastResourceHash[currentResourceHash.length-1]))
 				ret.add(new GitFileRevision(previous, resource));
 
 			lastResourceHash = currentResourceHash;

@@ -50,7 +50,19 @@
                tooltip="%TrackAction_tooltip"
                menubarPath="team.main/group1"
                id="org.spearce.egit.ui.internal.actions.Track"/>
- 	 </objectContribution>
+         <action
+               class="org.spearce.egit.ui.internal.actions.ShowResourceInHistoryAction"
+               id="org.spearce.egit.ui.internal.actions.ShowResourceInHistoryAction"
+               label="%ShowResourceInHistoryAction_label"
+               menubarPath="team.main/group1"
+               tooltip="%ShowResourceInHistoryAction_tooltip"/>
+		<action
+		       class="org.spearce.egit.ui.internal.actions.GitCompareRevisionAction"
+        	   id="org.spearce.egit.ui.internal.actions.GitCompareAction"
+               menubarPath="team.main/group1"
+        	   label="Structured Git Compare">
+		</action>
+ 	  </objectContribution>
       <objectContribution
             objectClass="org.eclipse.core.resources.IFile"
             adaptable="true"

@@ -68,13 +80,6 @@
                overrideActionId="org.eclipse.team.ui.compareLocalHistory"
                tooltip="%CompareWithRevisionAction_tooltip">
          </action>
-         <action
-               class="org.spearce.egit.ui.internal.actions.ShowResourceInHistoryAction"
-               enablesFor="1"
-               id="org.spearce.egit.ui.internal.actions.ShowResourceInHistoryAction"
-               label="%ShowResourceInHistoryAction_label"
-               menubarPath="team.main/group1"
-               tooltip="%ShowResourceInHistoryAction_tooltip"/>
       </objectContribution>
    </extension>
 

@@ -62,6 +62,7 @@ import org.eclipse.team.internal.ui.history.DialogHistoryPageSite;
 import org.eclipse.team.ui.history.HistoryPage;
 import org.eclipse.team.ui.history.IHistoryCompareAdapter;
 import org.eclipse.team.ui.history.IHistoryPageSite;
+import org.spearce.egit.core.internal.mapping.GitFileRevision;
 
 public class GitHistoryPage extends HistoryPage implements IAdaptable,
 		IHistoryCompareAdapter {

@@ -115,6 +116,8 @@ public class GitHistoryPage extends HistoryPage implements IAdaptable,
 				compareAction.setCurrentFileRevision(fileRevisions[0]);
 				compareAction.selectionChanged(new StructuredSelection(
 						selection2));
+				
+				compareAction.setEnabled(selection!=null && selection[0]!=null  && ((GitFileRevision)fileRevisions[0]).getResource().getType() == IResource.FILE);
 			}
 		});
 		compareAction.setPage(this);

@@ -27,7 +27,10 @@ public class GitHistoryPageSource extends HistoryPageSource {
 	}
 
 	public boolean canShowHistoryFor(Object object) {
-		return (object instanceof IResource && ((IResource) object).getType() == IResource.FILE);
+		return (object instanceof IResource 
+				&& (((IResource) object).getType() == IResource.FILE
+						|| ((IResource) object).getType() == IResource.FOLDER
+						|| ((IResource) object).getType() == IResource.PROJECT));
 	}
 
 }

@@ -163,12 +163,13 @@ public class ObjectId implements Comparable {
 	}
 
 	public int hashCode() {
-		int r = 0;
-		for (int k = id.length - 1; k >= 0; k--) {
-			r *= 31;
-			r += id[k];
-		}
-		return r;
+		// Object Id' are well distributed so grab the first four bytes
+		int b0 = id[0] & 0xff;
+		int b1 = id[1] & 0xff;
+		int b2 = id[2] & 0xff;
+		int b3 = id[3] & 0xff;
+		int h = (b0 << 24) | (b1 << 16) | (b2 << 8) | b3;
+		return h;
 	}
 
 	public boolean equals(final ObjectId o) {

@@ -62,6 +62,6 @@ public class GitWorkspaceFileRevision extends GitFileRevision implements
 	}
 
 	public String getContentIdentifier() {
-		return null;
+		return "Workspace";
 	}
 }

@@ -16,7 +16,9 @@
  */
 package org.spearce.egit.core.internal.mapping;
 
+import java.io.BufferedInputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;

@@ -25,12 +27,14 @@ import java.util.Date;
 import java.util.List;
 
 import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
 import org.eclipse.team.core.RepositoryProvider;
 import org.eclipse.team.core.history.IFileHistoryProvider;
 import org.eclipse.team.core.history.IFileRevision;
 import org.eclipse.team.core.history.provider.FileHistory;
 import org.spearce.egit.core.GitProvider;
 import org.spearce.egit.core.GitWorkspaceFileRevision;
+import org.spearce.egit.core.project.GitProjectData;
 import org.spearce.egit.core.project.RepositoryMapping;
 import org.spearce.jgit.lib.Commit;
 import org.spearce.jgit.lib.ObjectId;

@@ -95,10 +99,14 @@ public class GitFileHistory extends FileHistory {
 		return getRepositoryMapping().getRepository();
 	}
 
-	private RepositoryMapping getRepositoryMapping() {
+	private GitProjectData getData() {
 		GitProvider provider = (GitProvider) RepositoryProvider
 				.getProvider(resource.getProject());
-		return provider.getData().getRepositoryMapping(resource.getProject());
+		return provider.getData();
+	}
+
+	private RepositoryMapping getRepositoryMapping() {
+		return getData().getRepositoryMapping(resource.getProject());
 	}
 
 	private Collection collectHistory() {

@@ -108,6 +116,15 @@ public class GitFileHistory extends FileHistory {
 			Commit commit = repository.mapCommit(id);
 			ObjectId[] initialResourceHash = new ObjectId[relativeResourceName.length];
 			Arrays.fill(initialResourceHash, ObjectId.zeroId());
+			TreeEntry[] activeDiffTreeEntries = null;
+			try {
+				activeDiffTreeEntries = getData().getActiveDiffTreeEntries(resource);
+			} catch (CoreException e1) {
+				// TODO: eclipse excetion logging
+				e1.printStackTrace();
+			}
+			if (activeDiffTreeEntries!=null)
+				initialResourceHash[initialResourceHash.length-1] = activeDiffTreeEntries[0].getId();
 			return collectHistory(initialResourceHash, null,
 					repository, commit);
 		} catch (IOException e) {

@@ -195,7 +212,6 @@ public class GitFileHistory extends FileHistory {
 				current = null;
 
 		} while (current != null);
-		ret.add(new GitFileRevision(previous, resource));
 
 		return ret;
 	}

@@ -251,13 +267,39 @@ public class GitFileHistory extends FileHistory {
 		RepositoryProvider provider = RepositoryProvider.getProvider(resource
 				.getProject());
 		if (provider instanceof GitProvider) {
-
-			List ret = new ArrayList();
-			ret.add(new GitWorkspaceFileRevision(resource));
+			GitWorkspaceFileRevision wsrevision = new GitWorkspaceFileRevision(resource);
 
 			long time0 = new Date().getTime();
 			System.out.println("getting file history");
-			ret.addAll(collectHistory());
+			List ret = new ArrayList();
+			Collection githistory = collectHistory();
+			if (githistory.size() >0) {
+				if (resource.getType()==IResource.FILE) {
+					// TODO: consider index in future versions
+					try {
+						InputStream wsContents = new BufferedInputStream(wsrevision.getStorage(null).getContents());
+						InputStream headContents = ((IFileRevision)githistory.toArray()[0]).getStorage(null).getContents();
+						if (!streamsEqual(wsContents,headContents)) {
+							ret.add(wsrevision);
+							ret.addAll(githistory);
+						} else {
+							ret.addAll(githistory);
+						}
+						wsContents.close();
+						headContents.close();
+					} catch (IOException e) {
+						// TODO: Eclipse error handling
+						e.printStackTrace();
+					} catch (CoreException e) {
+						// TODO: Eclipse error handling
+						e.printStackTrace();
+					}
+				} else {
+					ret.addAll(githistory);
+				}
+			} else {
+				ret.add(wsrevision);
+			}
 			long time1 = new Date().getTime();
 			System.out.println("got file history in " + (time1 - time0)
 					/ 1000.0 + "s");

@@ -270,6 +312,20 @@ public class GitFileHistory extends FileHistory {
 		}
 	}
 
+	private boolean streamsEqual(InputStream s1, InputStream s2) {
+		// Speed up...
+		try {
+			int c1,c2;
+			while ((c1=s1.read()) == (c2=s2.read()) && c1!=-1)
+				;
+			return c1 == -1 && c2==-1;
+		} catch (IOException e) {
+			// TODO: eclipse error handling
+			e.printStackTrace();
+			return false;
+		}
+	}
+
 	public IFileRevision[] getTargets(IFileRevision revision) {
 		GitFileRevision grevision = (GitFileRevision) revision;
 		ObjectId targetCommitId = grevision.getCommit().getCommitId();

@@ -156,7 +156,10 @@ public class GitHistoryPage extends HistoryPage implements IAdaptable,
 			if (columnIndex == 0) {
 				String id = ((IFileRevision) element).getContentIdentifier();
 				if (id != null)
-					return id.substring(0, 7) + "..";
+					if (id.length() > 9) // make sure "Workspace" is spelled out
+						return id.substring(0, 7) + "..";
+					else
+						return id;
 				else
 					return id;
 			}

@@ -211,7 +214,7 @@ public class GitHistoryPage extends HistoryPage implements IAdaptable,
 						if (text != null)
 							item.setText(i, text);
 						else
-							item.setText("");
+							item.setText(i, "");
 					}
 					item.setData(fileRevisions[event.index]);
 				}

@@ -28,7 +28,7 @@ public class GitWorkspaceFileRevision extends GitFileRevision implements
 	private final IResource resource;
 
 	public GitWorkspaceFileRevision(IResource resource) {
-		super(null, resource);
+		super(null, resource, -1);
 		this.resource = resource;
 	}
 

@@ -72,7 +72,7 @@ public class GitFileHistory extends FileHistory {
 			try {
 				ret[i] = new GitFileRevision(repository
 						.mapCommit((ObjectId) parents.get(i)), grevision
-						.getResource());
+				.getResource(), -1);
 			} catch (IOException e) {
 				e.printStackTrace();
 				return null;

@@ -87,7 +87,7 @@ public class GitFileHistory extends FileHistory {
 		} else {
 			try {
 				Repository repository = getRepository();
-				return new GitFileRevision(repository.mapCommit(id), resource);
+				return new GitFileRevision(repository.mapCommit(id), resource, 0);
 			} catch (IOException e) {
 				e.printStackTrace();
 				return null;

@@ -125,7 +125,7 @@ public class GitFileHistory extends FileHistory {
 			}
 			if (activeDiffTreeEntries!=null)
 				initialResourceHash[initialResourceHash.length-1] = activeDiffTreeEntries[0].getId();
-			return collectHistory(initialResourceHash, null,
+			return collectHistory(0, initialResourceHash, null,
 					repository, commit);
 		} catch (IOException e) {
 			e.printStackTrace();

@@ -133,7 +133,7 @@ public class GitFileHistory extends FileHistory {
 		}
 	}
 
-	private Collection collectHistory(ObjectId[] lastResourceHash, TreeEntry lastEntry,
+	private Collection collectHistory(int count, ObjectId[] lastResourceHash, TreeEntry lastEntry,
 			Repository repository, Commit top) throws IOException {
 		if (top == null)
 			return Collections.EMPTY_LIST;

@@ -176,7 +176,7 @@ public class GitFileHistory extends FileHistory {
 			}
 			
 			if (currentResourceHash.length == 0 || !currentResourceHash[currentResourceHash.length-1].equals(lastResourceHash[currentResourceHash.length-1]))
-				ret.add(new GitFileRevision(previous, resource));
+				ret.add(new GitFileRevision(previous, resource, count));
 
 			lastResourceHash = currentResourceHash;
 			previous = current;

@@ -190,7 +190,7 @@ public class GitFileHistory extends FileHistory {
 					Commit mergeParent;
 					try {
 						mergeParent = repository.mapCommit(mergeParentId);
-						ret.addAll(collectHistory(lastResourceHash, currentEntry, repository, 
+						ret.addAll(collectHistory(0, lastResourceHash, currentEntry, repository, 
 								mergeParent));
 						// TODO: this gets us a lot of duplicates that we need
 						// to filter out

@@ -210,7 +210,8 @@ public class GitFileHistory extends FileHistory {
 				}
 			} else
 				current = null;
-
+			if (count>=0)
+				count++;
 		} while (current != null);
 
 		return ret;

@@ -252,8 +253,8 @@ public class GitFileHistory extends FileHistory {
 				((Tree)currentEntry).findMember(relativeResourceName[i]);
 			}
 			if (currentEntry != null)
-				revisions = new IFileRevision[] { new GitFileRevision(current,
-						resource) };
+				revisions = new IFileRevision[] { new GitFileRevision(current, resource,
+						-1) };
 			else
 				revisions = new IFileRevision[0];
 

@@ -44,7 +44,10 @@ public class GitFileRevision extends FileRevision {
 
 	private final Commit commit;
 
-	public GitFileRevision(Commit commit, IResource resource) {
+	private final int count;
+
+	public GitFileRevision(Commit commit, IResource resource, int count) {
+		this.count = count;
 		this.commit = commit;
 		this.resource = resource;
 	}

@@ -129,4 +132,8 @@ public class GitFileRevision extends FileRevision {
 	public IResource getResource() {
 		return resource;
 	}
+
+	public int getCount() {
+		return count;
+	}
 }

@@ -154,6 +154,19 @@ public class GitHistoryPage extends HistoryPage implements IAdaptable,
 
 		public String getColumnText(Object element, int columnIndex) {
 			if (columnIndex == 0) {
+				int count = ((GitFileRevision) element).getCount();
+				if (count < 0)
+					return "";
+				else
+					if (count == 0)
+						return "HEAD";
+					else
+						return "HEAD~"+count;
+			}
+			
+			if (columnIndex == 1) {
+				String rss = ((IFileRevision) element).getURI().toString();
+				String rs = rss.substring(rss.length()-10);
 				String id = ((IFileRevision) element).getContentIdentifier();
 				if (id != null)
 					if (id.length() > 9) // make sure "Workspace" is spelled out

@@ -161,20 +174,20 @@ public class GitHistoryPage extends HistoryPage implements IAdaptable,
 					else
 						return id;
 				else
-					return id;
+					return id + "@.." + rs;
 			}
 
-			if (columnIndex == 1)
+			if (columnIndex == 2)
 				return ""; // TAGS
 
-			if (columnIndex == 2)
+			if (columnIndex == 3)
 				return new Date(((IFileRevision) element).getTimestamp())
 						.toString();
 
-			if (columnIndex == 3)
+			if (columnIndex == 4)
 				return ((IFileRevision) element).getAuthor();
 
-			if (columnIndex == 4) {
+			if (columnIndex == 5) {
 				String comment = ((IFileRevision) element).getComment();
 				if (comment == null)
 					return null;

@@ -186,8 +199,7 @@ public class GitHistoryPage extends HistoryPage implements IAdaptable,
 			}
 			return Integer.toString(columnIndex);
 		}
-
-	}
+	};
 
 	private void createTree(Composite composite) {
 		tree = new Tree(composite, SWT.H_SCROLL | SWT.V_SCROLL | SWT.MULTI

@@ -200,23 +212,27 @@ public class GitHistoryPage extends HistoryPage implements IAdaptable,
 		tree.setData("HEAD");
 		tree.addListener(SWT.SetData, new Listener() {
 			public void handleEvent(Event event) {
-				TreeItem item = (TreeItem) event.item;
-				Tree parent = item.getParent();
-				if (parent == null) {
-					item.setText(new String[] { "hej", "san" });
-					item.setData("");
-				} else {
-					ITableLabelProvider p = (ITableLabelProvider) viewer
-							.getLabelProvider();
-					for (int i = 0; i < 5; ++i) {
-						String text = p.getColumnText(
-								fileRevisions[event.index], i);
-						if (text != null)
-							item.setText(i, text);
-						else
-							item.setText(i, "");
+				try {
+					TreeItem item = (TreeItem) event.item;
+					Tree parent = item.getParent();
+					if (parent == null) {
+						item.setText(new String[] { "hej", "san" });
+						item.setData("");
+					} else {
+						ITableLabelProvider p = (ITableLabelProvider) viewer
+								.getLabelProvider();
+						for (int i = 0; i < 6; ++i) {
+							String text = p.getColumnText(
+									fileRevisions[event.index], i);
+							if (text != null)
+								item.setText(i, text);
+							else
+								item.setText(i, "");
+						}
+						item.setData(fileRevisions[event.index]);
 					}
-					item.setData(fileRevisions[event.index]);
+				} catch (Throwable b) {
+					b.printStackTrace();
 				}
 			}
 		});