From 3e087ada55f8b0e83b146578b695552db9dc8d97 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 27 Apr 2011 20:55:38 -0400
Subject: [PATCH] Integrated pagelinks into RepositoryPage. Fixed string encoding.
---
src/com/gitblit/wicket/pages/PatchPage.java | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/PatchPage.java b/src/com/gitblit/wicket/pages/PatchPage.java
index c877bb6..b7dd1a3 100644
--- a/src/com/gitblit/wicket/pages/PatchPage.java
+++ b/src/com/gitblit/wicket/pages/PatchPage.java
@@ -1,18 +1,15 @@
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.WicketUtils;
-
public class PatchPage extends WebPage {
@@ -24,14 +21,11 @@
redirectToInterceptPage(new RepositoriesPage());
}
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);
redirectToInterceptPage(new RepositoriesPage());
@@ -39,8 +33,14 @@
}
RevCommit commit = JGitUtils.getCommit(r, objectId);
- String patch = JGitUtils.getCommitPatch(r, commit, blobPath);
+ 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