| | |
| | | */ |
| | | package com.gitblit.wicket.pages; |
| | | |
| | | import java.io.OutputStream; |
| | | import java.util.ArrayList; |
| | | import java.util.Arrays; |
| | | import java.util.List; |
| | |
| | | import org.apache.wicket.markup.html.basic.Label; |
| | | import org.apache.wicket.markup.html.link.BookmarkablePageLink; |
| | | import org.apache.wicket.markup.html.link.ExternalLink; |
| | | import org.apache.wicket.markup.html.link.Link; |
| | | 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.apache.wicket.request.target.resource.ResourceStreamRequestTarget; |
| | | import org.apache.wicket.util.resource.AbstractResourceStreamWriter; |
| | | import org.apache.wicket.util.resource.IResourceStream; |
| | | import org.eclipse.jgit.diff.DiffEntry.ChangeType; |
| | | import org.eclipse.jgit.lib.Repository; |
| | | import org.eclipse.jgit.revwalk.RevCommit; |
| | |
| | | import com.gitblit.models.GitNote; |
| | | import com.gitblit.models.PathModel.PathChangeModel; |
| | | import com.gitblit.models.SubmoduleModel; |
| | | import com.gitblit.models.UserModel; |
| | | import com.gitblit.servlet.RawServlet; |
| | | import com.gitblit.utils.DiffUtils; |
| | | import com.gitblit.utils.DiffUtils.DiffComparator; |
| | | import com.gitblit.utils.DiffUtils.DiffOutput; |
| | | import com.gitblit.utils.DiffUtils.DiffOutputType; |
| | | import com.gitblit.utils.JGitUtils; |
| | | import com.gitblit.wicket.CacheControl; |
| | | import com.gitblit.wicket.GitBlitWebSession; |
| | | import com.gitblit.wicket.CacheControl.LastModified; |
| | | import com.gitblit.wicket.WicketUtils; |
| | | import com.gitblit.wicket.panels.CommitHeaderPanel; |
| | | import com.gitblit.wicket.panels.CommitLegendPanel; |
| | | import com.gitblit.wicket.panels.DiffStatPanel; |
| | | import com.gitblit.wicket.panels.GravatarImage; |
| | | import com.gitblit.wicket.panels.AvatarImage; |
| | | import com.gitblit.wicket.panels.LinkPanel; |
| | | import com.gitblit.wicket.panels.RefsPanel; |
| | | |
| | |
| | | public CommitDiffPage(PageParameters params) { |
| | | super(params); |
| | | |
| | | Repository r = getRepository(); |
| | | |
| | | RevCommit commit = getCommit(); |
| | | final Repository r = getRepository(); |
| | | final RevCommit commit = getCommit(); |
| | | final DiffComparator diffComparator = WicketUtils.getDiffComparator(params); |
| | | |
| | | List<String> parents = new ArrayList<String>(); |
| | | if (commit.getParentCount() > 0) { |
| | |
| | | WicketUtils.newObjectParameter(repositoryName, objectId))); |
| | | add(new BookmarkablePageLink<Void>("commitLink", CommitPage.class, |
| | | WicketUtils.newObjectParameter(repositoryName, objectId))); |
| | | add(new LinkPanel("whitespaceLink", null, getString(diffComparator.getOpposite().getTranslationKey()), |
| | | CommitDiffPage.class, WicketUtils.newDiffParameter(repositoryName, objectId, diffComparator.getOpposite()))); |
| | | |
| | | add(new CommitHeaderPanel("commitHeader", repositoryName, commit)); |
| | | |
| | | final List<String> imageExtensions = app().settings().getStrings(Keys.web.imageExtensions); |
| | | final ImageDiffHandler handler = new ImageDiffHandler(this, repositoryName, |
| | | parents.isEmpty() ? null : parents.get(0), commit.getName(), imageExtensions); |
| | | final DiffOutput diff = DiffUtils.getCommitDiff(r, commit, DiffOutputType.HTML, handler); |
| | | final int tabLength = app().settings().getInteger(Keys.web.tabLength, 4); |
| | | final DiffOutput diff = DiffUtils.getCommitDiff(r, commit, diffComparator, DiffOutputType.HTML, handler, tabLength); |
| | | if (handler.getImgDiffCount() > 0) { |
| | | addBottomScript("scripts/imgdiff.js"); // Tiny support script for image diffs |
| | | } |
| | |
| | | item.add(new RefsPanel("refName", repositoryName, Arrays.asList(entry.notesRef))); |
| | | item.add(createPersonPanel("authorName", entry.notesRef.getAuthorIdent(), |
| | | Constants.SearchType.AUTHOR)); |
| | | item.add(new GravatarImage("noteAuthorAvatar", entry.notesRef.getAuthorIdent())); |
| | | item.add(new AvatarImage("noteAuthorAvatar", entry.notesRef.getAuthorIdent())); |
| | | item.add(WicketUtils.createTimestampLabel("authorDate", entry.notesRef |
| | | .getAuthorIdent().getWhen(), getTimeZone(), getTimeUtils())); |
| | | item.add(new Label("noteContent", bugtraqProcessor().processPlainCommitMessage(getRepository(), repositoryName, |
| | |
| | | @Override |
| | | public void populateItem(final Item<PathChangeModel> item) { |
| | | final PathChangeModel entry = item.getModelObject(); |
| | | |
| | | Label changeType = new Label("changeType", ""); |
| | | WicketUtils.setChangeTypeCssClass(changeType, entry.changeType); |
| | | setChangeTypeTooltip(changeType, entry.changeType); |
| | |
| | | |
| | | boolean hasSubmodule = false; |
| | | String submodulePath = null; |
| | | |
| | | if (entry.isTree()) { |
| | | // tree |
| | | item.add(new LinkPanel("pathName", null, entry.path, TreePage.class, |
| | |
| | | item.add(new LinkPanel("pathName", "list", entry.path + " @ " + getShortObjectId(submoduleId), "#n" + entry.objectId)); |
| | | } else { |
| | | // add relative link |
| | | item.add(new LinkPanel("pathName", "list", entry.path, "#n" + entry.objectId)); |
| | | if (entry.isFilestoreItem()) { |
| | | |
| | | item.add(new LinkPanel("pathName", "list", entry.path, new Link<Object>("link", null) { |
| | | |
| | | private static final long serialVersionUID = 1L; |
| | | |
| | | @Override |
| | | public void onClick() { |
| | | IResourceStream resourceStream = new AbstractResourceStreamWriter() { |
| | | |
| | | private static final long serialVersionUID = 1L; |
| | | |
| | | @Override |
| | | public void write(OutputStream output) { |
| | | UserModel user = GitBlitWebSession.get().getUser(); |
| | | user = user == null ? UserModel.ANONYMOUS : user; |
| | | |
| | | app().filestore().downloadBlob(entry.getFilestoreOid(), user, getRepositoryModel(), output); |
| | | } |
| | | }; |
| | | |
| | | getRequestCycle().setRequestTarget(new ResourceStreamRequestTarget(resourceStream, entry.path)); |
| | | }})); |
| | | } |
| | | else |
| | | { |
| | | item.add(new LinkPanel("pathName", "list", entry.path, "#n" + entry.objectId)); |
| | | } |
| | | } |
| | | |
| | | // quick links |
| | | if (entry.isSubmodule()) { |
| | | item.add(new Label("filestore", getString("gb.filestore")).setVisible(false)); |
| | | |
| | | item.add(new ExternalLink("raw", "").setEnabled(false)); |
| | | // submodule |
| | | item.add(new ExternalLink("patch", "").setEnabled(false)); |
| | |
| | | .newPathParameter(repositoryName, entry.commitId, entry.path)) |
| | | .setEnabled(!entry.changeType.equals(ChangeType.ADD) |
| | | && !entry.changeType.equals(ChangeType.DELETE))); |
| | | item.add(new BookmarkablePageLink<Void>("view", BlobPage.class, WicketUtils |
| | | .newPathParameter(repositoryName, entry.commitId, entry.path)) |
| | | .setEnabled(!entry.changeType.equals(ChangeType.DELETE))); |
| | | String rawUrl = RawServlet.asLink(getContextUrl(), repositoryName, entry.commitId, entry.path); |
| | | item.add(new ExternalLink("raw", rawUrl) |
| | | .setEnabled(!entry.changeType.equals(ChangeType.DELETE))); |
| | | |
| | | if (entry.isFilestoreItem()) { |
| | | item.add(new Label("filestore", getString("gb.filestore")).setVisible(true)); |
| | | |
| | | item.add(new Link<Object>("view", null) { |
| | | |
| | | private static final long serialVersionUID = 1L; |
| | | |
| | | @Override |
| | | public void onClick() { |
| | | |
| | | IResourceStream resourceStream = new AbstractResourceStreamWriter() { |
| | | |
| | | private static final long serialVersionUID = 1L; |
| | | |
| | | @Override |
| | | public void write(OutputStream output) { |
| | | UserModel user = GitBlitWebSession.get().getUser(); |
| | | user = user == null ? UserModel.ANONYMOUS : user; |
| | | |
| | | app().filestore().downloadBlob(entry.getFilestoreOid(), user, getRepositoryModel(), output); |
| | | } |
| | | }; |
| | | |
| | | |
| | | getRequestCycle().setRequestTarget(new ResourceStreamRequestTarget(resourceStream, entry.path)); |
| | | }}); |
| | | |
| | | item.add(new Link<Object>("raw", null) { |
| | | |
| | | private static final long serialVersionUID = 1L; |
| | | |
| | | @Override |
| | | public void onClick() { |
| | | |
| | | IResourceStream resourceStream = new AbstractResourceStreamWriter() { |
| | | |
| | | private static final long serialVersionUID = 1L; |
| | | |
| | | @Override |
| | | public void write(OutputStream output) { |
| | | UserModel user = GitBlitWebSession.get().getUser(); |
| | | user = user == null ? UserModel.ANONYMOUS : user; |
| | | |
| | | app().filestore().downloadBlob(entry.getFilestoreOid(), user, getRepositoryModel(), output); |
| | | } |
| | | }; |
| | | |
| | | |
| | | getRequestCycle().setRequestTarget(new ResourceStreamRequestTarget(resourceStream, entry.path)); |
| | | }}); |
| | | } else { |
| | | |
| | | item.add(new Label("filestore", getString("gb.filestore")).setVisible(false)); |
| | | |
| | | item.add(new BookmarkablePageLink<Void>("view", BlobPage.class, WicketUtils |
| | | .newPathParameter(repositoryName, entry.commitId, entry.path)) |
| | | .setEnabled(!entry.changeType.equals(ChangeType.DELETE))); |
| | | |
| | | item.add(new ExternalLink("raw", RawServlet.asLink(getContextUrl(), repositoryName, entry.commitId, entry.path)) |
| | | .setEnabled(!entry.changeType.equals(ChangeType.DELETE))); |
| | | } |
| | | |
| | | item.add(new BookmarkablePageLink<Void>("blame", BlamePage.class, WicketUtils |
| | | .newPathParameter(repositoryName, entry.commitId, entry.path)) |
| | | .setEnabled(!entry.changeType.equals(ChangeType.ADD) |