From 9da97003c7f33a64ae5060f413f9c4c5d26efe78 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 19 May 2011 19:01:45 -0400
Subject: [PATCH] Critical fix for servlet.
---
src/com/gitblit/wicket/pages/PatchPage.java | 37 +++++++++++++++++++++++--------------
1 files changed, 23 insertions(+), 14 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/PatchPage.java b/src/com/gitblit/wicket/pages/PatchPage.java
index c877bb6..62431d2 100644
--- a/src/com/gitblit/wicket/pages/PatchPage.java
+++ b/src/com/gitblit/wicket/pages/PatchPage.java
@@ -1,18 +1,16 @@
package com.gitblit.wicket.pages;
-import javax.servlet.http.HttpServletRequest;
-
import org.apache.wicket.PageParameters;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.protocol.http.servlet.ServletWebRequest;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevCommit;
import com.gitblit.GitBlit;
import com.gitblit.utils.JGitUtils;
+import com.gitblit.utils.StringUtils;
+import com.gitblit.wicket.GitBlitWebSession;
import com.gitblit.wicket.WicketUtils;
-
public class PatchPage extends WebPage {
@@ -20,27 +18,38 @@
super(params);
if (!params.containsKey("r")) {
- error("Repository not specified!");
+ GitBlitWebSession.get().cacheErrorMessage("Repository not specified!");
redirectToInterceptPage(new RepositoriesPage());
+ return;
}
+
final String repositoryName = WicketUtils.getRepositoryName(params);
- final String objectId = WicketUtils.getObject(params);
+ final String baseObjectId = WicketUtils.getBaseObjectId(params);
+ final String objectId = WicketUtils.getObject(params);
final String blobPath = WicketUtils.getPath(params);
- ServletWebRequest servletWebRequest = (ServletWebRequest) getRequest();
- HttpServletRequest req = servletWebRequest.getHttpServletRequest();
- req.getServerName();
-
- Repository r = GitBlit.self().getRepository(req, repositoryName);
+ Repository r = GitBlit.self().getRepository(repositoryName);
if (r == null) {
- error("Can not load repository " + repositoryName);
+ GitBlitWebSession.get().cacheErrorMessage("Can not load repository " + repositoryName);
redirectToInterceptPage(new RepositoriesPage());
return;
}
RevCommit commit = JGitUtils.getCommit(r, objectId);
- String patch = JGitUtils.getCommitPatch(r, commit, blobPath);
+ if (commit == null) {
+ GitBlitWebSession.get().cacheErrorMessage("Commit is null");
+ redirectToInterceptPage(new RepositoriesPage());
+ return;
+ }
+
+ String patch;
+ if (StringUtils.isEmpty(baseObjectId)) {
+ patch = JGitUtils.getCommitPatch(r, commit, blobPath);
+ } else {
+ RevCommit baseCommit = JGitUtils.getCommit(r, baseObjectId);
+ patch = JGitUtils.getCommitPatch(r, baseCommit, commit, blobPath);
+ }
add(new Label("patchText", patch));
r.close();
- }
+ }
}
--
Gitblit v1.9.1