Merge branch 'develop'

James Moger

2015-11-22 ed552ba47c02779c270ffd62841d6d1048dade70

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
/* 
 * Copyright 2011 gitblit.com. 
 * 
 * Licensed under the Apache License, Version 2.0 (the "License"); 
 * you may not use this file except in compliance with the License. 
 * You may obtain a copy of the License at 
 * 
 *     http://www.apache.org/licenses/LICENSE-2.0 
 * 
 * Unless required by applicable law or agreed to in writing, software 
 * distributed under the License is distributed on an "AS IS" BASIS, 
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
 * See the License for the specific language governing permissions and 
 * limitations under the License. 
 */ 
package com.gitblit.wicket.pages; 
 
import java.util.List; 
 
import org.apache.wicket.PageParameters; 
import org.apache.wicket.markup.html.basic.Label; 
import org.apache.wicket.markup.html.link.BookmarkablePageLink; 
import org.eclipse.jgit.lib.Repository; 
import org.eclipse.jgit.revwalk.RevCommit; 
 
import com.gitblit.Keys; 
import com.gitblit.utils.DiffUtils; 
import com.gitblit.utils.DiffUtils.DiffComparator; 
import com.gitblit.utils.DiffUtils.DiffOutputType; 
import com.gitblit.utils.JGitUtils; 
import com.gitblit.utils.StringUtils; 
import com.gitblit.wicket.CacheControl; 
import com.gitblit.wicket.CacheControl.LastModified; 
import com.gitblit.wicket.WicketUtils; 
import com.gitblit.wicket.panels.CommitHeaderPanel; 
import com.gitblit.wicket.panels.LinkPanel; 
import com.gitblit.wicket.panels.PathBreadcrumbsPanel; 
 
@CacheControl(LastModified.BOOT) 
public class BlobDiffPage extends RepositoryPage { 
 
    public BlobDiffPage(PageParameters params) { 
        super(params); 
 
        final String blobPath = WicketUtils.getPath(params); 
        final String baseObjectId = WicketUtils.getBaseObjectId(params); 
        final DiffComparator diffComparator = WicketUtils.getDiffComparator(params); 
 
        Repository r = getRepository(); 
        RevCommit commit = getCommit(); 
 
        final List<String> imageExtensions = app().settings().getStrings(Keys.web.imageExtensions); 
 
        String diff; 
        if (StringUtils.isEmpty(baseObjectId)) { 
            // use first parent 
            RevCommit parent = commit.getParentCount() == 0 ? null : commit.getParent(0); 
            ImageDiffHandler handler = new ImageDiffHandler(this, repositoryName, 
                    parent.getName(), commit.getName(), imageExtensions); 
            diff = DiffUtils.getDiff(r, commit, blobPath, diffComparator, DiffOutputType.HTML, handler, 3).content; 
            if (handler.getImgDiffCount() > 0) { 
                addBottomScript("scripts/imgdiff.js"); // Tiny support script for image diffs 
            } 
            add(new BookmarkablePageLink<Void>("patchLink", PatchPage.class, 
                    WicketUtils.newPathParameter(repositoryName, objectId, blobPath))); 
        } else { 
            // base commit specified 
            RevCommit baseCommit = JGitUtils.getCommit(r, baseObjectId); 
            ImageDiffHandler handler = new ImageDiffHandler(this, repositoryName, 
                    baseCommit.getName(), commit.getName(), imageExtensions); 
            diff = DiffUtils.getDiff(r, baseCommit, commit, blobPath, diffComparator, DiffOutputType.HTML, handler, 3).content; 
            if (handler.getImgDiffCount() > 0) { 
                addBottomScript("scripts/imgdiff.js"); // Tiny support script for image diffs 
            } 
            add(new BookmarkablePageLink<Void>("patchLink", PatchPage.class, 
                    WicketUtils.newBlobDiffParameter(repositoryName, baseObjectId, objectId, 
                            blobPath))); 
        } 
 
        add(new BookmarkablePageLink<Void>("commitLink", CommitPage.class, 
                WicketUtils.newObjectParameter(repositoryName, objectId))); 
        add(new BookmarkablePageLink<Void>("commitDiffLink", CommitDiffPage.class, 
                WicketUtils.newObjectParameter(repositoryName, objectId))); 
        add(new LinkPanel("whitespaceLink", null, getString(diffComparator.getOpposite().getTranslationKey()), 
                BlobDiffPage.class, WicketUtils.newDiffParameter(repositoryName, objectId, diffComparator.getOpposite(), blobPath))); 
 
        // diff page links 
        add(new BookmarkablePageLink<Void>("blameLink", BlamePage.class, 
                WicketUtils.newPathParameter(repositoryName, objectId, blobPath))); 
        add(new BookmarkablePageLink<Void>("historyLink", HistoryPage.class, 
                WicketUtils.newPathParameter(repositoryName, objectId, blobPath))); 
 
        add(new CommitHeaderPanel("commitHeader", repositoryName, commit)); 
 
        add(new PathBreadcrumbsPanel("breadcrumbs", repositoryName, blobPath, objectId)); 
 
        add(new Label("diffText", diff).setEscapeModelStrings(false)); 
    } 
 
    @Override 
    protected String getPageName() { 
        return getString("gb.diff"); 
    } 
 
    @Override 
    protected boolean isCommitPage() { 
        return true; 
    } 
 
    @Override 
    protected Class<? extends BasePage> getRepoNavPageClass() { 
        return TreePage.class; 
    } 
}