ynkmr/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-08-10 05:24:18 +09:00
Code Issues Projects Releases Wiki Activity

fix(gitdiff): render exact-limit diffs and zero-limit comments (#38838)

Browse Source 
This commit fixes the treatment of various edge cases related to diff
limits.

- Exact-limit diffs: a file containing exactly the configured maximum
was incorrectly treated as too large and hidden behind “Load diff.” It
now renders normally.

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
This commit is contained in:
Sergio Benitez
2026-08-09 11:13:22 +00:00
committed by GitHub
co-authored by wxiaoguang
parent ad6107ab88
commit 79535f4e01
2 changed files with 56 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/gitdiff/gitdiff_test.go
+38
View File
@@ -19,6 +19,7 @@ import (
"gitea.dev/modules/json"
"gitea.dev/modules/setting"
"gitea.dev/modules/translation"
"gitea.dev/modules/util"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
@@ -548,6 +549,43 @@ index 0000000..6bb8f39
}
}
func TestParsePatchExactLineLimit(t *testing.T) {
for _, test := range []struct {
name, hunk string
limit, lines int
incomplete bool
}{
{name: "zero", limit: 0, hunk: "@@ -1,3 +1,3 @@\n one\n two\n three\n", incomplete: true},
{name: "one", limit: 1, lines: 1, hunk: "@@ -1,3 +1,3 @@\n one\n two\n three\n", incomplete: true},
{name: "N plus one", limit: 2, lines: 2, hunk: "@@ -1,3 +1,3 @@\n one\n two\n three\n", incomplete: true},
{name: "N", limit: 3, lines: 3, hunk: "@@ -1,3 +1,3 @@\n one\n two\n three\n"},
{name: "addition", limit: 1, lines: 1, hunk: "@@ -0,0 +1 @@\n+one\n"},
{name: "deletion", limit: 1, lines: 1, hunk: "@@ -1 +0,0 @@\n-one\n"},
{name: "marker has no cost", limit: 1, lines: 1, hunk: "@@ -1 +1 @@\n line\n\\ No newline at end of file\n"},
{name: "hunk at capacity", limit: 1, lines: 1, hunk: "@@ -1 +1 @@\n one\n@@ -3 +3 @@\n three\n", incomplete: true},
} {
t.Run(test.name, func(t *testing.T) {
patch := "diff --git a/file b/file\n--- a/file\n+++ b/file\n" + test.hunk
diff, err := ParsePatch(t.Context(), test.limit, 5000, 10, strings.NewReader(patch), "")
require.NoError(t, err)
require.Len(t, diff.Files, 1)
diffFile := diff.Files[0]
if test.limit == 0 {
require.Len(t, diffFile.Sections, 0)
} else {
require.Len(t, diffFile.Sections, 1)
diffSection := diffFile.Sections[0]
lineSecCount := 0
for _, line := range diffSection.Lines {
lineSecCount += util.Iif(line.Type == DiffLineSection, 1, 0)
}
assert.Equal(t, test.lines, len(diffSection.Lines)-lineSecCount) // actual diff lines
assert.Equal(t, test.incomplete, diffFile.IsIncomplete)
}
})
}
}
func setupDefaultDiff() *Diff {
return &Diff{
Files: []*DiffFile{