From f66e89662c091e082bd1d2feb6ac91513ccff273 Mon Sep 17 00:00:00 2001
From: Rafael Cavazin <rafaelcavazin@gmail.com>
Date: Sun, 21 Jul 2013 09:59:00 -0400
Subject: [PATCH] Merge branch 'master' of https://github.com/gitblit/gitblit

---
 src/main/java/com/gitblit/wicket/pages/PatchPage.java |   72 ++++++++++++++++++++++++++++++++++++
 1 files changed, 72 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/gitblit/wicket/pages/PatchPage.java b/src/main/java/com/gitblit/wicket/pages/PatchPage.java
new file mode 100644
index 0000000..be959d0
--- /dev/null
+++ b/src/main/java/com/gitblit/wicket/pages/PatchPage.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2011 gitblit.com.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.gitblit.wicket.pages;
+
+import org.apache.wicket.PageParameters;
+import org.apache.wicket.markup.html.WebPage;
+import org.apache.wicket.markup.html.basic.Label;
+import org.eclipse.jgit.lib.Repository;
+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.CacheControl;
+import com.gitblit.wicket.CacheControl.LastModified;
+import com.gitblit.wicket.GitBlitWebSession;
+import com.gitblit.wicket.WicketUtils;
+
+@CacheControl(LastModified.BOOT)
+public class PatchPage extends WebPage {
+
+	public PatchPage(PageParameters params) {
+		super(params);
+
+		if (!params.containsKey("r")) {
+			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);
+		final String blobPath = WicketUtils.getPath(params);
+
+		Repository r = GitBlit.self().getRepository(repositoryName);
+		if (r == null) {
+			GitBlitWebSession.get().cacheErrorMessage(getString("gb.canNotLoadRepository") + " " + repositoryName);
+			redirectToInterceptPage(new RepositoriesPage());
+			return;
+		}
+
+		RevCommit commit = JGitUtils.getCommit(r, objectId);
+		if (commit == null) {
+			GitBlitWebSession.get().cacheErrorMessage(getString("gb.commitIsNull"));
+			redirectToInterceptPage(new RepositoriesPage());
+			return;
+		}
+
+		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