| | |
|---|
| | | import org.eclipse.jgit.lib.Repository;
|
|---|
| | | import org.eclipse.jgit.revwalk.RevCommit;
|
|---|
| | |
|
|---|
| | | import com.gitblit.BranchGraphServlet;
|
|---|
| | | import com.gitblit.Constants;
|
|---|
| | | import com.gitblit.Keys;
|
|---|
| | | import com.gitblit.models.RefModel;
|
|---|
| | | import com.gitblit.servlet.BranchGraphServlet;
|
|---|
| | | import com.gitblit.utils.JGitUtils;
|
|---|
| | | import com.gitblit.utils.StringUtils;
|
|---|
| | | import com.gitblit.wicket.ExternalImage;
|
|---|
| | |
|---|
| | | @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()));
|
|---|
| | |
|
|---|
| | |
|---|
| | | String author = entry.getAuthorIdent().getName();
|
|---|
| | | LinkPanel authorLink = new LinkPanel("commitAuthor", "list", author,
|
|---|
| | | GitSearchPage.class, WicketUtils.newSearchParameter(repositoryName,
|
|---|
| | | objectId, author, Constants.SearchType.AUTHOR));
|
|---|
| | | null, author, Constants.SearchType.AUTHOR));
|
|---|
| | | setPersonSearchTooltip(authorLink, author, Constants.SearchType.AUTHOR);
|
|---|
| | | item.add(authorLink);
|
|---|
| | |
|
|---|
| | | // merge icon
|
|---|
| | | if (entry.getParentCount() > 1) {
|
|---|
| | | if (isMerge) {
|
|---|
| | | item.add(WicketUtils.newImage("commitIcon", "commit_merge_16x16.png"));
|
|---|
| | | } else {
|
|---|
| | | item.add(WicketUtils.newBlankImage("commitIcon"));
|
|---|
| | |
|---|
| | | } else {
|
|---|
| | | trimmedMessage = StringUtils.trimString(shortMessage, Constants.LEN_SHORTLOG);
|
|---|
| | | }
|
|---|
| | | LinkPanel shortlog = new LinkPanel("commitShortMessage", "list subject",
|
|---|
| | | LinkPanel shortlog = new LinkPanel("commitShortMessage", "list subject" + (isMerge ? " merge" : ""),
|
|---|
| | | trimmedMessage, CommitPage.class, WicketUtils.newObjectParameter(
|
|---|
| | | repositoryName, entry.getName()));
|
|---|
| | | if (!shortMessage.equals(trimmedMessage)) {
|
|---|
