Strip folder name and .git from repo links in the project view

James Moger

2012-09-10 fabe060d3a435f116128851f828e35c2af5fde67

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

@@ -23,10 +23,10 @@


import com.gitblit.GitBlit;

import com.gitblit.Keys;

import com.gitblit.utils.DiffUtils;

import com.gitblit.utils.DiffUtils.DiffOutputType;

import com.gitblit.utils.JGitUtils;

import com.gitblit.utils.JGitUtils.DiffOutputType;

import com.gitblit.utils.StringUtils;

import com.gitblit.wicket.RepositoryPage;

import com.gitblit.wicket.WicketUtils;

import com.gitblit.wicket.panels.CommitHeaderPanel;

import com.gitblit.wicket.panels.PathBreadcrumbsPanel;

@@ -41,27 +41,35 @@


      Repository r = getRepository();

      RevCommit commit = getCommit();

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



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

            DiffOutputType.GITBLIT.name()));



      String diff;

      if (StringUtils.isEmpty(baseObjectId)) {

         // use first parent

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

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

         diff = DiffUtils.getDiff(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, diffType);

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

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

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

               WicketUtils.newBlobDiffParameter(repositoryName, baseObjectId, objectId,

                     blobPath)));

      }

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

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



      add(new BookmarkablePageLink<Void>("commitLink", CommitPage.class,

            WicketUtils.newObjectParameter(repositoryName, objectId)));

      add(new BookmarkablePageLink<Void>("commitDiffLink", CommitDiffPage.class,

            WicketUtils.newObjectParameter(repositoryName, objectId)));



      // diff page links

      add(new Label("blameLink", getString("gb.blame")));

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

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

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

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

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



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