Removed GitWeb-style diff renderer

James Moger

2013-09-18 0250286553ca93406bfaa976d6aae61e76a9d55f

 src/main/java/com/gitblit/wicket/pages/BlobDiffPage.java

@@ -21,8 +21,6 @@
import org.eclipse.jgit.lib.Repository;

import org.eclipse.jgit.revwalk.RevCommit;



import com.gitblit.GitBlit;

import com.gitblit.Keys;

import com.gitblit.utils.DiffUtils;

import com.gitblit.utils.DiffUtils.DiffOutputType;

import com.gitblit.utils.JGitUtils;

@@ -45,19 +43,16 @@
      Repository r = getRepository();

      RevCommit commit = getCommit();



      DiffOutputType diffType = DiffOutputType.forName(GitBlit.getString(Keys.web.diffStyle,

            DiffOutputType.GITBLIT.name()));



      String diff;

      if (StringUtils.isEmpty(baseObjectId)) {

         // use first parent

         diff = DiffUtils.getDiff(r, commit, blobPath, diffType);

         diff = DiffUtils.getDiff(r, commit, blobPath, DiffOutputType.HTML);

         add(new BookmarkablePageLink<Void>("patchLink", PatchPage.class,

               WicketUtils.newPathParameter(repositoryName, objectId, blobPath)));

      } else {

         // base commit specified

         RevCommit baseCommit = JGitUtils.getCommit(r, baseObjectId);

         diff = DiffUtils.getDiff(r, baseCommit, commit, blobPath, diffType);

         diff = DiffUtils.getDiff(r, baseCommit, commit, blobPath, DiffOutputType.HTML);

         add(new BookmarkablePageLink<Void>("patchLink", PatchPage.class,

               WicketUtils.newBlobDiffParameter(repositoryName, baseObjectId, objectId,

                     blobPath)));