Use author date to be consistent with other tools (fixes #919)

James Moger

2015-09-18 a592329a82d0a85d33abcc63f08df20b79e8e4f7

Use author date to be consistent with other tools (fixes #919)

 releases.moxie

@@ -24,6 +24,7 @@
    - Use release name as root directory in Gitblit GO artifacts (ticket-109)
    - Split gitblit.properties into gitblit.properties & defaults.properties (ticket-110)
    - Show team type in teams page (pr-217, ticket-168)
    - Use author date to be consistent with other tools (pr-919)
    additions:
    - Add GitHub Octicons (ticket-106)
    - Support for chain-loading properties files (ticket-110) 

 src/main/java/com/gitblit/models/RefModel.java

@@ -58,9 +58,9 @@
                }

            } else if (referencedObject instanceof RevCommit) {

                RevCommit commit = (RevCommit) referencedObject;

                PersonIdent committer = commit.getCommitterIdent();

                if (committer != null) {

                    date = committer.getWhen();

                PersonIdent author = commit.getAuthorIdent();

                if (author != null) {

                    date = author.getWhen();

                } else {

                    date = JGitUtils.getCommitDate(commit);

                }


 src/main/java/com/gitblit/utils/JGitUtils.java

@@ -30,7 +30,6 @@
import java.util.Map.Entry;

import java.util.regex.Pattern;



import com.google.common.base.Strings;

import org.apache.commons.io.filefilter.TrueFileFilter;

import org.eclipse.jgit.api.CloneCommand;

import org.eclipse.jgit.api.FetchCommand;

@@ -91,6 +90,7 @@
import com.gitblit.models.PathModel.PathChangeModel;

import com.gitblit.models.RefModel;

import com.gitblit.models.SubmoduleModel;

import com.google.common.base.Strings;



/**

 * Collection of static methods for retrieving information from a repository.

@@ -691,7 +691,10 @@
        if (commit == null) {

            return new Date(0);

        }

        return commit.getAuthorIdent().getWhen();

        if (commit.getAuthorIdent() != null) {

            return commit.getAuthorIdent().getWhen();

        }

        return getCommitDate(commit);

    }



    /**


 src/main/java/com/gitblit/utils/MetricUtils.java

@@ -136,7 +136,7 @@


                Iterable<RevCommit> revlog = revWalk;

                for (RevCommit rev : revlog) {

                    Date d = JGitUtils.getCommitDate(rev);

                    Date d = JGitUtils.getAuthorDate(rev);

                    String p = df.format(d);

                    if (!metricMap.containsKey(p)) {

                        metricMap.put(p, new Metric(p));


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

@@ -88,10 +88,10 @@
import com.gitblit.wicket.GitBlitWebSession;

import com.gitblit.wicket.TicketsUI;

import com.gitblit.wicket.WicketUtils;

import com.gitblit.wicket.panels.AvatarImage;

import com.gitblit.wicket.panels.BasePanel.JavascriptTextPrompt;

import com.gitblit.wicket.panels.CommentPanel;

import com.gitblit.wicket.panels.DiffStatPanel;

import com.gitblit.wicket.panels.AvatarImage;

import com.gitblit.wicket.panels.IconAjaxLink;

import com.gitblit.wicket.panels.LinkPanel;

import com.gitblit.wicket.panels.ShockWaveComponent;

@@ -823,7 +823,7 @@
                    item.add(new LinkPanel("diff", "link", getString("gb.diff"), CommitDiffPage.class,

                            WicketUtils.newObjectParameter(repositoryName, commit.getName()), true));

                    item.add(new Label("title", StringUtils.trimString(commit.getShortMessage(), Constants.LEN_SHORTLOG_REFS)));

                    item.add(WicketUtils.createDateLabel("commitDate", JGitUtils.getCommitDate(commit), GitBlitWebSession

                    item.add(WicketUtils.createDateLabel("commitDate", JGitUtils.getAuthorDate(commit), GitBlitWebSession

                            .get().getTimezone(), getTimeUtils(), false));

                    item.add(new DiffStatPanel("commitDiffStat", 0, 0, true));

                }


 src/main/java/com/gitblit/wicket/panels/HistoryPanel.java

@@ -160,7 +160,7 @@
            @Override

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

                final RevCommit entry = item.getModelObject();

                final Date date = JGitUtils.getCommitDate(entry);

                final Date date = JGitUtils.getAuthorDate(entry);



                item.add(WicketUtils.createDateLabel("commitDate", date, getTimeZone(), getTimeUtils()));




 src/main/java/com/gitblit/wicket/panels/LogPanel.java

@@ -109,7 +109,7 @@
            @Override

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

                final RevCommit entry = item.getModelObject();

                final Date date = JGitUtils.getCommitDate(entry);

                final Date date = JGitUtils.getAuthorDate(entry);

                final boolean isMerge = entry.getParentCount() > 1;



                item.add(WicketUtils.createDateLabel("commitDate", date, getTimeZone(), getTimeUtils()));


 src/main/java/com/gitblit/wicket/panels/SearchPanel.java

@@ -86,7 +86,7 @@
            @Override

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

                final RevCommit entry = item.getModelObject();

                final Date date = JGitUtils.getCommitDate(entry);

                final Date date = JGitUtils.getAuthorDate(entry);



                item.add(WicketUtils.createDateLabel("commitDate", date, getTimeZone(), getTimeUtils()));