From 9effe1630d97039b3e01cd9b58ed07e75be1d63c Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 25 Feb 2013 08:40:30 -0500
Subject: [PATCH] Merge pull request #75 from thefake/master
---
src/com/gitblit/wicket/pages/PatchPage.java | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/PatchPage.java b/src/com/gitblit/wicket/pages/PatchPage.java
index 9d032ca..878cfb4 100644
--- a/src/com/gitblit/wicket/pages/PatchPage.java
+++ b/src/com/gitblit/wicket/pages/PatchPage.java
@@ -22,6 +22,7 @@
import org.eclipse.jgit.revwalk.RevCommit;
import com.gitblit.GitBlit;
+import com.gitblit.utils.DiffUtils;
import com.gitblit.utils.JGitUtils;
import com.gitblit.utils.StringUtils;
import com.gitblit.wicket.GitBlitWebSession;
@@ -33,11 +34,11 @@
super(params);
if (!params.containsKey("r")) {
- GitBlitWebSession.get().cacheErrorMessage("Repository not specified!");
+ GitBlitWebSession.get().cacheErrorMessage(getString("gb.repositoryNotSpecified"));
redirectToInterceptPage(new RepositoriesPage());
return;
}
-
+
final String repositoryName = WicketUtils.getRepositoryName(params);
final String baseObjectId = WicketUtils.getBaseObjectId(params);
final String objectId = WicketUtils.getObject(params);
@@ -45,25 +46,23 @@
Repository r = GitBlit.self().getRepository(repositoryName);
if (r == null) {
- GitBlitWebSession.get().cacheErrorMessage("Can not load repository " + repositoryName);
+ GitBlitWebSession.get().cacheErrorMessage(getString("gb.canNotLoadRepository") + " " + repositoryName);
redirectToInterceptPage(new RepositoriesPage());
return;
}
RevCommit commit = JGitUtils.getCommit(r, objectId);
if (commit == null) {
- GitBlitWebSession.get().cacheErrorMessage("Commit is null");
+ GitBlitWebSession.get().cacheErrorMessage(getString("gb.commitIsNull"));
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);
+
+ RevCommit baseCommit = null;
+ if (!StringUtils.isEmpty(baseObjectId)) {
+ baseCommit = JGitUtils.getCommit(r, baseObjectId);
}
+ String patch = DiffUtils.getCommitPatch(r, baseCommit, commit, blobPath);
add(new Label("patchText", patch));
r.close();
}
--
Gitblit v1.9.1