tests/t0106-diff.shrev: 70e308d804 (latest)


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

#!/bin/sh

test_description='Check content on diff page'
. ./setup.sh

test_expect_success 'generate foo/diff' 'cgit_url "foo/diff" >tmp'
test_expect_success 'find diff header' 'grep "a/file-5 b/file-5" tmp'
test_expect_success 'find blob link' 'grep "<a href=./foo/tree/file-5?id=" tmp'
test_expect_success 'find added file' 'grep "new file mode 100644" tmp'

test_expect_success 'find hunk header' '
	grep "<div class=.hunk.>@@ -0,0 +1 @@</div>" tmp
'

test_expect_success 'find added line' '
	grep "<div class=.add.>+5</div>" tmp
'

# --- Side-by-side line numbers for a hunk that covers a single line ---------
# git writes the length only when a hunk spans more than one line, so a header
# reads "@@ -1 +1 @@". Requiring a comma after the number left those hunks
# numbered from zero, which dropped the line-number link entirely.
test_expect_success 'set up a repo with single-line hunks' '
	mkrepo repos/hunk1 1 &&
	(
		cd repos/hunk1 &&
		printf "only\n" >one.txt &&
		git add one.txt &&
		git commit -m "add one.txt" &&
		printf "ONLY\n" >one.txt &&
		git commit -am "change one.txt"
	) &&
	{
		echo "virtual-root=/" &&
		echo "cache-size=0" &&
		echo "repo.url=hunk1" &&
		echo "repo.path=$PWD/repos/hunk1/.git"
	} >hunk1rc &&
	git -C repos/hunk1 diff HEAD~1 HEAD >raw.diff &&
	grep "^@@ -1 +1 @@" raw.diff
'

test_expect_success 'ssdiff numbers a comma-less hunk from its real line' '
	CGIT_CONFIG="$PWD/hunk1rc" QUERY_STRING="url=hunk1/diff/&dt=1" cgit >tmp &&
	grep "#n1.>1</a>" tmp &&
	! grep "#n0.>0</a>" tmp
'

test_expect_success 'ssdiff still numbers a hunk that carries a length' '
	cgit_query "url=foo/diff&dt=1" >tmp &&
	grep "#n1.>1</a>" tmp
'

# --- Intra-line highlighting across many changed pairs ----------------------
# The character-level highlight reuses one table across every changed pair.
# Lines shrink down the file so a short comparison always follows a longer one,
# which is where a stale cell would show up as misplaced del and add spans.
test_expect_success 'set up a repo with shrinking changed lines' '
	mkrepo repos/lcs 1 &&
	(
		cd repos/lcs &&
		awk "BEGIN{for(n=120;n>0;n-=3){s=\"\";
			for(i=0;i<n;i++)s=s sprintf(\"%c\",97+(i*7+n)%26); print s}}" >lines.txt &&
		git add lines.txt &&
		git commit -m "add lines.txt" &&
		awk "BEGIN{for(n=120;n>0;n-=3){s=\"\";
			for(i=0;i<n;i++){c=97+(i*7+n)%26; if(i%7==0)c=97+(c-97+5)%26;
			s=s sprintf(\"%c\",c)} print s}}" >lines.txt &&
		git commit -am "change every line"
	) &&
	{
		echo "virtual-root=/" &&
		echo "cache-size=0" &&
		echo "repo.url=lcs" &&
		echo "repo.path=$PWD/repos/lcs/.git"
	} >lcsrc
'

test_expect_success 'every changed pair gets both a del and an add span' '
	CGIT_CONFIG="$PWD/lcsrc" QUERY_STRING="url=lcs/diff/&dt=1" cgit >tmp &&
	dels=$(grep -o "<span class=.del.>" tmp | wc -l) &&
	adds=$(grep -o "<span class=.add.>" tmp | wc -l) &&
	test "$dels" -gt 0 &&
	test "$dels" -eq "$adds"
'

test_expect_success 'stripping the highlight leaves every line intact' '
	sed -e "s/<[^>]*>//g" tmp >plain.out &&
	git -C repos/lcs show HEAD~1:lines.txt >old.txt &&
	git -C repos/lcs show HEAD:lines.txt >new.txt &&
	while read -r line
	do
		grep -qF "$line" plain.out || {
			echo "missing old line: $line"
			return 1
		}
	done <old.txt &&
	while read -r line
	do
		grep -qF "$line" plain.out || {
			echo "missing new line: $line"
			return 1
		}
	done <new.txt
'

test_done