From 0250286553ca93406bfaa976d6aae61e76a9d55f Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 18 Sep 2013 11:31:00 -0400
Subject: [PATCH] Removed GitWeb-style diff renderer
---
src/main/java/com/gitblit/wicket/pages/ComparePage.java | 7 +------
1 files changed, 1 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/pages/ComparePage.java b/src/main/java/com/gitblit/wicket/pages/ComparePage.java
index f5f3526..a513f00 100644
--- a/src/main/java/com/gitblit/wicket/pages/ComparePage.java
+++ b/src/main/java/com/gitblit/wicket/pages/ComparePage.java
@@ -37,8 +37,6 @@
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevCommit;
-import com.gitblit.GitBlit;
-import com.gitblit.Keys;
import com.gitblit.models.PathModel.PathChangeModel;
import com.gitblit.models.RefModel;
import com.gitblit.models.RepositoryModel;
@@ -80,9 +78,6 @@
Fragment comparison = new Fragment("comparison", "comparisonFragment", this);
add(comparison);
- DiffOutputType diffType = DiffOutputType.forName(GitBlit.getString(Keys.web.diffStyle,
- DiffOutputType.GITBLIT.name()));
-
RevCommit fromCommit;
RevCommit toCommit;
@@ -113,7 +108,7 @@
fromCommitId.setObject(startId);
toCommitId.setObject(endId);
- String diff = DiffUtils.getDiff(r, fromCommit, toCommit, diffType);
+ String diff = DiffUtils.getDiff(r, fromCommit, toCommit, DiffOutputType.HTML);
// compare page links
// comparison.add(new BookmarkablePageLink<Void>("patchLink", PatchPage.class,
--
Gitblit v1.9.1