diff options
| author | James Moger <james.moger@gitblit.com> | 2013-09-27 20:25:06 -0400 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2013-09-27 21:33:34 -0400 |
| commit | 319342c09152c61af13930e79777e1396f9c397f (patch) | |
| tree | 5918ec46da2814872c05d8b665ad6538af600caf /src/main/java/com/gitblit/wicket/pages/BlobDiffPage.java | |
| parent | b384a9923314ef0ab7ec0e9f506c8d52cc31f5fc (diff) | |
| download | gitblit-319342c09152c61af13930e79777e1396f9c397f.tar.gz gitblit-319342c09152c61af13930e79777e1396f9c397f.zip | |
Add normalized diffstats to the commit, commitdiff, and compare pages
Change-Id: I8f26746a611e9ab955efe8b2597cc81db48fb085
Diffstat (limited to 'src/main/java/com/gitblit/wicket/pages/BlobDiffPage.java')
| -rw-r--r-- | src/main/java/com/gitblit/wicket/pages/BlobDiffPage.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/com/gitblit/wicket/pages/BlobDiffPage.java b/src/main/java/com/gitblit/wicket/pages/BlobDiffPage.java index 8dc9d840..f8f88188 100644 --- a/src/main/java/com/gitblit/wicket/pages/BlobDiffPage.java +++ b/src/main/java/com/gitblit/wicket/pages/BlobDiffPage.java @@ -46,13 +46,13 @@ public class BlobDiffPage extends RepositoryPage { String diff;
if (StringUtils.isEmpty(baseObjectId)) {
// use first parent
- diff = DiffUtils.getDiff(r, commit, blobPath, DiffOutputType.HTML);
+ diff = DiffUtils.getDiff(r, commit, blobPath, DiffOutputType.HTML).content;
add(new BookmarkablePageLink<Void>("patchLink", PatchPage.class,
WicketUtils.newPathParameter(repositoryName, objectId, blobPath)));
} else {
// base commit specified
RevCommit baseCommit = JGitUtils.getCommit(r, baseObjectId);
- diff = DiffUtils.getDiff(r, baseCommit, commit, blobPath, DiffOutputType.HTML);
+ diff = DiffUtils.getDiff(r, baseCommit, commit, blobPath, DiffOutputType.HTML).content;
add(new BookmarkablePageLink<Void>("patchLink", PatchPage.class,
WicketUtils.newBlobDiffParameter(repositoryName, baseObjectId, objectId,
blobPath)));
|