Eliminate problematic HEAD links from the blob, blame, and tree pages

James Moger

2014-03-03 1f3dff18737576a30bad8e1b7ea45c00fcad265a

Eliminate problematic HEAD links from the blob, blame, and tree pages

 releases.moxie

@@ -52,6 +52,7 @@
    - Retrieve LDAP groups with dereferencing aliases (pr-122)
    - Revised committer verification to require a matching displayname or account name AND the email address
    - Serve repositories on both /r and /git, displaying /r because it is shorter
    - Eliminate HEAD from the blob, blame, and tree pages. That assumed a resource was available in HEAD and it may not be.
    additions:
    - Added color modes for the blame page (issue-2)
    - Added an optional MirrorService which will periodically fetch ref updates from source repositories for mirrors (issue-5).  Repositories must be manually cloned using native git and "--mirror".

 src/main/java/com/gitblit/wicket/pages/BlamePage.html

@@ -9,7 +9,7 @@
    

    <!-- blame nav links -->    

    <div class="page_nav2">

        <a wicket:id="blobLink"><wicket:message key="gb.view"></wicket:message></a> | <a wicket:id="historyLink"><wicket:message key="gb.history"></wicket:message></a> | <a wicket:id="headLink"><wicket:message key="gb.head"></wicket:message></a> | <a wicket:id="commitLink"><wicket:message key="gb.commit"></wicket:message></a> | <a wicket:id="commitDiffLink"><wicket:message key="gb.commitdiff"></wicket:message></a>

        <a wicket:id="blobLink"><wicket:message key="gb.view"></wicket:message></a> | <a wicket:id="historyLink"><wicket:message key="gb.history"></wicket:message></a> | <a wicket:id="commitLink"><wicket:message key="gb.commit"></wicket:message></a> | <a wicket:id="commitDiffLink"><wicket:message key="gb.commitdiff"></wicket:message></a>

    </div>    

    

    <!-- commit header -->


 src/main/java/com/gitblit/wicket/pages/BlamePage.java

@@ -35,7 +35,6 @@
import org.apache.wicket.markup.repeater.Item;

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

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

import org.eclipse.jgit.lib.Constants;

import org.eclipse.jgit.lib.ObjectId;

import org.eclipse.jgit.revwalk.RevCommit;



@@ -103,8 +102,6 @@
                WicketUtils.newObjectParameter(repositoryName, objectId)));



        // blame page links

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

                WicketUtils.newPathParameter(repositoryName, Constants.HEAD, blobPath)));

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

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




 src/main/java/com/gitblit/wicket/pages/BlobPage.html

@@ -46,7 +46,7 @@


        <!-- blob nav links -->    

        <div class="page_nav2">

            <a wicket:id="blameLink"><wicket:message key="gb.blame"></wicket:message></a> | <a wicket:id="historyLink"><wicket:message key="gb.history"></wicket:message></a> | <a wicket:id="rawLink"><wicket:message key="gb.raw"></wicket:message></a> | <a wicket:id="headLink"><wicket:message key="gb.head"></wicket:message></a>

            <a wicket:id="blameLink"><wicket:message key="gb.blame"></wicket:message></a> | <a wicket:id="historyLink"><wicket:message key="gb.history"></wicket:message></a> | <a wicket:id="rawLink"><wicket:message key="gb.raw"></wicket:message></a>

        </div>    

    

        <!-- commit header -->


 src/main/java/com/gitblit/wicket/pages/BlobPage.java

@@ -24,7 +24,6 @@
import org.apache.wicket.markup.html.basic.Label;

import org.apache.wicket.markup.html.image.Image;

import org.apache.wicket.markup.html.link.BookmarkablePageLink;

import org.eclipse.jgit.lib.Constants;

import org.eclipse.jgit.lib.Repository;

import org.eclipse.jgit.revwalk.RevCommit;



@@ -60,7 +59,6 @@
            add(new BookmarkablePageLink<Void>("historyLink", HistoryPage.class).setEnabled(false));

            add(new BookmarkablePageLink<Void>("rawLink", RawPage.class,

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

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

            add(new CommitHeaderPanel("commitHeader", objectId));

            add(new PathBreadcrumbsPanel("breadcrumbs", repositoryName, blobPath, objectId));

            Component c = new Label("blobText", JGitUtils.getStringContent(r, objectId, encodings));

@@ -91,8 +89,6 @@
                    WicketUtils.newPathParameter(repositoryName, objectId, blobPath)));

            add(new BookmarkablePageLink<Void>("rawLink", RawPage.class,

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

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

                    WicketUtils.newPathParameter(repositoryName, Constants.HEAD, blobPath)));



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




 src/main/java/com/gitblit/wicket/pages/TreePage.html

@@ -9,7 +9,7 @@


    <!-- blob nav links -->    

    <div class="page_nav2">

        <a wicket:id="historyLink"><wicket:message key="gb.history"></wicket:message></a> | <a wicket:id="headLink"><wicket:message key="gb.head"></wicket:message></a> | <span wicket:id="compressedLinks"></span>

        <a wicket:id="historyLink"><wicket:message key="gb.history"></wicket:message></a> | <span wicket:id="compressedLinks"></span>

    </div>    

    

    <!-- commit header -->


 src/main/java/com/gitblit/wicket/pages/TreePage.java

@@ -24,7 +24,6 @@
import org.apache.wicket.markup.repeater.Item;

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

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

import org.eclipse.jgit.lib.Constants;

import org.eclipse.jgit.lib.FileMode;

import org.eclipse.jgit.lib.Repository;

import org.eclipse.jgit.revwalk.RevCommit;

@@ -56,8 +55,6 @@
        // tree page links

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

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

        add(new BookmarkablePageLink<Void>("headLink", TreePage.class,

                WicketUtils.newPathParameter(repositoryName, Constants.HEAD, path)));

        add(new CompressedDownloadsPanel("compressedLinks", getRequest()

                .getRelativePathPrefixToContextRoot(), repositoryName, objectId, path));