Owner editing. Frozen status. Grouped repositories. Documentation.

James Moger

2011-05-19 00afd77a2182ece3d9522d41b86b4ddd7e132288

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

@@ -12,11 +12,16 @@
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.JGitUtils.DiffOutputType;

import com.gitblit.wicket.LinkPanel;

import com.gitblit.wicket.RepositoryPage;

import com.gitblit.wicket.WicketUtils;

import com.gitblit.wicket.models.PathModel;

import com.gitblit.wicket.models.PathModel.PathChangeModel;

import com.gitblit.wicket.panels.CommitHeaderPanel;

import com.gitblit.wicket.panels.CommitLegendPanel;



public class CommitDiffPage extends RepositoryPage {



@@ -24,8 +29,9 @@
      super(params);



      Repository r = getRepository();

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

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

      RevCommit commit = getCommit();

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

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



      List<String> parents = new ArrayList<String>();

      if (commit.getParentCount() > 0) {

@@ -43,17 +49,23 @@
      add(new BookmarkablePageLink<Void>("patchLink", PatchPage.class, WicketUtils.newObjectParameter(repositoryName, objectId)));

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



      add(new LinkPanel("shortlog", "title", commit.getShortMessage(), CommitPage.class, newCommitParameter()));

      add(new CommitHeaderPanel("commitHeader", repositoryName, commit));



      // changed paths list

      List<PathModel> paths = JGitUtils.getFilesInCommit(r, commit);

      ListDataProvider<PathModel> pathsDp = new ListDataProvider<PathModel>(paths);

      DataView<PathModel> pathsView = new DataView<PathModel>("changedPath", pathsDp) {

      List<PathChangeModel> paths = JGitUtils.getFilesInCommit(r, commit);

      add(new CommitLegendPanel("commitLegend", paths));

      ListDataProvider<PathChangeModel> pathsDp = new ListDataProvider<PathChangeModel>(paths);

      DataView<PathChangeModel> pathsView = new DataView<PathChangeModel>("changedPath", pathsDp) {

         private static final long serialVersionUID = 1L;

         int counter = 0;



         public void populateItem(final Item<PathModel> item) {

            final PathModel entry = item.getModelObject();

         public void populateItem(final Item<PathChangeModel> item) {

            final PathChangeModel entry = item.getModelObject();

            Label changeType = new Label("changeType", "");

            WicketUtils.setChangeTypeCssClass(changeType, entry.changeType);

            setChangeTypeTooltip(changeType, entry.changeType);

            item.add(changeType);



            if (entry.isTree()) {

               item.add(new LinkPanel("pathName", null, entry.path, TreePage.class, newPathParameter(entry.path)));

            } else {

@@ -63,7 +75,7 @@
            item.add(new BookmarkablePageLink<Void>("patch", PatchPage.class, newPathParameter(entry.path)));

            item.add(new BookmarkablePageLink<Void>("view", BlobPage.class, newPathParameter(entry.path)));

            item.add(new BookmarkablePageLink<Void>("blame", BlobPage.class).setEnabled(false));

            item.add(new BookmarkablePageLink<Void>("history", BlobPage.class).setEnabled(false));

            item.add(new BookmarkablePageLink<Void>("history", HistoryPage.class, newPathParameter(entry.path)));



            WicketUtils.setAlternatingBackground(item, counter);

            counter++;