Added merge icon. Added commit legend with counts. Improved header.

James Moger

2011-04-21 a645ba09d693495c50ab0ee0d1fc2734407b73a4

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

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

import org.eclipse.jgit.revwalk.RevCommit;



import com.gitblit.GitBlit;

import com.gitblit.Keys;

import com.gitblit.utils.JGitUtils;

import com.gitblit.utils.StringUtils;

import com.gitblit.utils.JGitUtils.DiffOutputType;

import com.gitblit.wicket.LinkPanel;

import com.gitblit.wicket.RepositoryPage;

import com.gitblit.wicket.WicketUtils;

@@ -24,17 +27,20 @@
      Repository r = getRepository();

      RevCommit commit = JGitUtils.getCommit(r, objectId);

      

      DiffOutputType diffType = DiffOutputType.forName(GitBlit.self().settings().getString(Keys.web.diffStyle, DiffOutputType.GITBLIT.name()));



      String diff;

      if (StringUtils.isEmpty(baseObjectId)) {

         // use first parent

         diff = JGitUtils.getCommitDiff(r, commit, blobPath, true);

         diff = JGitUtils.getCommitDiff(r, commit, blobPath, diffType);

         add(new BookmarkablePageLink<Void>("patchLink", PatchPage.class, WicketUtils.newPathParameter(repositoryName, objectId, blobPath)));

      } else {

         // base commit specified

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

         diff = JGitUtils.getCommitDiff(r, baseCommit, commit, blobPath, true);

         diff = JGitUtils.getCommitDiff(r, baseCommit, commit, blobPath, diffType);

         add(new BookmarkablePageLink<Void>("patchLink", PatchPage.class, WicketUtils.newBlobDiffParameter(repositoryName, baseObjectId, objectId, blobPath)));

      }

      

      add(new BookmarkablePageLink<Void>("patchLink", PatchPage.class, WicketUtils.newPathParameter(repositoryName, objectId, blobPath)));

      add(new BookmarkablePageLink<Void>("commitLink", CommitPage.class, WicketUtils.newObjectParameter(repositoryName, objectId)));

      add(new BookmarkablePageLink<Void>("commitDiffLink", CommitDiffPage.class, WicketUtils.newObjectParameter(repositoryName, objectId)));