From 7ad6d3a8eeb80f0b269eaaf6373ebbbc7eab7e80 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 23 Jul 2013 18:04:30 -0400
Subject: [PATCH] Documentation
---
src/main/java/com/gitblit/wicket/panels/HistoryPanel.java | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/panels/HistoryPanel.java b/src/main/java/com/gitblit/wicket/panels/HistoryPanel.java
index 4d27589..5e03e01 100644
--- a/src/main/java/com/gitblit/wicket/panels/HistoryPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/HistoryPanel.java
@@ -42,9 +42,9 @@
import com.gitblit.GitBlit;
import com.gitblit.Keys;
import com.gitblit.models.PathModel;
-import com.gitblit.models.SubmoduleModel;
import com.gitblit.models.PathModel.PathChangeModel;
import com.gitblit.models.RefModel;
+import com.gitblit.models.SubmoduleModel;
import com.gitblit.utils.JGitUtils;
import com.gitblit.utils.StringUtils;
import com.gitblit.wicket.WicketUtils;
@@ -204,17 +204,23 @@
item.add(links);
} else if (isSubmodule) {
// submodule
- item.add(new Label("hashLabel", submodulePath + "@"));
Repository repository = GitBlit.self().getRepository(repositoryName);
String submoduleId = JGitUtils.getSubmoduleCommitId(repository, path, entry);
repository.close();
- LinkPanel commitHash = new LinkPanel("hashLink", null, submoduleId.substring(0, hashLen),
- TreePage.class, WicketUtils.newObjectParameter(
- submodulePath, submoduleId));
- WicketUtils.setCssClass(commitHash, "shortsha1");
- WicketUtils.setHtmlTooltip(commitHash, submoduleId);
- item.add(commitHash.setEnabled(hasSubmodule));
-
+ if (StringUtils.isEmpty(submoduleId)) {
+ // not a submodule at this commit, just a matching path
+ item.add(new Label("hashLabel").setVisible(false));
+ item.add(new Label("hashLink").setVisible(false));
+ } else {
+ // really a submodule
+ item.add(new Label("hashLabel", submodulePath + "@"));
+ LinkPanel commitHash = new LinkPanel("hashLink", null, submoduleId.substring(0, hashLen),
+ TreePage.class, WicketUtils.newObjectParameter(
+ submodulePath, submoduleId));
+ WicketUtils.setCssClass(commitHash, "shortsha1");
+ WicketUtils.setHtmlTooltip(commitHash, submoduleId);
+ item.add(commitHash.setEnabled(hasSubmodule));
+ }
Fragment links = new Fragment("historyLinks", "treeLinks", this);
links.add(new BookmarkablePageLink<Void>("commitdiff", CommitDiffPage.class,
WicketUtils.newObjectParameter(repositoryName, entry.getName())));
@@ -303,7 +309,7 @@
if (submoduleName.lastIndexOf('/') > -1) {
String name = submoduleName.substring(submoduleName.lastIndexOf('/') + 1);
candidates.add(currentPath + StringUtils.stripDotGit(name));
- candidates.add(currentPath + candidates.get(candidates.size() - 1) + ".git");
+ candidates.add(candidates.get(candidates.size() - 1) + ".git");
}
// absolute
--
Gitblit v1.9.1