- Use release name as root directory in Gitblit GO artifacts (ticket-109) | - Use release name as root directory in Gitblit GO artifacts (ticket-109) | ||||
- Split gitblit.properties into gitblit.properties & defaults.properties (ticket-110) | - Split gitblit.properties into gitblit.properties & defaults.properties (ticket-110) | ||||
- Show team type in teams page (pr-217, ticket-168) | - Show team type in teams page (pr-217, ticket-168) | ||||
- Use author date to be consistent with other tools (pr-919) | |||||
additions: | additions: | ||||
- Add GitHub Octicons (ticket-106) | - Add GitHub Octicons (ticket-106) | ||||
- Support for chain-loading properties files (ticket-110) | - Support for chain-loading properties files (ticket-110) |
} | } | ||||
} else if (referencedObject instanceof RevCommit) { | } else if (referencedObject instanceof RevCommit) { | ||||
RevCommit commit = (RevCommit) referencedObject; | 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 { | } else { | ||||
date = JGitUtils.getCommitDate(commit); | date = JGitUtils.getCommitDate(commit); | ||||
} | } |
import java.util.Map.Entry; | import java.util.Map.Entry; | ||||
import java.util.regex.Pattern; | import java.util.regex.Pattern; | ||||
import com.google.common.base.Strings; | |||||
import org.apache.commons.io.filefilter.TrueFileFilter; | import org.apache.commons.io.filefilter.TrueFileFilter; | ||||
import org.eclipse.jgit.api.CloneCommand; | import org.eclipse.jgit.api.CloneCommand; | ||||
import org.eclipse.jgit.api.FetchCommand; | import org.eclipse.jgit.api.FetchCommand; | ||||
import com.gitblit.models.PathModel.PathChangeModel; | import com.gitblit.models.PathModel.PathChangeModel; | ||||
import com.gitblit.models.RefModel; | import com.gitblit.models.RefModel; | ||||
import com.gitblit.models.SubmoduleModel; | import com.gitblit.models.SubmoduleModel; | ||||
import com.google.common.base.Strings; | |||||
/** | /** | ||||
* Collection of static methods for retrieving information from a repository. | * Collection of static methods for retrieving information from a repository. | ||||
if (commit == null) { | if (commit == null) { | ||||
return new Date(0); | return new Date(0); | ||||
} | } | ||||
return commit.getAuthorIdent().getWhen(); | |||||
if (commit.getAuthorIdent() != null) { | |||||
return commit.getAuthorIdent().getWhen(); | |||||
} | |||||
return getCommitDate(commit); | |||||
} | } | ||||
/** | /** |
Iterable<RevCommit> revlog = revWalk; | Iterable<RevCommit> revlog = revWalk; | ||||
for (RevCommit rev : revlog) { | for (RevCommit rev : revlog) { | ||||
Date d = JGitUtils.getCommitDate(rev); | |||||
Date d = JGitUtils.getAuthorDate(rev); | |||||
String p = df.format(d); | String p = df.format(d); | ||||
if (!metricMap.containsKey(p)) { | if (!metricMap.containsKey(p)) { | ||||
metricMap.put(p, new Metric(p)); | metricMap.put(p, new Metric(p)); |
import com.gitblit.wicket.GitBlitWebSession; | import com.gitblit.wicket.GitBlitWebSession; | ||||
import com.gitblit.wicket.TicketsUI; | import com.gitblit.wicket.TicketsUI; | ||||
import com.gitblit.wicket.WicketUtils; | import com.gitblit.wicket.WicketUtils; | ||||
import com.gitblit.wicket.panels.AvatarImage; | |||||
import com.gitblit.wicket.panels.BasePanel.JavascriptTextPrompt; | import com.gitblit.wicket.panels.BasePanel.JavascriptTextPrompt; | ||||
import com.gitblit.wicket.panels.CommentPanel; | import com.gitblit.wicket.panels.CommentPanel; | ||||
import com.gitblit.wicket.panels.DiffStatPanel; | import com.gitblit.wicket.panels.DiffStatPanel; | ||||
import com.gitblit.wicket.panels.AvatarImage; | |||||
import com.gitblit.wicket.panels.IconAjaxLink; | import com.gitblit.wicket.panels.IconAjaxLink; | ||||
import com.gitblit.wicket.panels.LinkPanel; | import com.gitblit.wicket.panels.LinkPanel; | ||||
import com.gitblit.wicket.panels.ShockWaveComponent; | import com.gitblit.wicket.panels.ShockWaveComponent; | ||||
item.add(new LinkPanel("diff", "link", getString("gb.diff"), CommitDiffPage.class, | item.add(new LinkPanel("diff", "link", getString("gb.diff"), CommitDiffPage.class, | ||||
WicketUtils.newObjectParameter(repositoryName, commit.getName()), true)); | WicketUtils.newObjectParameter(repositoryName, commit.getName()), true)); | ||||
item.add(new Label("title", StringUtils.trimString(commit.getShortMessage(), Constants.LEN_SHORTLOG_REFS))); | 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)); | .get().getTimezone(), getTimeUtils(), false)); | ||||
item.add(new DiffStatPanel("commitDiffStat", 0, 0, true)); | item.add(new DiffStatPanel("commitDiffStat", 0, 0, true)); | ||||
} | } |
@Override | @Override | ||||
public void populateItem(final Item<RevCommit> item) { | public void populateItem(final Item<RevCommit> item) { | ||||
final RevCommit entry = item.getModelObject(); | 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())); | item.add(WicketUtils.createDateLabel("commitDate", date, getTimeZone(), getTimeUtils())); | ||||
@Override | @Override | ||||
public void populateItem(final Item<RevCommit> item) { | public void populateItem(final Item<RevCommit> item) { | ||||
final RevCommit entry = item.getModelObject(); | final RevCommit entry = item.getModelObject(); | ||||
final Date date = JGitUtils.getCommitDate(entry); | |||||
final Date date = JGitUtils.getAuthorDate(entry); | |||||
final boolean isMerge = entry.getParentCount() > 1; | final boolean isMerge = entry.getParentCount() > 1; | ||||
item.add(WicketUtils.createDateLabel("commitDate", date, getTimeZone(), getTimeUtils())); | item.add(WicketUtils.createDateLabel("commitDate", date, getTimeZone(), getTimeUtils())); |
@Override | @Override | ||||
public void populateItem(final Item<RevCommit> item) { | public void populateItem(final Item<RevCommit> item) { | ||||
final RevCommit entry = item.getModelObject(); | 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())); | item.add(WicketUtils.createDateLabel("commitDate", date, getTimeZone(), getTimeUtils())); | ||||