commit | author | age
|
f13c4c
|
1 |
/*
|
JM |
2 |
* Copyright 2011 gitblit.com.
|
|
3 |
*
|
|
4 |
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
5 |
* you may not use this file except in compliance with the License.
|
|
6 |
* You may obtain a copy of the License at
|
|
7 |
*
|
|
8 |
* http://www.apache.org/licenses/LICENSE-2.0
|
|
9 |
*
|
|
10 |
* Unless required by applicable law or agreed to in writing, software
|
|
11 |
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
12 |
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
13 |
* See the License for the specific language governing permissions and
|
|
14 |
* limitations under the License.
|
|
15 |
*/
|
5fe7df
|
16 |
package com.gitblit.wicket.pages;
|
JM |
17 |
|
77c38a
|
18 |
import java.io.OutputStream;
|
PM |
19 |
import java.sql.Blob;
|
5fe7df
|
20 |
import java.util.ArrayList;
|
4ab184
|
21 |
import java.util.Arrays;
|
5fe7df
|
22 |
import java.util.List;
|
77c38a
|
23 |
import java.util.concurrent.Callable;
|
5fe7df
|
24 |
|
JM |
25 |
import org.apache.wicket.PageParameters;
|
77c38a
|
26 |
import org.apache.wicket.behavior.SimpleAttributeModifier;
|
5fe7df
|
27 |
import org.apache.wicket.markup.html.basic.Label;
|
698678
|
28 |
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
|
77c38a
|
29 |
import org.apache.wicket.markup.html.link.DownloadLink;
|
9cc56a
|
30 |
import org.apache.wicket.markup.html.link.ExternalLink;
|
77c38a
|
31 |
import org.apache.wicket.markup.html.link.Link;
|
PM |
32 |
import org.apache.wicket.markup.html.link.ResourceLink;
|
5fe7df
|
33 |
import org.apache.wicket.markup.repeater.Item;
|
JM |
34 |
import org.apache.wicket.markup.repeater.data.DataView;
|
|
35 |
import org.apache.wicket.markup.repeater.data.ListDataProvider;
|
77c38a
|
36 |
import org.apache.wicket.model.AbstractReadOnlyModel;
|
PM |
37 |
import org.apache.wicket.model.IModel;
|
1a3fc5
|
38 |
import org.apache.wicket.model.StringResourceModel;
|
77c38a
|
39 |
import org.apache.wicket.request.target.basic.RedirectRequestTarget;
|
PM |
40 |
import org.apache.wicket.request.target.resource.ResourceStreamRequestTarget;
|
|
41 |
import org.apache.wicket.util.resource.AbstractResourceStream;
|
|
42 |
import org.apache.wicket.util.resource.AbstractResourceStreamWriter;
|
|
43 |
import org.apache.wicket.util.resource.IResourceStream;
|
|
44 |
import org.bouncycastle.jcajce.provider.symmetric.Threefish;
|
f1720c
|
45 |
import org.eclipse.jgit.diff.DiffEntry.ChangeType;
|
5fe7df
|
46 |
import org.eclipse.jgit.lib.Repository;
|
JM |
47 |
import org.eclipse.jgit.revwalk.RevCommit;
|
|
48 |
|
33d8d8
|
49 |
import com.gitblit.Constants;
|
77c38a
|
50 |
import com.gitblit.GitBlit;
|
PM |
51 |
import com.gitblit.manager.FilestoreManager;
|
|
52 |
import com.gitblit.manager.GitblitManager;
|
|
53 |
import com.gitblit.models.FilestoreModel;
|
a125cf
|
54 |
import com.gitblit.models.GitNote;
|
77c38a
|
55 |
import com.gitblit.models.RepositoryModel;
|
1f9dae
|
56 |
import com.gitblit.models.PathModel.PathChangeModel;
|
59b817
|
57 |
import com.gitblit.models.SubmoduleModel;
|
77c38a
|
58 |
import com.gitblit.models.UserModel;
|
ff17f7
|
59 |
import com.gitblit.servlet.RawServlet;
|
5fe7df
|
60 |
import com.gitblit.utils.JGitUtils;
|
a7db57
|
61 |
import com.gitblit.wicket.CacheControl;
|
77c38a
|
62 |
import com.gitblit.wicket.GitBlitWebSession;
|
a7db57
|
63 |
import com.gitblit.wicket.CacheControl.LastModified;
|
5fe7df
|
64 |
import com.gitblit.wicket.WicketUtils;
|
c1c3c6
|
65 |
import com.gitblit.wicket.panels.CommitHeaderPanel;
|
a645ba
|
66 |
import com.gitblit.wicket.panels.CommitLegendPanel;
|
59b817
|
67 |
import com.gitblit.wicket.panels.CompressedDownloadsPanel;
|
319342
|
68 |
import com.gitblit.wicket.panels.DiffStatPanel;
|
b57b9e
|
69 |
import com.gitblit.wicket.panels.AvatarImage;
|
1f9dae
|
70 |
import com.gitblit.wicket.panels.LinkPanel;
|
4ab184
|
71 |
import com.gitblit.wicket.panels.RefsPanel;
|
5fe7df
|
72 |
|
a7db57
|
73 |
@CacheControl(LastModified.BOOT)
|
5fe7df
|
74 |
public class CommitPage extends RepositoryPage {
|
JM |
75 |
|
|
76 |
public CommitPage(PageParameters params) {
|
cebf45
|
77 |
super(params);
|
5fe7df
|
78 |
|
JM |
79 |
Repository r = getRepository();
|
bc9d4a
|
80 |
RevCommit c = getCommit();
|
699e71
|
81 |
|
5fe7df
|
82 |
List<String> parents = new ArrayList<String>();
|
JM |
83 |
if (c.getParentCount() > 0) {
|
|
84 |
for (RevCommit parent : c.getParents()) {
|
|
85 |
parents.add(parent.name());
|
|
86 |
}
|
|
87 |
}
|
155bf7
|
88 |
|
5fe7df
|
89 |
// commit page links
|
JM |
90 |
if (parents.size() == 0) {
|
|
91 |
add(new Label("parentLink", "none"));
|
1a3fc5
|
92 |
add(new Label("commitdiffLink", getString("gb.commitdiff")));
|
5fe7df
|
93 |
} else {
|
008322
|
94 |
add(new LinkPanel("parentLink", null, getShortObjectId(parents.get(0)),
|
JM |
95 |
CommitPage.class, newCommitParameter(parents.get(0))));
|
2a7306
|
96 |
add(new LinkPanel("commitdiffLink", null, new StringResourceModel("gb.commitdiff",
|
JM |
97 |
this, null), CommitDiffPage.class, WicketUtils.newObjectParameter(
|
|
98 |
repositoryName, objectId)));
|
5fe7df
|
99 |
}
|
2a7306
|
100 |
add(new BookmarkablePageLink<Void>("patchLink", PatchPage.class,
|
JM |
101 |
WicketUtils.newObjectParameter(repositoryName, objectId)));
|
155bf7
|
102 |
|
c1c3c6
|
103 |
add(new CommitHeaderPanel("commitHeader", repositoryName, c));
|
155bf7
|
104 |
|
5fe7df
|
105 |
addRefs(r, c);
|
JM |
106 |
|
98ce17
|
107 |
// author
|
33d8d8
|
108 |
add(createPersonPanel("commitAuthor", c.getAuthorIdent(), Constants.SearchType.AUTHOR));
|
2a7306
|
109 |
add(WicketUtils.createTimestampLabel("commitAuthorDate", c.getAuthorIdent().getWhen(),
|
9adf62
|
110 |
getTimeZone(), getTimeUtils()));
|
699e71
|
111 |
|
98ce17
|
112 |
// committer
|
33d8d8
|
113 |
add(createPersonPanel("commitCommitter", c.getCommitterIdent(), Constants.SearchType.COMMITTER));
|
2a7306
|
114 |
add(WicketUtils.createTimestampLabel("commitCommitterDate",
|
9adf62
|
115 |
c.getCommitterIdent().getWhen(), getTimeZone(), getTimeUtils()));
|
5fe7df
|
116 |
|
JM |
117 |
add(new Label("commitId", c.getName()));
|
|
118 |
|
2a7306
|
119 |
add(new LinkPanel("commitTree", "list", c.getTree().getName(), TreePage.class,
|
JM |
120 |
newCommitParameter()));
|
9197d3
|
121 |
add(new BookmarkablePageLink<Void>("treeLink", TreePage.class, newCommitParameter()));
|
2179fb
|
122 |
final String baseUrl = WicketUtils.getGitblitURL(getRequest());
|
699e71
|
123 |
|
59b817
|
124 |
add(new CompressedDownloadsPanel("compressedLinks", baseUrl, repositoryName, objectId, null));
|
5fe7df
|
125 |
|
JM |
126 |
// Parent Commits
|
|
127 |
ListDataProvider<String> parentsDp = new ListDataProvider<String>(parents);
|
|
128 |
DataView<String> parentsView = new DataView<String>("commitParents", parentsDp) {
|
|
129 |
private static final long serialVersionUID = 1L;
|
|
130 |
|
699e71
|
131 |
@Override
|
5fe7df
|
132 |
public void populateItem(final Item<String> item) {
|
JM |
133 |
String entry = item.getModelObject();
|
2a7306
|
134 |
item.add(new LinkPanel("commitParent", "list", entry, CommitPage.class,
|
JM |
135 |
newCommitParameter(entry)));
|
|
136 |
item.add(new BookmarkablePageLink<Void>("view", CommitPage.class,
|
|
137 |
newCommitParameter(entry)));
|
|
138 |
item.add(new BookmarkablePageLink<Void>("diff", CommitDiffPage.class,
|
|
139 |
newCommitParameter(entry)));
|
5fe7df
|
140 |
}
|
JM |
141 |
};
|
|
142 |
add(parentsView);
|
|
143 |
|
cd9461
|
144 |
addFullText("fullMessage", c.getFullMessage());
|
5fe7df
|
145 |
|
a125cf
|
146 |
// git notes
|
JM |
147 |
List<GitNote> notes = JGitUtils.getNotesOnCommit(r, c);
|
|
148 |
ListDataProvider<GitNote> notesDp = new ListDataProvider<GitNote>(notes);
|
|
149 |
DataView<GitNote> notesView = new DataView<GitNote>("notes", notesDp) {
|
|
150 |
private static final long serialVersionUID = 1L;
|
|
151 |
|
699e71
|
152 |
@Override
|
a125cf
|
153 |
public void populateItem(final Item<GitNote> item) {
|
JM |
154 |
GitNote entry = item.getModelObject();
|
4ab184
|
155 |
item.add(new RefsPanel("refName", repositoryName, Arrays.asList(entry.notesRef)));
|
716745
|
156 |
item.add(createPersonPanel("authorName", entry.notesRef.getAuthorIdent(),
|
33d8d8
|
157 |
Constants.SearchType.AUTHOR));
|
b57b9e
|
158 |
item.add(new AvatarImage("noteAuthorAvatar", entry.notesRef.getAuthorIdent()));
|
716745
|
159 |
item.add(WicketUtils.createTimestampLabel("authorDate", entry.notesRef
|
9adf62
|
160 |
.getAuthorIdent().getWhen(), getTimeZone(), getTimeUtils()));
|
fef234
|
161 |
item.add(new Label("noteContent", bugtraqProcessor().processPlainCommitMessage(getRepository(), repositoryName,
|
cd9461
|
162 |
entry.content)).setEscapeModelStrings(false));
|
a125cf
|
163 |
}
|
JM |
164 |
};
|
|
165 |
add(notesView.setVisible(notes.size() > 0));
|
716745
|
166 |
|
5fe7df
|
167 |
// changed paths list
|
2a7306
|
168 |
List<PathChangeModel> paths = JGitUtils.getFilesInCommit(r, c);
|
699e71
|
169 |
|
319342
|
170 |
// add commit diffstat
|
JM |
171 |
int insertions = 0;
|
|
172 |
int deletions = 0;
|
|
173 |
for (PathChangeModel pcm : paths) {
|
|
174 |
insertions += pcm.insertions;
|
|
175 |
deletions += pcm.deletions;
|
|
176 |
}
|
|
177 |
add(new DiffStatPanel("diffStat", insertions, deletions));
|
699e71
|
178 |
|
a645ba
|
179 |
add(new CommitLegendPanel("commitLegend", paths));
|
9bc17d
|
180 |
ListDataProvider<PathChangeModel> pathsDp = new ListDataProvider<PathChangeModel>(paths);
|
JM |
181 |
DataView<PathChangeModel> pathsView = new DataView<PathChangeModel>("changedPath", pathsDp) {
|
5fe7df
|
182 |
private static final long serialVersionUID = 1L;
|
2a7306
|
183 |
int counter;
|
5fe7df
|
184 |
|
699e71
|
185 |
@Override
|
9bc17d
|
186 |
public void populateItem(final Item<PathChangeModel> item) {
|
JM |
187 |
final PathChangeModel entry = item.getModelObject();
|
46f33f
|
188 |
final String filestoreItemUrl = entry.isFilestoreItem() ? JGitUtils.getLfsRepositoryUrl(getContextUrl(), repositoryName, entry.getFilestoreOid()) : null;
|
PM |
189 |
|
9bc17d
|
190 |
Label changeType = new Label("changeType", "");
|
JM |
191 |
WicketUtils.setChangeTypeCssClass(changeType, entry.changeType);
|
|
192 |
setChangeTypeTooltip(changeType, entry.changeType);
|
|
193 |
item.add(changeType);
|
319342
|
194 |
item.add(new DiffStatPanel("diffStat", entry.insertions, entry.deletions, true));
|
JM |
195 |
|
eb870f
|
196 |
boolean hasSubmodule = false;
|
JM |
197 |
String submodulePath = null;
|
5fe7df
|
198 |
if (entry.isTree()) {
|
eb870f
|
199 |
// tree
|
2a7306
|
200 |
item.add(new LinkPanel("pathName", null, entry.path, TreePage.class,
|
a2709d
|
201 |
WicketUtils
|
JM |
202 |
.newPathParameter(repositoryName, entry.commitId, entry.path)));
|
eb870f
|
203 |
} else if (entry.isSubmodule()) {
|
JM |
204 |
// submodule
|
|
205 |
String submoduleId = entry.objectId;
|
|
206 |
SubmoduleModel submodule = getSubmodule(entry.path);
|
|
207 |
submodulePath = submodule.gitblitPath;
|
|
208 |
hasSubmodule = submodule.hasSubmodule;
|
699e71
|
209 |
|
eb870f
|
210 |
item.add(new LinkPanel("pathName", "list", entry.path + " @ " +
|
JM |
211 |
getShortObjectId(submoduleId), TreePage.class,
|
|
212 |
WicketUtils.newPathParameter(submodulePath, submoduleId, "")).setEnabled(hasSubmodule));
|
5fe7df
|
213 |
} else {
|
eb870f
|
214 |
// blob
|
e5662e
|
215 |
String displayPath = entry.path;
|
JM |
216 |
String path = entry.path;
|
|
217 |
if (entry.isSymlink()) {
|
|
218 |
path = JGitUtils.getStringContent(getRepository(), getCommit().getTree(), path);
|
|
219 |
displayPath = entry.path + " -> " + path;
|
|
220 |
}
|
46f33f
|
221 |
|
PM |
222 |
if (entry.isFilestoreItem()) {
|
77c38a
|
223 |
item.add(new LinkPanel("pathName", "list", entry.path, new Link<Object>("link", null) {
|
PM |
224 |
|
|
225 |
private static final long serialVersionUID = 1L;
|
|
226 |
|
|
227 |
@Override
|
|
228 |
public void onClick() {
|
|
229 |
|
|
230 |
IResourceStream resourceStream = new AbstractResourceStreamWriter() {
|
|
231 |
|
|
232 |
private static final long serialVersionUID = 1L;
|
|
233 |
|
|
234 |
@Override
|
|
235 |
public void write(OutputStream output) {
|
|
236 |
UserModel user = GitBlitWebSession.get().getUser();
|
|
237 |
user = user == null ? UserModel.ANONYMOUS : user;
|
|
238 |
|
|
239 |
app().filestore().downloadBlob(entry.getFilestoreOid(), user, getRepositoryModel(), output);
|
|
240 |
}
|
|
241 |
};
|
|
242 |
|
|
243 |
|
|
244 |
getRequestCycle().setRequestTarget(new ResourceStreamRequestTarget(resourceStream, entry.path));
|
|
245 |
}}));
|
|
246 |
|
|
247 |
|
46f33f
|
248 |
} else {
|
PM |
249 |
item.add(new LinkPanel("pathName", "list", displayPath, BlobPage.class,
|
|
250 |
WicketUtils.newPathParameter(repositoryName, entry.commitId, path)));
|
|
251 |
}
|
5fe7df
|
252 |
}
|
699e71
|
253 |
|
c6f3d0
|
254 |
|
eb870f
|
255 |
// quick links
|
JM |
256 |
if (entry.isSubmodule()) {
|
4cec4b
|
257 |
item.add(new ExternalLink("raw", "").setEnabled(false));
|
c6f3d0
|
258 |
|
46f33f
|
259 |
item.add(new Label("filestore", getString("gb.filestore")).setVisible(false));
|
PM |
260 |
|
699e71
|
261 |
// submodule
|
eb870f
|
262 |
item.add(new BookmarkablePageLink<Void>("diff", BlobDiffPage.class, WicketUtils
|
9cc56a
|
263 |
.newPathParameter(repositoryName, entry.commitId, entry.path))
|
JM |
264 |
.setEnabled(!entry.changeType.equals(ChangeType.ADD)));
|
eb870f
|
265 |
item.add(new BookmarkablePageLink<Void>("view", CommitPage.class, WicketUtils
|
JM |
266 |
.newObjectParameter(submodulePath, entry.objectId)).setEnabled(hasSubmodule));
|
9cc56a
|
267 |
item.add(new ExternalLink("blame", "").setEnabled(false));
|
eb870f
|
268 |
item.add(new BookmarkablePageLink<Void>("history", HistoryPage.class, WicketUtils
|
9cc56a
|
269 |
.newPathParameter(repositoryName, entry.commitId, entry.path))
|
JM |
270 |
.setEnabled(!entry.changeType.equals(ChangeType.ADD)));
|
eb870f
|
271 |
} else {
|
JM |
272 |
// tree or blob
|
|
273 |
item.add(new BookmarkablePageLink<Void>("diff", BlobDiffPage.class, WicketUtils
|
|
274 |
.newPathParameter(repositoryName, entry.commitId, entry.path))
|
|
275 |
.setEnabled(!entry.changeType.equals(ChangeType.ADD)
|
|
276 |
&& !entry.changeType.equals(ChangeType.DELETE)));
|
46f33f
|
277 |
|
PM |
278 |
if (entry.isFilestoreItem()) {
|
|
279 |
item.add(new Label("filestore", getString("gb.filestore")).setVisible(true));
|
|
280 |
|
77c38a
|
281 |
|
PM |
282 |
|
|
283 |
item.add(new Link<Object>("view", null) {
|
|
284 |
|
|
285 |
private static final long serialVersionUID = 1L;
|
|
286 |
|
|
287 |
@Override
|
|
288 |
public void onClick() {
|
|
289 |
|
|
290 |
IResourceStream resourceStream = new AbstractResourceStreamWriter() {
|
|
291 |
|
|
292 |
private static final long serialVersionUID = 1L;
|
|
293 |
|
|
294 |
@Override
|
|
295 |
public void write(OutputStream output) {
|
|
296 |
UserModel user = GitBlitWebSession.get().getUser();
|
|
297 |
user = user == null ? UserModel.ANONYMOUS : user;
|
|
298 |
|
|
299 |
app().filestore().downloadBlob(entry.getFilestoreOid(), user, getRepositoryModel(), output);
|
|
300 |
}
|
|
301 |
};
|
|
302 |
|
|
303 |
|
|
304 |
getRequestCycle().setRequestTarget(new ResourceStreamRequestTarget(resourceStream, entry.path));
|
|
305 |
}});
|
|
306 |
|
|
307 |
item.add(new Link<Object>("raw", null) {
|
|
308 |
|
|
309 |
private static final long serialVersionUID = 1L;
|
|
310 |
|
|
311 |
@Override
|
|
312 |
public void onClick() {
|
|
313 |
|
|
314 |
IResourceStream resourceStream = new AbstractResourceStreamWriter() {
|
|
315 |
|
|
316 |
private static final long serialVersionUID = 1L;
|
|
317 |
|
|
318 |
@Override
|
|
319 |
public void write(OutputStream output) {
|
|
320 |
UserModel user = GitBlitWebSession.get().getUser();
|
|
321 |
user = user == null ? UserModel.ANONYMOUS : user;
|
|
322 |
|
|
323 |
app().filestore().downloadBlob(entry.getFilestoreOid(), user, getRepositoryModel(), output);
|
|
324 |
}
|
|
325 |
};
|
|
326 |
|
|
327 |
|
|
328 |
getRequestCycle().setRequestTarget(new ResourceStreamRequestTarget(resourceStream, entry.path));
|
|
329 |
}});
|
|
330 |
|
46f33f
|
331 |
} else {
|
PM |
332 |
item.add(new Label("filestore", getString("gb.filestore")).setVisible(false));
|
|
333 |
|
|
334 |
item.add(new BookmarkablePageLink<Void>("view", BlobPage.class, WicketUtils
|
|
335 |
.newPathParameter(repositoryName, entry.commitId, entry.path))
|
|
336 |
.setEnabled(!entry.changeType.equals(ChangeType.DELETE)));
|
|
337 |
String rawUrl = RawServlet.asLink(getContextUrl(), repositoryName, entry.commitId, entry.path);
|
|
338 |
item.add(new ExternalLink("raw", rawUrl)
|
|
339 |
.setEnabled(!entry.changeType.equals(ChangeType.DELETE)));
|
|
340 |
}
|
eb870f
|
341 |
item.add(new BookmarkablePageLink<Void>("blame", BlamePage.class, WicketUtils
|
JM |
342 |
.newPathParameter(repositoryName, entry.commitId, entry.path))
|
59f09b
|
343 |
.setEnabled(!entry.changeType.equals(ChangeType.ADD)
|
JM |
344 |
&& !entry.changeType.equals(ChangeType.DELETE)));
|
eb870f
|
345 |
item.add(new BookmarkablePageLink<Void>("history", HistoryPage.class, WicketUtils
|
JM |
346 |
.newPathParameter(repositoryName, entry.commitId, entry.path))
|
|
347 |
.setEnabled(!entry.changeType.equals(ChangeType.ADD)));
|
|
348 |
}
|
698678
|
349 |
|
JM |
350 |
WicketUtils.setAlternatingBackground(item, counter);
|
5fe7df
|
351 |
counter++;
|
JM |
352 |
}
|
|
353 |
};
|
|
354 |
add(pathsView);
|
|
355 |
}
|
a645ba
|
356 |
|
cebf45
|
357 |
@Override
|
JM |
358 |
protected String getPageName() {
|
1e47ab
|
359 |
return getString("gb.commit");
|
cebf45
|
360 |
}
|
699e71
|
361 |
|
6ef8d7
|
362 |
@Override
|
5d5e55
|
363 |
protected boolean isCommitPage() {
|
JM |
364 |
return true;
|
|
365 |
}
|
|
366 |
|
|
367 |
@Override
|
6ef8d7
|
368 |
protected Class<? extends BasePage> getRepoNavPageClass() {
|
JM |
369 |
return LogPage.class;
|
|
370 |
}
|
5fe7df
|
371 |
}
|