Fix linefeed problem for Prettify (issue 130)

James Moger

2012-09-17 5c6afb3a068c21d990187c6b199e7bd3c876745d

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

@@ -16,6 +16,7 @@
package com.gitblit.wicket.pages;



import java.util.ArrayList;

import java.util.Arrays;

import java.util.List;



import org.apache.wicket.PageParameters;

@@ -26,19 +27,24 @@
import org.apache.wicket.markup.repeater.data.DataView;

import org.apache.wicket.markup.repeater.data.ListDataProvider;

import org.apache.wicket.model.StringResourceModel;

import org.eclipse.jgit.diff.DiffEntry.ChangeType;

import org.eclipse.jgit.lib.Repository;

import org.eclipse.jgit.revwalk.RevCommit;



import com.gitblit.Constants;

import com.gitblit.DownloadZipServlet;

import com.gitblit.GitBlit;

import com.gitblit.Keys;

import com.gitblit.models.GitNote;

import com.gitblit.models.SubmoduleModel;

import com.gitblit.models.PathModel.PathChangeModel;

import com.gitblit.utils.JGitUtils;

import com.gitblit.utils.JGitUtils.SearchType;

import com.gitblit.wicket.WicketUtils;

import com.gitblit.wicket.panels.CommitHeaderPanel;

import com.gitblit.wicket.panels.CommitLegendPanel;

import com.gitblit.wicket.panels.GravatarImage;

import com.gitblit.wicket.panels.LinkPanel;

import com.gitblit.wicket.panels.RefsPanel;



public class CommitPage extends RepositoryPage {



@@ -47,7 +53,7 @@


      Repository r = getRepository();

      RevCommit c = getCommit();



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

      if (c.getParentCount() > 0) {

         for (RevCommit parent : c.getParents()) {

@@ -60,8 +66,8 @@
         add(new Label("parentLink", "none"));

         add(new Label("commitdiffLink", getString("gb.commitdiff")));

      } else {

         add(new LinkPanel("parentLink", null, parents.get(0).substring(0, 8), CommitPage.class,

               newCommitParameter(parents.get(0))));

         add(new LinkPanel("parentLink", null, getShortObjectId(parents.get(0)),

               CommitPage.class, newCommitParameter(parents.get(0))));

         add(new LinkPanel("commitdiffLink", null, new StringResourceModel("gb.commitdiff",

               this, null), CommitDiffPage.class, WicketUtils.newObjectParameter(

               repositoryName, objectId)));

@@ -74,23 +80,23 @@
      addRefs(r, c);



      // author

      add(createPersonPanel("commitAuthor", c.getAuthorIdent(), SearchType.AUTHOR));

      add(createPersonPanel("commitAuthor", c.getAuthorIdent(), Constants.SearchType.AUTHOR));

      add(WicketUtils.createTimestampLabel("commitAuthorDate", c.getAuthorIdent().getWhen(),

            getTimeZone()));



            getTimeZone(), getTimeUtils()));

		
      // committer

      add(createPersonPanel("commitCommitter", c.getCommitterIdent(), SearchType.COMMITTER));

      add(createPersonPanel("commitCommitter", c.getCommitterIdent(), Constants.SearchType.COMMITTER));

      add(WicketUtils.createTimestampLabel("commitCommitterDate",

            c.getCommitterIdent().getWhen(), getTimeZone()));

            c.getCommitterIdent().getWhen(), getTimeZone(), getTimeUtils()));



      add(new Label("commitId", c.getName()));



      add(new LinkPanel("commitTree", "list", c.getTree().getName(), TreePage.class,

            newCommitParameter()));

      add(new BookmarkablePageLink<Void>("treeLink", TreePage.class, newCommitParameter()));

      add(new ExternalLink("zipLink", DownloadZipServlet.asLink(getRequest()

            .getRelativePathPrefixToContextRoot(), repositoryName, objectId, null))

            .setVisible(GitBlit.getBoolean(Keys.web.allowZipDownloads, true)));

      final String baseUrl = WicketUtils.getGitblitURL(getRequest());

      add(new ExternalLink("zipLink", DownloadZipServlet.asLink(baseUrl, repositoryName,

            objectId, null)).setVisible(GitBlit.getBoolean(Keys.web.allowZipDownloads, true)));



      // Parent Commits

      ListDataProvider<String> parentsDp = new ListDataProvider<String>(parents);

@@ -111,6 +117,26 @@


      addFullText("fullMessage", c.getFullMessage(), true);



      // git notes

      List<GitNote> notes = JGitUtils.getNotesOnCommit(r, c);

      ListDataProvider<GitNote> notesDp = new ListDataProvider<GitNote>(notes);

      DataView<GitNote> notesView = new DataView<GitNote>("notes", notesDp) {

         private static final long serialVersionUID = 1L;



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

            GitNote entry = item.getModelObject();

            item.add(new RefsPanel("refName", repositoryName, Arrays.asList(entry.notesRef)));

            item.add(createPersonPanel("authorName", entry.notesRef.getAuthorIdent(),

                  Constants.SearchType.AUTHOR));

            item.add(new GravatarImage("noteAuthorAvatar", entry.notesRef.getAuthorIdent()));

            item.add(WicketUtils.createTimestampLabel("authorDate", entry.notesRef

                  .getAuthorIdent().getWhen(), getTimeZone(), getTimeUtils()));

            item.add(new Label("noteContent", GitBlit.self().processCommitMessage(

                  repositoryName, entry.content)).setEscapeModelStrings(false));

         }

      };

      add(notesView.setVisible(notes.size() > 0));



      // changed paths list

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

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

@@ -125,21 +151,60 @@
            WicketUtils.setChangeTypeCssClass(changeType, entry.changeType);

            setChangeTypeTooltip(changeType, entry.changeType);

            item.add(changeType);

				
            boolean hasSubmodule = false;

            String submodulePath = null;

            if (entry.isTree()) {

               // tree

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

                     newPathParameter(entry.path)));

                     WicketUtils

                           .newPathParameter(repositoryName, entry.commitId, entry.path)));

            } else if (entry.isSubmodule()) {

               // submodule

               String submoduleId = entry.objectId;

               SubmoduleModel submodule = getSubmodule(entry.path);

               submodulePath = submodule.gitblitPath;

               hasSubmodule = submodule.hasSubmodule;

					
               item.add(new LinkPanel("pathName", "list", entry.path + " @ " +

                     getShortObjectId(submoduleId), TreePage.class,

                     WicketUtils.newPathParameter(submodulePath, submoduleId, "")).setEnabled(hasSubmodule));

            } else {

               // blob

               item.add(new LinkPanel("pathName", "list", entry.path, BlobPage.class,

                     newPathParameter(entry.path)));

                     WicketUtils

                           .newPathParameter(repositoryName, entry.commitId, entry.path)));

            }



            item.add(new BookmarkablePageLink<Void>("diff", BlobDiffPage.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", HistoryPage.class,

                  newPathParameter(entry.path)));

				
            // quick links

            if (entry.isSubmodule()) {

               // submodule					
               item.add(new BookmarkablePageLink<Void>("diff", BlobDiffPage.class, WicketUtils

                     .newPathParameter(submodulePath, entry.objectId, entry.path))

                     .setEnabled(false));

               item.add(new BookmarkablePageLink<Void>("view", CommitPage.class, WicketUtils

                     .newObjectParameter(submodulePath, entry.objectId)).setEnabled(hasSubmodule));

               item.add(new BookmarkablePageLink<Void>("blame", BlamePage.class, WicketUtils

                     .newPathParameter(submodulePath, entry.objectId, entry.path))

                     .setEnabled(false));

               item.add(new BookmarkablePageLink<Void>("history", HistoryPage.class, WicketUtils

                     .newPathParameter(submodulePath, entry.objectId, entry.path))

                     .setEnabled(hasSubmodule));

            } else {

               // tree or blob

               item.add(new BookmarkablePageLink<Void>("diff", BlobDiffPage.class, WicketUtils

                     .newPathParameter(repositoryName, entry.commitId, entry.path))

                     .setEnabled(!entry.changeType.equals(ChangeType.ADD)

                           && !entry.changeType.equals(ChangeType.DELETE)));

               item.add(new BookmarkablePageLink<Void>("view", BlobPage.class, WicketUtils

                     .newPathParameter(repositoryName, entry.commitId, entry.path)));

               item.add(new BookmarkablePageLink<Void>("blame", BlamePage.class, WicketUtils

                     .newPathParameter(repositoryName, entry.commitId, entry.path))

                     .setEnabled(!entry.changeType.equals(ChangeType.ADD)));

               item.add(new BookmarkablePageLink<Void>("history", HistoryPage.class, WicketUtils

                     .newPathParameter(repositoryName, entry.commitId, entry.path))

                     .setEnabled(!entry.changeType.equals(ChangeType.ADD)));

            }



            WicketUtils.setAlternatingBackground(item, counter);

            counter++;