diff options
| author | James Moger <james.moger@gitblit.com> | 2013-05-03 07:18:40 -0400 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2013-05-03 07:18:40 -0400 |
| commit | bb33116dccbd30eba6e4265ba08be909439874d9 (patch) | |
| tree | 922f39ca40fadb41a4e0b684daea2f64608e9281 | |
| parent | 9715e11fe30eccafa4c8272316883c80ba036a6e (diff) | |
| download | gitblit-bb33116dccbd30eba6e4265ba08be909439874d9.tar.gz gitblit-bb33116dccbd30eba6e4265ba08be909439874d9.zip | |
Fixed history of submodule reference if it was once a directory
| -rw-r--r-- | src/main/java/com/gitblit/wicket/panels/HistoryPanel.java | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/src/main/java/com/gitblit/wicket/panels/HistoryPanel.java b/src/main/java/com/gitblit/wicket/panels/HistoryPanel.java index e2b7e723..49d8ae5f 100644 --- a/src/main/java/com/gitblit/wicket/panels/HistoryPanel.java +++ b/src/main/java/com/gitblit/wicket/panels/HistoryPanel.java @@ -204,17 +204,23 @@ public class HistoryPanel extends BasePanel { 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())));
|