Fixed bug in receive hook for repositories in subfolders

James Moger

2012-01-05 cb285cbfddfc0b633d6b8cdb4dc0d2bd2b8b51ef

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

@@ -31,16 +31,17 @@
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.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;



@@ -78,12 +79,13 @@
      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()));



      add(new GravatarImage("authorAvatar", c.getAuthorIdent()));

		
      // committer

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

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

      add(WicketUtils.createTimestampLabel("commitCommitterDate",

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



@@ -92,9 +94,9 @@
      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);

@@ -125,11 +127,12 @@
            GitNote entry = item.getModelObject();

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

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

                  SearchType.AUTHOR));

                  Constants.SearchType.AUTHOR));

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

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

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

            item.add(new Label("noteContent", substituteText(entry.content))

                  .setEscapeModelStrings(false));

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

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

         }

      };

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

@@ -150,22 +153,26 @@
            item.add(changeType);

            if (entry.isTree()) {

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

                     newPathParameter(entry.path)));

                     WicketUtils

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

            } else {

               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)).setEnabled(!entry.changeType

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

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

                  newPathParameter(entry.path)));

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

                  newPathParameter(entry.path)));

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

                  newPathParameter(entry.path)).setEnabled(!entry.changeType

                  .equals(ChangeType.ADD)));

            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++;