GitNotes. Unit testing. More correct refs.

17 files changed, 340 insertions, 191 deletions

diff --git a/src/com/gitblit/wicket/GitBlitWebApp.properties b/src/com/gitblit/wicket/GitBlitWebApp.properties
index 2ba03e6e..f64f1e56 100644
--- a/src/com/gitblit/wicket/GitBlitWebApp.properties
+++ b/src/com/gitblit/wicket/GitBlitWebApp.properties
@@ -93,4 +93,5 @@ gb.zip = zip
 gb.showReadme = show readme

 gb.showReadmeDescription = show a \"readme\" markdown file on the summary page

 gb.nameDescription = use '/' to group repositories.  e.g. libraries/mycoollib.git

-gb.ownerDescription = the owner may edit repository settings
\ No newline at end of file
+gb.ownerDescription = the owner may edit repository settings

+gb.blob = blob
\ No newline at end of file
diff --git a/src/com/gitblit/wicket/pages/BlobPage.java b/src/com/gitblit/wicket/pages/BlobPage.java
index 4601ac7b..3c5c8e04 100644
--- a/src/com/gitblit/wicket/pages/BlobPage.java
+++ b/src/com/gitblit/wicket/pages/BlobPage.java
@@ -29,6 +29,7 @@ import org.eclipse.jgit.revwalk.RevCommit;
 import com.gitblit.GitBlit;

 import com.gitblit.Keys;

 import com.gitblit.utils.JGitUtils;

+import com.gitblit.utils.StringUtils;

 import com.gitblit.wicket.WicketUtils;

 import com.gitblit.wicket.panels.CommitHeaderPanel;

 import com.gitblit.wicket.panels.PathBreadcrumbsPanel;

@@ -38,82 +39,100 @@ public class BlobPage extends RepositoryPage {
 	public BlobPage(PageParameters params) {

 		super(params);

 

+		Repository r = getRepository();

 		final String blobPath = WicketUtils.getPath(params);

 

-		String extension = null;

-		if (blobPath.lastIndexOf('.') > -1) {

-			extension = blobPath.substring(blobPath.lastIndexOf('.') + 1).toLowerCase();

-		}

+		if (StringUtils.isEmpty(blobPath)) {

+			// blob by objectid

 

-		// see if we should redirect to the markdown page

-		for (String ext : GitBlit.getStrings(Keys.web.markdownExtensions)) {

-			if (ext.equals(extension)) {

-				setResponsePage(MarkdownPage.class, params);

-				return;

+			add(new Label("blameLink", getString("gb.blame")).setEnabled(false));

+			add(new BookmarkablePageLink<Void>("historyLink", HistoryPage.class).setEnabled(false));

+			add(new BookmarkablePageLink<Void>("rawLink", RawPage.class,

+					WicketUtils.newPathParameter(repositoryName, objectId, blobPath)));

+			add(new BookmarkablePageLink<Void>("headLink", BlobPage.class).setEnabled(false));

+			add(new CommitHeaderPanel("commitHeader", objectId));

+			add(new PathBreadcrumbsPanel("breadcrumbs", repositoryName, blobPath, objectId));

+			Component c = new Label("blobText", JGitUtils.getStringContent(r, objectId));

+			WicketUtils.setCssClass(c, "plainprint");

+			add(c);

+		} else {

+			// standard blob view

+			String extension = null;

+			if (blobPath.lastIndexOf('.') > -1) {

+				extension = blobPath.substring(blobPath.lastIndexOf('.') + 1).toLowerCase();

 			}

-		}

 

-		// standard blob view

-		Repository r = getRepository();

-		RevCommit commit = getCommit();

+			// see if we should redirect to the markdown page

+			for (String ext : GitBlit.getStrings(Keys.web.markdownExtensions)) {

+				if (ext.equals(extension)) {

+					setResponsePage(MarkdownPage.class, params);

+					return;

+				}

+			}

 

-		// blob page links

-		add(new Label("blameLink", getString("gb.blame")));

-		add(new BookmarkablePageLink<Void>("historyLink", HistoryPage.class,

-				WicketUtils.newPathParameter(repositoryName, objectId, blobPath)));

-		add(new BookmarkablePageLink<Void>("rawLink", RawPage.class, WicketUtils.newPathParameter(

-				repositoryName, objectId, blobPath)));

-		add(new BookmarkablePageLink<Void>("headLink", BlobPage.class,

-				WicketUtils.newPathParameter(repositoryName, Constants.HEAD, blobPath)));

+			// manually get commit because it can be null

+			RevCommit commit = JGitUtils.getCommit(r, objectId);

 

-		add(new CommitHeaderPanel("commitHeader", repositoryName, commit));

+			// blob page links

+			add(new Label("blameLink", getString("gb.blame")));

+			add(new BookmarkablePageLink<Void>("historyLink", HistoryPage.class,

+					WicketUtils.newPathParameter(repositoryName, objectId, blobPath)));

+			add(new BookmarkablePageLink<Void>("rawLink", RawPage.class,

+					WicketUtils.newPathParameter(repositoryName, objectId, blobPath)));

+			add(new BookmarkablePageLink<Void>("headLink", BlobPage.class,

+					WicketUtils.newPathParameter(repositoryName, Constants.HEAD, blobPath)));

 

-		add(new PathBreadcrumbsPanel("breadcrumbs", repositoryName, blobPath, objectId));

+			add(new CommitHeaderPanel("commitHeader", repositoryName, commit));

 

-		// Map the extensions to types

-		Map<String, Integer> map = new HashMap<String, Integer>();

-		for (String ext : GitBlit.getStrings(Keys.web.prettyPrintExtensions)) {

-			map.put(ext.toLowerCase(), 1);

-		}

-		for (String ext : GitBlit.getStrings(Keys.web.imageExtensions)) {

-			map.put(ext.toLowerCase(), 2);

-		}

-		for (String ext : GitBlit.getStrings(Keys.web.binaryExtensions)) {

-			map.put(ext.toLowerCase(), 3);

-		}

+			add(new PathBreadcrumbsPanel("breadcrumbs", repositoryName, blobPath, objectId));

 

-		if (extension != null) {

-			int type = 0;

-			if (map.containsKey(extension)) {

-				type = map.get(extension);

+			// Map the extensions to types

+			Map<String, Integer> map = new HashMap<String, Integer>();

+			for (String ext : GitBlit.getStrings(Keys.web.prettyPrintExtensions)) {

+				map.put(ext.toLowerCase(), 1);

+			}

+			for (String ext : GitBlit.getStrings(Keys.web.imageExtensions)) {

+				map.put(ext.toLowerCase(), 2);

+			}

+			for (String ext : GitBlit.getStrings(Keys.web.binaryExtensions)) {

+				map.put(ext.toLowerCase(), 3);

 			}

-			Component c = null;

-			switch (type) {

-			case 1:

-				// PrettyPrint blob text

-				c = new Label("blobText", JGitUtils.getRawContentAsString(r, commit, blobPath));

-				WicketUtils.setCssClass(c, "prettyprint linenums");

-				break;

-			case 2:

-				// TODO image blobs

-				c = new Label("blobText", "Image File");

-				break;

-			case 3:

-				// TODO binary blobs

-				c = new Label("blobText", "Binary File");

-				break;

-			default:

+

+			if (extension != null) {

+				int type = 0;

+				if (map.containsKey(extension)) {

+					type = map.get(extension);

+				}

+				Component c = null;

+				switch (type) {

+				case 1:

+					// PrettyPrint blob text

+					c = new Label("blobText", JGitUtils.getStringContent(r, commit.getTree(),

+							blobPath));

+					WicketUtils.setCssClass(c, "prettyprint linenums");

+					break;

+				case 2:

+					// TODO image blobs

+					c = new Label("blobText", "Image File");

+					break;

+				case 3:

+					// TODO binary blobs

+					c = new Label("blobText", "Binary File");

+					break;

+				default:

+					// plain text

+					c = new Label("blobText", JGitUtils.getStringContent(r, commit.getTree(),

+							blobPath));

+					WicketUtils.setCssClass(c, "plainprint");

+				}

+				add(c);

+			} else {

 				// plain text

-				c = new Label("blobText", JGitUtils.getRawContentAsString(r, commit, blobPath));

-				WicketUtils.setCssClass(c, "plainprint");

+				Label blobLabel = new Label("blobText", JGitUtils.getStringContent(r,

+						commit.getTree(), blobPath));

+				WicketUtils.setCssClass(blobLabel, "plainprint");

+				add(blobLabel);

 			}

-			add(c);

-		} else {

-			// plain text

-			Label blobLabel = new Label("blobText", JGitUtils.getRawContentAsString(r, commit,

-					blobPath));

-			WicketUtils.setCssClass(blobLabel, "plainprint");

-			add(blobLabel);

 		}

 	}

 

diff --git a/src/com/gitblit/wicket/pages/CommitPage.html b/src/com/gitblit/wicket/pages/CommitPage.html
index bd317b7a..f2d328e0 100644
--- a/src/com/gitblit/wicket/pages/CommitPage.html
+++ b/src/com/gitblit/wicket/pages/CommitPage.html
@@ -45,10 +45,16 @@
 	<div class="commit_message" wicket:id="fullMessage">[commit message]</div>

 

 	<!--  git notes -->

-	<table style="padding-bottom:5px;">

+	<table class="gitnotes">

 		<tr wicket:id="notes">

-			<td style="vertical-align:top;"><span class="headRef" wicket:id="refName"></span><br/><span wicket:id="authorName"></span><br/><span wicket:id="authorDate"></span></td>

-			<td><span wicket:id="noteContent"></span></td>

+			<td class="info">

+				<table>

+					<tr><td><span wicket:id="refName"></span></td></tr>

+					<tr><td><span class="sha1" wicket:id="authorName"></span></td></tr>

+					<tr><td><span class="sha1" wicket:id="authorDate"></span></td></tr>

+				</table>

+			</td>

+			<td class="message"><span class="sha1" wicket:id="noteContent"></span></td>

 		</tr>

 	</table>

 	

diff --git a/src/com/gitblit/wicket/pages/CommitPage.java b/src/com/gitblit/wicket/pages/CommitPage.java
index 3af9cf1d..7b5fdbe0 100644
--- a/src/com/gitblit/wicket/pages/CommitPage.java
+++ b/src/com/gitblit/wicket/pages/CommitPage.java
@@ -16,9 +16,9 @@
 package com.gitblit.wicket.pages;

 

 import java.util.ArrayList;

+import java.util.Arrays;

 import java.util.List;

 

-import org.apache.wicket.Component;

 import org.apache.wicket.PageParameters;

 import org.apache.wicket.markup.html.basic.Label;

 import org.apache.wicket.markup.html.link.BookmarkablePageLink;

@@ -37,12 +37,13 @@ import com.gitblit.Keys;
 import com.gitblit.models.GitNote;

 import com.gitblit.models.PathModel.PathChangeModel;

 import com.gitblit.utils.JGitUtils;

-import com.gitblit.utils.StringUtils;

 import com.gitblit.utils.JGitUtils.SearchType;

+import com.gitblit.utils.StringUtils;

 import com.gitblit.wicket.WicketUtils;

 import com.gitblit.wicket.panels.CommitHeaderPanel;

 import com.gitblit.wicket.panels.CommitLegendPanel;

 import com.gitblit.wicket.panels.LinkPanel;

+import com.gitblit.wicket.panels.RefsPanel;

 

 public class CommitPage extends RepositoryPage {

 

@@ -123,13 +124,10 @@ public class CommitPage extends RepositoryPage {
 

 			public void populateItem(final Item<GitNote> item) {

 				GitNote entry = item.getModelObject();

-				Component c = new LinkPanel("refName", null, entry.notesRef.displayName,

-						CommitPage.class, newCommitParameter(entry.notesRef.commit.getName()));

-				WicketUtils.setCssClass(c, "headRef");

-				item.add(c);

-				item.add(createPersonPanel("authorName", entry.notesRef.commit.getAuthorIdent(), SearchType.AUTHOR));

+				item.add(new RefsPanel("refName", repositoryName, Arrays.asList(entry.notesRef)));

+				item.add(createPersonPanel("authorName", entry.notesRef.getAuthorIdent(), SearchType.AUTHOR));

 				item.add(WicketUtils.createTimestampLabel("authorDate",

-						entry.notesRef.commit.getAuthorIdent().getWhen(), getTimeZone()));

+						entry.notesRef.getAuthorIdent().getWhen(), getTimeZone()));

 				item.add(new Label("noteContent", StringUtils.breakLinesForHtml(entry.content)).setEscapeModelStrings(false));

 			}

 		};

diff --git a/src/com/gitblit/wicket/pages/MarkdownPage.java b/src/com/gitblit/wicket/pages/MarkdownPage.java
index fc8b7cbc..9202fb88 100644
--- a/src/com/gitblit/wicket/pages/MarkdownPage.java
+++ b/src/com/gitblit/wicket/pages/MarkdownPage.java
@@ -48,7 +48,7 @@ public class MarkdownPage extends RepositoryPage {
 				WicketUtils.newPathParameter(repositoryName, Constants.HEAD, markdownPath)));

 

 		// Read raw markdown content and transform it to html

-		String markdownText = JGitUtils.getRawContentAsString(r, commit, markdownPath);

+		String markdownText = JGitUtils.getStringContent(r, commit.getTree(), markdownPath);

 		String htmlText;

 		try {

 			htmlText = MarkdownUtils.transformMarkdown(markdownText);

diff --git a/src/com/gitblit/wicket/pages/RawPage.java b/src/com/gitblit/wicket/pages/RawPage.java
index acda03af..c1ebea5c 100644
--- a/src/com/gitblit/wicket/pages/RawPage.java
+++ b/src/com/gitblit/wicket/pages/RawPage.java
@@ -28,6 +28,7 @@ import org.eclipse.jgit.revwalk.RevCommit;
 import com.gitblit.GitBlit;

 import com.gitblit.Keys;

 import com.gitblit.utils.JGitUtils;

+import com.gitblit.utils.StringUtils;

 import com.gitblit.wicket.WicketUtils;

 

 public class RawPage extends WebPage {

@@ -50,49 +51,58 @@ public class RawPage extends WebPage {
 			return;

 		}

 

-		RevCommit commit = JGitUtils.getCommit(r, objectId);

-

-		String extension = null;

-		if (blobPath.lastIndexOf('.') > -1) {

-			extension = blobPath.substring(blobPath.lastIndexOf('.') + 1);

-		}

+		if (StringUtils.isEmpty(blobPath)) {

+			// objectid referenced raw view

+			Label blobLabel = new Label("rawText", JGitUtils.getStringContent(r, objectId));

+			WicketUtils.setCssClass(blobLabel, "plainprint");

+			add(blobLabel);

+		} else {

+			// standard raw blob view

+			RevCommit commit = JGitUtils.getCommit(r, objectId);

 

-		// Map the extensions to types

-		Map<String, Integer> map = new HashMap<String, Integer>();

-		for (String ext : GitBlit.getStrings(Keys.web.imageExtensions)) {

-			map.put(ext.toLowerCase(), 2);

-		}

-		for (String ext : GitBlit.getStrings(Keys.web.binaryExtensions)) {

-			map.put(ext.toLowerCase(), 3);

-		}

+			String extension = null;

+			if (blobPath.lastIndexOf('.') > -1) {

+				extension = blobPath.substring(blobPath.lastIndexOf('.') + 1);

+			}

 

-		if (extension != null) {

-			int type = 0;

-			if (map.containsKey(extension)) {

-				type = map.get(extension);

+			// Map the extensions to types

+			Map<String, Integer> map = new HashMap<String, Integer>();

+			for (String ext : GitBlit.getStrings(Keys.web.imageExtensions)) {

+				map.put(ext.toLowerCase(), 2);

+			}

+			for (String ext : GitBlit.getStrings(Keys.web.binaryExtensions)) {

+				map.put(ext.toLowerCase(), 3);

 			}

-			Component c = null;

-			switch (type) {

-			case 2:

-				// TODO image blobs

-				c = new Label("rawText", "Image File");

-				break;

-			case 3:

-				// TODO binary blobs

-				c = new Label("rawText", "Binary File");

-				break;

-			default:

+

+			if (extension != null) {

+				int type = 0;

+				if (map.containsKey(extension)) {

+					type = map.get(extension);

+				}

+				Component c = null;

+				switch (type) {

+				case 2:

+					// TODO image blobs

+					c = new Label("rawText", "Image File");

+					break;

+				case 3:

+					// TODO binary blobs

+					c = new Label("rawText", "Binary File");

+					break;

+				default:

+					// plain text

+					c = new Label("rawText", JGitUtils.getStringContent(r, commit.getTree(),

+							blobPath));

+					WicketUtils.setCssClass(c, "plainprint");

+				}

+				add(c);

+			} else {

 				// plain text

-				c = new Label("rawText", JGitUtils.getRawContentAsString(r, commit, blobPath));

-				WicketUtils.setCssClass(c, "plainprint");

+				Label blobLabel = new Label("rawText", JGitUtils.getStringContent(r,

+						commit.getTree(), blobPath));

+				WicketUtils.setCssClass(blobLabel, "plainprint");

+				add(blobLabel);

 			}

-			add(c);

-		} else {

-			// plain text

-			Label blobLabel = new Label("rawText", JGitUtils.getRawContentAsString(r, commit,

-					blobPath));

-			WicketUtils.setCssClass(blobLabel, "plainprint");

-			add(blobLabel);

 		}

 		r.close();

 	}

diff --git a/src/com/gitblit/wicket/pages/SummaryPage.java b/src/com/gitblit/wicket/pages/SummaryPage.java
index a2d36d2e..fd21ed64 100644
--- a/src/com/gitblit/wicket/pages/SummaryPage.java
+++ b/src/com/gitblit/wicket/pages/SummaryPage.java
@@ -167,7 +167,7 @@ public class SummaryPage extends RepositoryPage {
 					}

 				}

 				if (!StringUtils.isEmpty(readme)) {

-					String markdownText = JGitUtils.getRawContentAsString(r, head, readme);

+					String markdownText = JGitUtils.getStringContent(r, head.getTree(), readme);

 					htmlText = MarkdownUtils.transformMarkdown(markdownText);

 				}

 			} catch (ParseException p) {

diff --git a/src/com/gitblit/wicket/pages/TagPage.html b/src/com/gitblit/wicket/pages/TagPage.html
index 839375bc..f1a42c1a 100644
--- a/src/com/gitblit/wicket/pages/TagPage.html
+++ b/src/com/gitblit/wicket/pages/TagPage.html
@@ -12,8 +12,10 @@
 	

 	<!-- commit info -->

 	<table class="plain">

-		<tr><th><wicket:message key="gb.object">[object]</wicket:message></th><td><span class="sha1" wicket:id="tagId">[tag id]</span></td></tr>

-		<tr><th><wicket:message key="gb.tagger">[tagger]</wicket:message></th><td><span class="sha1" wicket:id="tagAuthor">[tag author]</span></td></tr>

+		<tr><th><wicket:message key="gb.name">[name]</wicket:message></th><td><span class="tagRef" wicket:id="tagName">[tag name]</span></td></tr>

+		<tr><th><wicket:message key="gb.tag">[tag]</wicket:message></th><td><span class="sha1" wicket:id="tagId">[tag id]</span></td></tr>

+		<tr><th><wicket:message key="gb.object">[object]</wicket:message></th><td><span class="sha1" wicket:id="taggedObject">[tagged object]</span> <span class="link" wicket:id="taggedObjectType"></span></td></tr>

+		<tr><th><wicket:message key="gb.tagger">[tagger]</wicket:message></th><td><span class="sha1" wicket:id="tagger">[tagger]</span></td></tr>

 		<tr><th></th><td><span class="sha1" wicket:id="tagDate">[tag date]</span></td></tr>

 	</table>

 	

diff --git a/src/com/gitblit/wicket/pages/TagPage.java b/src/com/gitblit/wicket/pages/TagPage.java
index 7945231d..71a86452 100644
--- a/src/com/gitblit/wicket/pages/TagPage.java
+++ b/src/com/gitblit/wicket/pages/TagPage.java
@@ -15,17 +15,21 @@
  */

 package com.gitblit.wicket.pages;

 

+import java.text.MessageFormat;

+import java.util.Arrays;

 import java.util.List;

 

 import org.apache.wicket.PageParameters;

+import org.apache.wicket.markup.html.basic.Label;

+import org.eclipse.jgit.lib.Constants;

 import org.eclipse.jgit.lib.Repository;

-import org.eclipse.jgit.revwalk.RevCommit;

 

 import com.gitblit.models.RefModel;

 import com.gitblit.utils.JGitUtils;

 import com.gitblit.utils.JGitUtils.SearchType;

 import com.gitblit.wicket.WicketUtils;

 import com.gitblit.wicket.panels.LinkPanel;

+import com.gitblit.wicket.panels.RefsPanel;

 

 public class TagPage extends RepositoryPage {

 

@@ -33,11 +37,10 @@ public class TagPage extends RepositoryPage {
 		super(params);

 

 		Repository r = getRepository();

-		RevCommit c = getCommit();

-		List<RefModel> tags = JGitUtils.getTags(r, -1);

 

+		// Find tag in repository

+		List<RefModel> tags = JGitUtils.getTags(r, -1);

 		RefModel tagRef = null;

-		// determine tag

 		for (RefModel tag : tags) {

 			if (tag.getName().equals(objectId) || tag.getObjectId().getName().equals(objectId)) {

 				tagRef = tag;

@@ -45,25 +48,42 @@ public class TagPage extends RepositoryPage {
 			}

 		}

 

+		// Failed to find tag!

 		if (tagRef == null) {

-			// point to commit

-			add(new LinkPanel("commit", "title", c.getShortMessage(), CommitPage.class,

-					newCommitParameter()));

-			add(new LinkPanel("tagId", "list", c.getName(), CommitPage.class,

-					newCommitParameter(c.getName())));

-		} else {

-			// TODO commit or tree or blob?

-			add(new LinkPanel("commit", "title", tagRef.displayName, CommitPage.class,

-					newCommitParameter()));

-			add(new LinkPanel("tagId", "list", c.getName(), CommitPage.class,

-					newCommitParameter(c.getName())));

+			error(MessageFormat.format("Could not find tag {0}", objectId), true);

+		}

+

+		// Display tag.

+		Class<? extends RepositoryPage> linkClass;

+		PageParameters linkParameters = newCommitParameter(tagRef.getReferencedObjectId().getName());

+		String typeKey;

+		switch (tagRef.getReferencedObjectType()) {

+		case Constants.OBJ_BLOB:

+			typeKey = "gb.blob";

+			linkClass = BlobPage.class;

+			break;

+		case Constants.OBJ_TREE:

+			typeKey = "gb.tree";

+			linkClass = TreePage.class;

+			break;

+		case Constants.OBJ_COMMIT:

+		default:

+			typeKey = "gb.commit";

+			linkClass = CommitPage.class;

+			break;

 		}

+		add(new LinkPanel("commit", "title", tagRef.displayName, linkClass, linkParameters));

+		add(new RefsPanel("tagName", repositoryName, Arrays.asList(tagRef)));

+		add(new Label("tagId", tagRef.getObjectId().getName()));

+		add(new LinkPanel("taggedObject", "list", tagRef.getReferencedObjectId().getName(),

+				linkClass, linkParameters));

+		add(new Label("taggedObjectType", getString(typeKey)));

 

-		add(createPersonPanel("tagAuthor", c.getAuthorIdent(), SearchType.AUTHOR));

-		add(WicketUtils

-				.createTimestampLabel("tagDate", c.getAuthorIdent().getWhen(), getTimeZone()));

+		add(createPersonPanel("tagger", tagRef.getAuthorIdent(), SearchType.AUTHOR));

+		add(WicketUtils.createTimestampLabel("tagDate", tagRef.getAuthorIdent().getWhen(),

+				getTimeZone()));

 

-		addFullText("fullMessage", c.getFullMessage(), true);

+		addFullText("fullMessage", tagRef.getFullMessage(), true);

 	}

 

 	@Override

diff --git a/src/com/gitblit/wicket/panels/CommitHeaderPanel.java b/src/com/gitblit/wicket/panels/CommitHeaderPanel.java
index 1a6580d6..7d0ad0f0 100644
--- a/src/com/gitblit/wicket/panels/CommitHeaderPanel.java
+++ b/src/com/gitblit/wicket/panels/CommitHeaderPanel.java
@@ -25,6 +25,14 @@ public class CommitHeaderPanel extends BasePanel {
 

 	private static final long serialVersionUID = 1L;

 

+	public CommitHeaderPanel(String id, String title) {

+		super(id);

+		add(new Label("shortmessage", title));

+		add(new Label("commitid"));

+		add(new Label("author"));

+		add(new Label("date"));

+	}

+	

 	public CommitHeaderPanel(String id, String repositoryName, RevCommit c) {

 		super(id);

 		add(new LinkPanel("shortmessage", "title", c.getShortMessage(), CommitPage.class,

diff --git a/src/com/gitblit/wicket/panels/HistoryPanel.java b/src/com/gitblit/wicket/panels/HistoryPanel.java
index 180a248a..9ad407ca 100644
--- a/src/com/gitblit/wicket/panels/HistoryPanel.java
+++ b/src/com/gitblit/wicket/panels/HistoryPanel.java
@@ -34,6 +34,7 @@ import com.gitblit.GitBlit;
 import com.gitblit.Keys;

 import com.gitblit.models.PathModel;

 import com.gitblit.models.PathModel.PathChangeModel;

+import com.gitblit.models.RefModel;

 import com.gitblit.utils.JGitUtils;

 import com.gitblit.utils.JGitUtils.SearchType;

 import com.gitblit.utils.StringUtils;

@@ -73,7 +74,7 @@ public class HistoryPanel extends BasePanel {
 		}

 		final boolean isTree = matchingPath == null ? true : matchingPath.isTree();

 

-		final Map<ObjectId, List<String>> allRefs = JGitUtils.getAllRefs(r);

+		final Map<ObjectId, List<RefModel>> allRefs = JGitUtils.getAllRefs(r);

 		List<RevCommit> commits;

 		if (pageResults) {

 			// Paging result set

diff --git a/src/com/gitblit/wicket/panels/LogPanel.java b/src/com/gitblit/wicket/panels/LogPanel.java
index 436c24f7..873d7d9b 100644
--- a/src/com/gitblit/wicket/panels/LogPanel.java
+++ b/src/com/gitblit/wicket/panels/LogPanel.java
@@ -31,6 +31,7 @@ import org.eclipse.jgit.revwalk.RevCommit;
 

 import com.gitblit.GitBlit;

 import com.gitblit.Keys;

+import com.gitblit.models.RefModel;

 import com.gitblit.utils.JGitUtils;

 import com.gitblit.utils.JGitUtils.SearchType;

 import com.gitblit.utils.StringUtils;

@@ -57,7 +58,7 @@ public class LogPanel extends BasePanel {
 			itemsPerPage = 50;

 		}

 

-		final Map<ObjectId, List<String>> allRefs = JGitUtils.getAllRefs(r);

+		final Map<ObjectId, List<RefModel>> allRefs = JGitUtils.getAllRefs(r);

 		List<RevCommit> commits;

 		if (pageResults) {

 			// Paging result set

diff --git a/src/com/gitblit/wicket/panels/RefsPanel.java b/src/com/gitblit/wicket/panels/RefsPanel.java
index 33b1884f..266a49b7 100644
--- a/src/com/gitblit/wicket/panels/RefsPanel.java
+++ b/src/com/gitblit/wicket/panels/RefsPanel.java
@@ -29,6 +29,7 @@ import org.eclipse.jgit.lib.Constants;
 import org.eclipse.jgit.lib.ObjectId;

 import org.eclipse.jgit.revwalk.RevCommit;

 

+import com.gitblit.models.RefModel;

 import com.gitblit.wicket.WicketUtils;

 import com.gitblit.wicket.pages.CommitPage;

 import com.gitblit.wicket.pages.LogPage;

@@ -39,45 +40,55 @@ public class RefsPanel extends Panel {
 	private static final long serialVersionUID = 1L;

 

 	public RefsPanel(String id, final String repositoryName, RevCommit c,

-			Map<ObjectId, List<String>> refs) {

+			Map<ObjectId, List<RefModel>> refs) {

+		this(id, repositoryName, refs.get(c.getId()));

+	}

+

+	public RefsPanel(String id, final String repositoryName, List<RefModel> refs) {

 		super(id);

-		List<String> refNames = refs.get(c.getId());

-		if (refNames == null) {

-			refNames = new ArrayList<String>();

+		if (refs == null) {

+			refs = new ArrayList<RefModel>();

 		}

-		Collections.sort(refNames);

+		Collections.sort(refs);

 		// refNames.remove(Constants.HEAD);

 

-		ListDataProvider<String> refsDp = new ListDataProvider<String>(refNames);

-		DataView<String> refsView = new DataView<String>("ref", refsDp) {

+		ListDataProvider<RefModel> refsDp = new ListDataProvider<RefModel>(refs);

+		DataView<RefModel> refsView = new DataView<RefModel>("ref", refsDp) {

 			private static final long serialVersionUID = 1L;

 

-			public void populateItem(final Item<String> item) {

-				String entry = item.getModelObject();

+			public void populateItem(final Item<RefModel> item) {

+				RefModel entry = item.getModelObject();

+				String name = entry.displayName;

+				String objectid = entry.getReferencedObjectId().getName();

 				Component c = null;

-				if (entry.startsWith(Constants.R_HEADS)) {

+				if (name.startsWith(Constants.R_HEADS)) {

+					// local head

+					c = new LinkPanel("refName", null, name.substring(Constants.R_HEADS.length()),

+							LogPage.class, WicketUtils.newObjectParameter(repositoryName, objectid));

+					WicketUtils.setCssClass(c, "headRef");

+				} else if (name.equals(Constants.HEAD)) {

 					// local head

-					c = new LinkPanel("refName", null, entry.substring(Constants.R_HEADS.length()),

-							LogPage.class, WicketUtils.newObjectParameter(repositoryName, entry));

+					c = new LinkPanel("refName", null, name, LogPage.class,

+							WicketUtils.newObjectParameter(repositoryName, objectid));

 					WicketUtils.setCssClass(c, "headRef");

-				} else if (entry.startsWith(Constants.R_REMOTES)) {

+				} else if (name.startsWith(Constants.R_REMOTES)) {

 					// remote head

 					c = new LinkPanel("refName", null,

-							entry.substring(Constants.R_REMOTES.length()), LogPage.class,

-							WicketUtils.newObjectParameter(repositoryName, entry));

+							name.substring(Constants.R_REMOTES.length()), LogPage.class,

+							WicketUtils.newObjectParameter(repositoryName, objectid));

 					WicketUtils.setCssClass(c, "remoteRef");

-				} else if (entry.startsWith(Constants.R_TAGS)) {

+				} else if (name.startsWith(Constants.R_TAGS)) {

 					// tag

-					c = new LinkPanel("refName", null, entry.substring(Constants.R_TAGS.length()),

-							TagPage.class, WicketUtils.newObjectParameter(repositoryName, entry));

+					c = new LinkPanel("refName", null, name.substring(Constants.R_TAGS.length()),

+							TagPage.class, WicketUtils.newObjectParameter(repositoryName, objectid));

 					WicketUtils.setCssClass(c, "tagRef");

 				} else {

 					// other

-					c = new LinkPanel("refName", null, entry, CommitPage.class,

-							WicketUtils.newObjectParameter(repositoryName, entry));

+					c = new LinkPanel("refName", null, name, CommitPage.class,

+							WicketUtils.newObjectParameter(repositoryName, objectid));

 					WicketUtils.setCssClass(c, "otherRef");

 				}

-				WicketUtils.setHtmlTooltip(c, entry);

+				WicketUtils.setHtmlTooltip(c, name);

 				item.add(c);

 			}

 		};

diff --git a/src/com/gitblit/wicket/panels/SearchPanel.java b/src/com/gitblit/wicket/panels/SearchPanel.java
index f91e0e8a..5f82a428 100644
--- a/src/com/gitblit/wicket/panels/SearchPanel.java
+++ b/src/com/gitblit/wicket/panels/SearchPanel.java
@@ -29,6 +29,7 @@ import org.eclipse.jgit.revwalk.RevCommit;
 

 import com.gitblit.GitBlit;

 import com.gitblit.Keys;

+import com.gitblit.models.RefModel;

 import com.gitblit.utils.JGitUtils;

 import com.gitblit.utils.JGitUtils.SearchType;

 import com.gitblit.utils.StringUtils;

@@ -55,7 +56,7 @@ public class SearchPanel extends BasePanel {
 

 		RevCommit commit = JGitUtils.getCommit(r, objectId);

 

-		final Map<ObjectId, List<String>> allRefs = JGitUtils.getAllRefs(r);

+		final Map<ObjectId, List<RefModel>> allRefs = JGitUtils.getAllRefs(r);

 		List<RevCommit> commits;

 		if (pageResults) {

 			// Paging result set

diff --git a/src/com/gitblit/wicket/panels/TagsPanel.html b/src/com/gitblit/wicket/panels/TagsPanel.html
index 9f98504d..481d8e81 100644
--- a/src/com/gitblit/wicket/panels/TagsPanel.html
+++ b/src/com/gitblit/wicket/panels/TagsPanel.html
@@ -28,7 +28,7 @@
 	<!--  annotated tag links -->

 	<wicket:fragment wicket:id="annotatedLinks">

 		<span class="link">

-			<a wicket:id="view"><wicket:message key="gb.view"></wicket:message></a> | <a wicket:id="commit"><wicket:message key="gb.commit"></wicket:message></a> | <a wicket:id="log"><wicket:message key="gb.log"></wicket:message></a>

+			<a wicket:id="tag"><wicket:message key="gb.tag"></wicket:message></a> | <a wicket:id="commit"><wicket:message key="gb.commit"></wicket:message></a> | <a wicket:id="log"><wicket:message key="gb.log"></wicket:message></a>

 		</span>

 	</wicket:fragment>

 	

@@ -38,6 +38,13 @@
 			<a wicket:id="commit"><wicket:message key="gb.commit"></wicket:message></a> | <a wicket:id="log"><wicket:message key="gb.log"></wicket:message></a>

 		</span>

 	</wicket:fragment>

+

+	<!-- blob tag links -->

+	<wicket:fragment wicket:id="blobLinks">

+		<span class="link">

+			<a wicket:id="tag"><wicket:message key="gb.tag"></wicket:message></a> | <a wicket:id="blob"><wicket:message key="gb.blob"></wicket:message></a> | <a wicket:id="raw"><wicket:message key="gb.raw"></wicket:message></a>

+		</span>

+	</wicket:fragment>

 	

 </wicket:panel>

 </body>

diff --git a/src/com/gitblit/wicket/panels/TagsPanel.java b/src/com/gitblit/wicket/panels/TagsPanel.java
index de8112a4..259af312 100644
--- a/src/com/gitblit/wicket/panels/TagsPanel.java
+++ b/src/com/gitblit/wicket/panels/TagsPanel.java
@@ -24,17 +24,22 @@ import org.apache.wicket.markup.repeater.Item;
 import org.apache.wicket.markup.repeater.data.DataView;

 import org.apache.wicket.markup.repeater.data.ListDataProvider;

 import org.apache.wicket.model.StringResourceModel;

+import org.eclipse.jgit.lib.Constants;

 import org.eclipse.jgit.lib.Repository;

 

 import com.gitblit.models.RefModel;

 import com.gitblit.utils.JGitUtils;

 import com.gitblit.utils.StringUtils;

 import com.gitblit.wicket.WicketUtils;

+import com.gitblit.wicket.pages.BlobPage;

 import com.gitblit.wicket.pages.CommitPage;

 import com.gitblit.wicket.pages.LogPage;

+import com.gitblit.wicket.pages.RawPage;

+import com.gitblit.wicket.pages.RepositoryPage;

 import com.gitblit.wicket.pages.SummaryPage;

 import com.gitblit.wicket.pages.TagPage;

 import com.gitblit.wicket.pages.TagsPage;

+import com.gitblit.wicket.pages.TreePage;

 

 public class TagsPanel extends BasePanel {

 

@@ -67,47 +72,83 @@ public class TagsPanel extends BasePanel {
 

 				item.add(WicketUtils.createDateLabel("tagDate", entry.getDate(), getTimeZone()));

 

-				// tag icon

-				if (entry.isAnnotatedTag()) {

-					item.add(WicketUtils.newImage("tagIcon", "tag_16x16.png"));

-				} else {

-					item.add(WicketUtils.newBlankImage("tagIcon"));

+				Class<? extends RepositoryPage> linkClass;

+				switch (entry.getReferencedObjectType()) {

+				case Constants.OBJ_BLOB:

+					linkClass = BlobPage.class;

+					break;

+				case Constants.OBJ_TREE:

+					linkClass = TreePage.class;

+					break;

+				case Constants.OBJ_COMMIT:

+				default:

+					linkClass = CommitPage.class;

+					break;

 				}

-

-				item.add(new LinkPanel("tagName", "list name", entry.displayName, CommitPage.class,

-						WicketUtils.newObjectParameter(repositoryName, entry.getCommitId()

-								.getName())));

+				item.add(new LinkPanel("tagName", "list name", entry.displayName, linkClass,

+						WicketUtils.newObjectParameter(repositoryName, entry

+								.getReferencedObjectId().getName())));

 				String message;

 				if (maxCount > 0) {

-					message = StringUtils.trimString(entry.getShortLog(), 40);

+					message = StringUtils.trimString(entry.getShortMessage(), 40);

 				} else {

-					message = entry.getShortLog();

+					// workaround for RevTag returning a lengthy shortlog. :(

+					message = StringUtils.trimShortLog(entry.getShortMessage());

 				}

-				if (entry.isAnnotatedTag()) {

+				if (linkClass.equals(BlobPage.class)) {

+					// Blob Tag Object

+					item.add(WicketUtils.newImage("tagIcon", "file_16x16.png"));

 					item.add(new LinkPanel("tagDescription", "list", message, TagPage.class,

 							WicketUtils.newObjectParameter(repositoryName, entry.getObjectId()

 									.getName())));

-					Fragment fragment = new Fragment("tagLinks", "annotatedLinks", this);

-					fragment.add(new BookmarkablePageLink<Void>("view", TagPage.class, WicketUtils

+

+					Fragment fragment = new Fragment("tagLinks", "blobLinks", this);

+					fragment.add(new BookmarkablePageLink<Void>("tag", TagPage.class, WicketUtils

 							.newObjectParameter(repositoryName, entry.getObjectId().getName()))

 							.setEnabled(entry.isAnnotatedTag()));

-					fragment.add(new BookmarkablePageLink<Void>("commit", CommitPage.class,

-							WicketUtils.newObjectParameter(repositoryName, entry.getCommitId()

-									.getName())));

-					fragment.add(new BookmarkablePageLink<Void>("log", LogPage.class, WicketUtils

-							.newObjectParameter(repositoryName, entry.getName())));

-					item.add(fragment);

-				} else {

-					item.add(new LinkPanel("tagDescription", "list", message, CommitPage.class,

-							WicketUtils.newObjectParameter(repositoryName, entry.getObjectId()

+

+					fragment.add(new BookmarkablePageLink<Void>("blob", linkClass, WicketUtils

+							.newObjectParameter(repositoryName, entry.getReferencedObjectId()

 									.getName())));

-					Fragment fragment = new Fragment("tagLinks", "lightweightLinks", this);

-					fragment.add(new BookmarkablePageLink<Void>("commit", CommitPage.class,

-							WicketUtils.newObjectParameter(repositoryName, entry.getCommitId()

+

+					fragment.add(new BookmarkablePageLink<Void>("raw", RawPage.class, WicketUtils

+							.newObjectParameter(repositoryName, entry.getReferencedObjectId()

 									.getName())));

-					fragment.add(new BookmarkablePageLink<Void>("log", LogPage.class, WicketUtils

-							.newObjectParameter(repositoryName, entry.getName())));

 					item.add(fragment);

+				} else {

+					// TODO Tree Tag Object

+					// Standard Tag Object

+					if (entry.isAnnotatedTag()) {

+						item.add(WicketUtils.newImage("tagIcon", "tag_16x16.png"));

+						item.add(new LinkPanel("tagDescription", "list", message, TagPage.class,

+								WicketUtils.newObjectParameter(repositoryName, entry.getObjectId()

+										.getName())));

+

+						Fragment fragment = new Fragment("tagLinks", "annotatedLinks", this);

+						fragment.add(new BookmarkablePageLink<Void>("tag", TagPage.class,

+								WicketUtils.newObjectParameter(repositoryName, entry.getObjectId()

+										.getName())).setEnabled(entry.isAnnotatedTag()));

+

+						fragment.add(new BookmarkablePageLink<Void>("commit", linkClass,

+								WicketUtils.newObjectParameter(repositoryName, entry

+										.getReferencedObjectId().getName())));

+

+						fragment.add(new BookmarkablePageLink<Void>("log", LogPage.class,

+								WicketUtils.newObjectParameter(repositoryName, entry.getName())));

+						item.add(fragment);

+					} else {

+						item.add(WicketUtils.newBlankImage("tagIcon"));

+						item.add(new LinkPanel("tagDescription", "list", message, CommitPage.class,

+								WicketUtils.newObjectParameter(repositoryName, entry.getObjectId()

+										.getName())));

+						Fragment fragment = new Fragment("tagLinks", "lightweightLinks", this);

+						fragment.add(new BookmarkablePageLink<Void>("commit", CommitPage.class,

+								WicketUtils.newObjectParameter(repositoryName, entry

+										.getReferencedObjectId().getName())));

+						fragment.add(new BookmarkablePageLink<Void>("log", LogPage.class,

+								WicketUtils.newObjectParameter(repositoryName, entry.getName())));

+						item.add(fragment);

+					}

 				}

 

 				WicketUtils.setAlternatingBackground(item, counter);

diff --git a/src/com/gitblit/wicket/resources/gitblit.css b/src/com/gitblit/wicket/resources/gitblit.css
index c9356c3d..5dd0f160 100644
--- a/src/com/gitblit/wicket/resources/gitblit.css
+++ b/src/com/gitblit/wicket/resources/gitblit.css
@@ -243,6 +243,7 @@ div.page_path {
 }

 

 div.commit_message {

+	font-family: monospace;

 	padding: 8px;

 	border: solid #bbb;

 	border-width: 1px 0px 0px;

@@ -508,7 +509,7 @@ table.pretty, table.comments {
 	border-right: 1px solid #bbb;	

 }

 

-table.pretty, table.comments, table.repositories {

+table.pretty, table.comments, table.repositories, table.gitnotes {

 	width:100%;

 }

 

@@ -608,7 +609,29 @@ table.palette td.header {
 }

 table.palette td.pane {

 	padding: 0px;	

-} 

+}

+

+table.gitnotes {	

+	padding-bottom: 5px;

+}

+table.gitnotes td {

+	border-top: 1px solid #ccc;

+	padding-top: 3px;

+	vertical-align:top;

+}

+

+table.gitnotes td table td {

+	border: none;

+	padding-top: 0px;

+}

+

+table.gitnotes td.info {

+}

+

+table.gitnotes td.message {

+	width: 65%;

+	border-left: 1px solid #ccc;

+}

 

 tr th a { padding-right: 15px; background-position: right; background-repeat:no-repeat; }

 tr th.wicket_orderDown a {background-image: url(arrow_down.png); }