files
diff --git a/appview/pages/templates/repo/pulls/patch.html b/appview/pages/templates/repo/pulls/patch.html
index 886fab61..ce28da42 100644
--- a/appview/pages/templates/repo/pulls/patch.html
+++ b/appview/pages/templates/repo/pulls/patch.html
@@ -74,7 +74,7 @@
{{ end }}
{{ define "contentAfter" }}
- {{ template "repo/fragments/diff" (list .RepoInfo.FullName .Diff) }}
+ {{ template "repo/fragments/diff" (list .RepoInfo.FullName .Diff .DiffOpts) }}
{{end}}
{{ define "contentAfterLeft" }}
diff --git a/appview/pages/templates/repo/pulls/pull.html b/appview/pages/templates/repo/pulls/pull.html
index 51906ce3..bf6a09bb 100644
--- a/appview/pages/templates/repo/pulls/pull.html
+++ b/appview/pages/templates/repo/pulls/pull.html
@@ -179,7 +179,6 @@
{{ end }}
-
{{ end }}
{{ end }}
{{ end }}
diff --git a/appview/pulls/pulls.go b/appview/pulls/pulls.go
index 5b30412c..11f926da 100644
--- a/appview/pulls/pulls.go
+++ b/appview/pulls/pulls.go
@@ -355,6 +355,11 @@ func (s *Pulls) RepoPullPatch(w http.ResponseWriter, r *http.Request) {
return
}
+ var diffOpts types.DiffOpts
+ if d := r.URL.Query().Get("diff"); d == "split" {
+ diffOpts.Split = true
+ }
+
pull, ok := r.Context().Value("pull").(*db.Pull)
if !ok {
log.Println("failed to get pull")
@@ -395,6 +400,7 @@ func (s *Pulls) RepoPullPatch(w http.ResponseWriter, r *http.Request) {
Round: roundIdInt,
Submission: pull.Submissions[roundIdInt],
Diff: &diff,
+ DiffOpts: diffOpts,
})
}
diff --git a/appview/repo/repo.go b/appview/repo/repo.go
index c2587b5a..86067e5c 100644
--- a/appview/repo/repo.go
+++ b/appview/repo/repo.go
@@ -268,6 +268,11 @@ func (rp *Repo) RepoCommit(w http.ResponseWriter, r *http.Request) {
protocol = "https"
}
+ var diffOpts types.DiffOpts
+ if d := r.URL.Query().Get("diff"); d == "split" {
+ diffOpts.Split = true
+ }
+
if !plumbing.IsHash(ref) {
rp.pages.Error404(w)
return
@@ -321,8 +326,8 @@ func (rp *Repo) RepoCommit(w http.ResponseWriter, r *http.Request) {
EmailToDidOrHandle: emailToDidOrHandle(rp, emailToDidMap),
VerifiedCommit: vc,
Pipeline: pipeline,
+ DiffOpts: diffOpts,
})
- return
}
func (rp *Repo) RepoTree(w http.ResponseWriter, r *http.Request) {
@@ -1269,6 +1274,11 @@ func (rp *Repo) RepoCompare(w http.ResponseWriter, r *http.Request) {
return
}
+ var diffOpts types.DiffOpts
+ if d := r.URL.Query().Get("diff"); d == "split" {
+ diffOpts.Split = true
+ }
+
// if user is navigating to one of
// /compare/{base}/{head}
// /compare/{base}...{head}
@@ -1331,6 +1341,7 @@ func (rp *Repo) RepoCompare(w http.ResponseWriter, r *http.Request) {
Base: base,
Head: head,
Diff: &diff,
+ DiffOpts: diffOpts,
})
}
diff --git a/types/diff.go b/types/diff.go
index 5978dc6d..12ecd9e7 100644
--- a/types/diff.go
+++ b/types/diff.go
@@ -5,6 +5,10 @@ import (
"github.com/go-git/go-git/v5/plumbing/object"
)
+type DiffOpts struct {
+ Split bool `json:"split"`
+}
+
type TextFragment struct {
Header string `json:"comment"`
Lines []gitdiff.Line `json:"lines"`
@@ -77,3 +81,25 @@ func (d *NiceDiff) ChangedFiles() []string {
return files
}
+
+// used by html elements as a unique ID for hrefs
+func (d *Diff) Id() string {
+ return d.Name.New
+}
+
+func (d *Diff) Split() *SplitDiff {
+ fragments := make([]SplitFragment, len(d.TextFragments))
+ for i, fragment := range d.TextFragments {
+ leftLines, rightLines := SeparateLines(&fragment)
+ fragments[i] = SplitFragment{
+ Header: fragment.Header(),
+ LeftLines: leftLines,
+ RightLines: rightLines,
+ }
+ }
+
+ return &SplitDiff{
+ Name: d.Id(),
+ TextFragments: fragments,
+ }
+}