From f76fee63ed9cb3a30d3c0c092d860b1cb93a481b Mon Sep 17 00:00:00 2001
From: Gerard Smyth <gerard.smyth@gmail.com>
Date: Thu, 08 May 2014 13:09:30 -0400
Subject: [PATCH] Updated the SyndicationServlet to provide an additional option to return details of the tags in the repository instead of the commits. This uses a new 'ot' request parameter to indicate the object type of the content to return, which can be ither TAG or COMMIT. If this is not provided, then COMMIT is assumed to maintain backwards compatability. If tags are returned, then the paging parameters, 'l' and 'pg' are still supported, but searching options are currently ignored.
---
src/main/java/com/gitblit/wicket/panels/HistoryPanel.java | 83 ++++++++++++++++++++++++-----------------
1 files changed, 48 insertions(+), 35 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/panels/HistoryPanel.java b/src/main/java/com/gitblit/wicket/panels/HistoryPanel.java
index 03502e6..21f3838 100644
--- a/src/main/java/com/gitblit/wicket/panels/HistoryPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/HistoryPanel.java
@@ -15,6 +15,7 @@
*/
package com.gitblit.wicket.panels;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
@@ -37,6 +38,8 @@
import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.treewalk.TreeWalk;
import org.eclipse.jgit.treewalk.filter.PathFilterGroup;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.gitblit.Constants;
import com.gitblit.Keys;
@@ -45,6 +48,7 @@
import com.gitblit.models.RefModel;
import com.gitblit.models.SubmoduleModel;
import com.gitblit.utils.JGitUtils;
+import com.gitblit.utils.MarkdownUtils;
import com.gitblit.utils.StringUtils;
import com.gitblit.wicket.WicketUtils;
import com.gitblit.wicket.pages.BlobDiffPage;
@@ -59,6 +63,8 @@
private static final long serialVersionUID = 1L;
+ private final Logger log = LoggerFactory.getLogger(getClass());
+
private boolean hasMore;
public HistoryPanel(String wicketId, final String repositoryName, final String objectId,
@@ -71,39 +77,51 @@
}
RevCommit commit = JGitUtils.getCommit(r, objectId);
- List<PathChangeModel> paths = JGitUtils.getFilesInCommit(r, commit);
-
- Map<String, SubmoduleModel> submodules = new HashMap<String, SubmoduleModel>();
- for (SubmoduleModel model : JGitUtils.getSubmodules(r, commit.getTree())) {
- submodules.put(model.path, model);
- }
-
PathModel matchingPath = null;
- for (PathModel p : paths) {
- if (p.path.equals(path)) {
- matchingPath = p;
- break;
+ Map<String, SubmoduleModel> submodules = new HashMap<String, SubmoduleModel>();
+
+ if (commit == null) {
+ // commit missing
+ String msg = MessageFormat.format("Failed to find history of **{0}** *{1}*",
+ path, objectId);
+ log.error(msg + " " + repositoryName);
+ add(new Label("commitHeader", MarkdownUtils.transformMarkdown(msg)).setEscapeModelStrings(false));
+ add(new Label("breadcrumbs"));
+ } else {
+ // commit found
+ List<PathChangeModel> paths = JGitUtils.getFilesInCommit(r, commit);
+ add(new CommitHeaderPanel("commitHeader", repositoryName, commit));
+ add(new PathBreadcrumbsPanel("breadcrumbs", repositoryName, path, objectId));
+ for (SubmoduleModel model : JGitUtils.getSubmodules(r, commit.getTree())) {
+ submodules.put(model.path, model);
}
- }
- if (matchingPath == null) {
- // path not in commit
- // manually locate path in tree
- TreeWalk tw = new TreeWalk(r);
- tw.reset();
- tw.setRecursive(true);
- try {
- tw.addTree(commit.getTree());
- tw.setFilter(PathFilterGroup.createFromStrings(Collections.singleton(path)));
- while (tw.next()) {
- if (tw.getPathString().equals(path)) {
- matchingPath = new PathChangeModel(tw.getPathString(), tw.getPathString(), 0, tw
- .getRawMode(0), tw.getObjectId(0).getName(), commit.getId().getName(),
- ChangeType.MODIFY);
- }
+
+ for (PathModel p : paths) {
+ if (p.path.equals(path)) {
+ matchingPath = p;
+ break;
}
- } catch (Exception e) {
- } finally {
- tw.release();
+ }
+ if (matchingPath == null) {
+ // path not in commit
+ // manually locate path in tree
+ TreeWalk tw = new TreeWalk(r);
+ tw.reset();
+ tw.setRecursive(true);
+ try {
+ tw.addTree(commit.getTree());
+ tw.setFilter(PathFilterGroup.createFromStrings(Collections.singleton(path)));
+ while (tw.next()) {
+ if (tw.getPathString().equals(path)) {
+ matchingPath = new PathChangeModel(tw.getPathString(), tw.getPathString(), 0, tw
+ .getRawMode(0), tw.getObjectId(0).getName(), commit.getId().getName(),
+ ChangeType.MODIFY);
+ }
+ }
+ } catch (Exception e) {
+ } finally {
+ tw.release();
+ }
}
}
@@ -136,11 +154,6 @@
// inaccurate way to determine if there are more commits.
// works unless commits.size() represents the exact end.
hasMore = commits.size() >= itemsPerPage;
-
- add(new CommitHeaderPanel("commitHeader", repositoryName, commit));
-
- // breadcrumbs
- add(new PathBreadcrumbsPanel("breadcrumbs", repositoryName, path, objectId));
final int hashLen = app().settings().getInteger(Keys.web.shortCommitIdLength, 6);
ListDataProvider<RevCommit> dp = new ListDataProvider<RevCommit>(commits);
--
Gitblit v1.9.1