patchutil,types: implement DiffRenderer interface for all diffs

types.NiceDiff and patchutil.Interdiff now implement the new interface.
this allows us to remove the differing rendering logic necessary to
present each kind of diff.

appview/pulls/opengraph.go

···
 	"tangled.org/core/types"
 )
 
-func (s *Pulls) drawPullSummaryCard(pull *models.Pull, repo *models.Repo, commentCount int, diffStats types.DiffStat, filesChanged int) (*ogcard.Card, error) {
+func (s *Pulls) drawPullSummaryCard(pull *models.Pull, repo *models.Repo, commentCount int, diffStats types.DiffFileStat, filesChanged int) (*ogcard.Card, error) {
 	width, height := ogcard.DefaultSize()
 	mainCard, err := ogcard.NewCard(width, height)
 	if err != nil {
···
 	commentCount := len(comments)
 
 	// Calculate diff stats from latest submission using patchutil
-	var diffStats types.DiffStat
+	var diffStats types.DiffFileStat
 	filesChanged := 0
 	if len(pull.Submissions) > 0 {
 		latestSubmission := pull.Submissions[len(pull.Submissions)-1]

knotserver/git/diff.go

···
 
 		for _, tf := range d.TextFragments {
 			ndiff.TextFragments = append(ndiff.TextFragments, *tf)
-			for _, l := range tf.Lines {
-				switch l.Op {
-				case gitdiff.OpAdd:
-					nd.Stat.Insertions += 1
-				case gitdiff.OpDelete:
-					nd.Stat.Deletions += 1
-				}
-			}
+			nd.Stat.Insertions += tf.LinesAdded
+			nd.Stat.Deletions += tf.LinesDeleted
 		}
 
 		nd.Diff = append(nd.Diff, ndiff)
 	}
 
+	nd.Stat.FilesChanged += len(diffs)
 	nd.Commit.FromGoGitCommit(c)
 
 	return &nd, nil

patchutil/interdiff.go

···
 	"strings"
 
 	"github.com/bluekeyes/go-gitdiff/gitdiff"
+	"tangled.org/core/appview/filetree"
 	"tangled.org/core/types"
 )
 
···
 	Files []*InterdiffFile
 }
 
-func (i *InterdiffResult) AffectedFiles() []string {
-	files := make([]string, len(i.Files))
-	for _, f := range i.Files {
-		files = append(files, f.Name)
+func (i *InterdiffResult) Stats() types.DiffStat {
+	var ins, del int64
+	for _, s := range i.ChangedFiles() {
+		stat := s.Stats()
+		ins += stat.Insertions
+		del += stat.Deletions
 	}
-	return files
+	return types.DiffStat{
+		Insertions:   ins,
+		Deletions:    del,
+		FilesChanged: len(i.Files),
+	}
+}
+
+func (i *InterdiffResult) ChangedFiles() []types.DiffFileRenderer {
+	drs := make([]types.DiffFileRenderer, len(i.Files))
+	for i, s := range i.Files {
+		drs[i] = s
+	}
+	return drs
+}
+
+func (i *InterdiffResult) FileTree() *filetree.FileTreeNode {
+	fs := make([]string, len(i.Files))
+	for i, s := range i.Files {
+		fs[i] = s.Name
+	}
+	return filetree.FileTree(fs)
 }
 
 func (i *InterdiffResult) String() string {
···
 	Status InterdiffFileStatus
 }
 
-func (s *InterdiffFile) Split() *types.SplitDiff {
+func (s *InterdiffFile) Id() string {
+	return s.Name
+}
+
+func (s *InterdiffFile) Split() types.SplitDiff {
 	fragments := make([]types.SplitFragment, len(s.TextFragments))
 
 	for i, fragment := range s.TextFragments {
···
 		}
 	}
 
-	return &types.SplitDiff{
+	return types.SplitDiff{
 		Name:          s.Id(),
 		TextFragments: fragments,
 	}
 }
 
-// used by html elements as a unique ID for hrefs
-func (s *InterdiffFile) Id() string {
-	return s.Name
+func (s *InterdiffFile) CanRender() string {
+	if s.Status.IsUnchanged() {
+		return "This file has not been changed."
+	} else if s.Status.IsRebased() {
+		return "This patch was likely rebased, as context lines do not match."
+	} else if s.Status.IsError() {
+		return "Failed to calculate interdiff for this file."
+	} else {
+		return ""
+	}
+}
+
+func (s *InterdiffFile) Names() types.DiffFileName {
+	var n types.DiffFileName
+	n.New = s.Name
+	return n
+}
+
+func (s *InterdiffFile) Stats() types.DiffFileStat {
+	var ins, del int64
+
+	if s.File != nil {
+		for _, f := range s.TextFragments {
+			ins += f.LinesAdded
+			del += f.LinesDeleted
+		}
+	}
+
+	return types.DiffFileStat{
+		Insertions: ins,
+		Deletions:  del,
+	}
 }
 
 func (s *InterdiffFile) String() string {

patchutil/patchutil_test.go

···
 	"errors"
 	"reflect"
 	"testing"
+
+	"tangled.org/core/types"
 )
 
 func TestIsPatchValid(t *testing.T) {
···
 		})
 	}
 }
+
+func TestImplsInterfaces(t *testing.T) {
+	id := &InterdiffResult{}
+	_ = isDiffsRenderer(id)
+}
+
+func isDiffsRenderer[S types.DiffRenderer](S) bool { return true }

types/diff.go

···
 package types
 
 import (
+	"net/url"
+
 	"github.com/bluekeyes/go-gitdiff/gitdiff"
+	"tangled.org/core/appview/filetree"
 )
 
 type DiffOpts struct {
 	Split bool `json:"split"`
 }
 
-type TextFragment struct {
-	Header string         `json:"comment"`
-	Lines  []gitdiff.Line `json:"lines"`
+func (d DiffOpts) Encode() string {
+	values := make(url.Values)
+	if d.Split {
+		values.Set("diff", "split")
+	} else {
+		values.Set("diff", "unified")
+	}
+	return values.Encode()
+}
+
+// A nicer git diff representation.
+type NiceDiff struct {
+	Commit Commit   `json:"commit"`
+	Stat   DiffStat `json:"stat"`
+	Diff   []Diff   `json:"diff"`
 }
 
 type Diff struct {
···
 	IsRename      bool                   `json:"is_rename"`
 }
 
-type DiffStat struct {
-	Insertions int64
-	Deletions  int64
-}
-
-func (d *Diff) Stats() DiffStat {
-	var stats DiffStat
+func (d Diff) Stats() DiffFileStat {
+	var stats DiffFileStat
 	for _, f := range d.TextFragments {
 		stats.Insertions += f.LinesAdded
 		stats.Deletions += f.LinesDeleted
···
 	return stats
 }
 
-// A nicer git diff representation.
-type NiceDiff struct {
-	Commit Commit `json:"commit"`
-	Stat   struct {
-		FilesChanged int `json:"files_changed"`
-		Insertions   int `json:"insertions"`
-		Deletions    int `json:"deletions"`
-	} `json:"stat"`
-	Diff []Diff `json:"diff"`
+type DiffStat struct {
+	Insertions   int64 `json:"insertions"`
+	Deletions    int64 `json:"deletions"`
+	FilesChanged int   `json:"files_changed"`
+}
+
+type DiffFileStat struct {
+	Insertions int64
+	Deletions  int64
 }
 
 type DiffTree struct {
···
 	Diff  []*gitdiff.File `json:"diff"`
 }
 
-func (d *NiceDiff) ChangedFiles() []string {
-	files := make([]string, len(d.Diff))
-
-	for i, f := range d.Diff {
-		if f.IsDelete {
-			files[i] = f.Name.Old
-		} else {
-			files[i] = f.Name.New
-		}
-	}
-
-	return files
+type DiffFileName struct {
+	Old string
+	New string
 }
 
-// used by html elements as a unique ID for hrefs
-func (d *Diff) Id() string {
+func (d NiceDiff) ChangedFiles() []DiffFileRenderer {
+	drs := make([]DiffFileRenderer, len(d.Diff))
+	for i, s := range d.Diff {
+		drs[i] = s
+	}
+	return drs
+}
+
+func (d NiceDiff) FileTree() *filetree.FileTreeNode {
+	fs := make([]string, len(d.Diff))
+	for i, s := range d.Diff {
+		n := s.Names()
+		if n.New == "" {
+			fs[i] = n.Old
+		} else {
+			fs[i] = n.New
+		}
+	}
+	return filetree.FileTree(fs)
+}
+
+func (d NiceDiff) Stats() DiffStat {
+	return d.Stat
+}
+
+func (d Diff) Id() string {
 	if d.IsDelete {
 		return d.Name.Old
 	}
 	return d.Name.New
 }
 
-func (d *Diff) Split() *SplitDiff {
+func (d Diff) Names() DiffFileName {
+	var n DiffFileName
+	if d.IsDelete {
+		n.Old = d.Name.Old
+		return n
+	} else if d.IsCopy || d.IsRename {
+		n.Old = d.Name.Old
+		n.New = d.Name.New
+		return n
+	} else {
+		n.New = d.Name.New
+		return n
+	}
+}
+
+func (d Diff) CanRender() string {
+	if d.IsBinary {
+		return "This is a binary file and will not be displayed."
+	}
+
+	return ""
+}
+
+func (d Diff) Split() SplitDiff {
 	fragments := make([]SplitFragment, len(d.TextFragments))
 	for i, fragment := range d.TextFragments {
 		leftLines, rightLines := SeparateLines(&fragment)
···
 		}
 	}
 
-	return &SplitDiff{
+	return SplitDiff{
 		Name:          d.Id(),
 		TextFragments: fragments,
 	}

types/diff_test.go

···
 package types
 
-import "testing"
+import (
+	"testing"
+)
 
 func TestDiffId(t *testing.T) {
 	tests := []struct {
···
 	}
 
 	for i, diff := range nd.Diff {
-		if changedFiles[i] != diff.Id() {
+		if changedFiles[i].Id() != diff.Id() {
 			t.Errorf("ChangedFiles()[%d] = %q, but Diff.Id() = %q", i, changedFiles[i], diff.Id())
 		}
 	}
 }
+
+func TestImplsInterfaces(t *testing.T) {
+	nd := NiceDiff{}
+	_ = isDiffsRenderer(nd)
+}
+
+func isDiffsRenderer[S DiffRenderer](S) bool { return true }

types/split.go

···
 	TextFragments []SplitFragment `json:"fragments"`
 }
 
-// used by html elements as a unique ID for hrefs
-func (d *SplitDiff) Id() string {
+func (d SplitDiff) Id() string {
 	return d.Name
 }