[thirdparty/git.git] / t / t4009-diff-rename-4.sh

#!/bin/sh
#
# Copyright (c) 2005 Junio C Hamano
#

test_description='Same rename detection as t4003 but testing diff-raw -z.

'
. ./test-lib.sh

_x40='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]'
_x40="$_x40$_x40$_x40$_x40$_x40$_x40$_x40$_x40"
sanitize_diff_raw='/^:/s/ '"$_x40"' '"$_x40"' \([A-Z]\)[0-9]*$/ X X \1#/'
compare_diff_raw () {
    # When heuristics are improved, the score numbers would change.
    # Ignore them while comparing.
    # Also we do not check SHA1 hash generation in this test, which
    # is a job for t0000-basic.sh

    tr '\0' '\012' <"$1" | sed -e "$sanitize_diff_raw" >.tmp-1
    tr '\0' '\012' <"$2" | sed -e "$sanitize_diff_raw" >.tmp-2
    diff -u .tmp-1 .tmp-2 && rm -f .tmp-1 .tmp-2
}

compare_diff_patch () {
    # When heuristics are improved, the score numbers would change.
    # Ignore them while comparing.
    sed -e '/^similarity index [0-9]*%$/d' <"$1" >.tmp-1
    sed -e '/^similarity index [0-9]*%$/d' <"$2" >.tmp-2
    diff -u .tmp-1 .tmp-2 && rm -f .tmp-1 .tmp-2
}

test_expect_success \
    'prepare reference tree' \
    'cat ../../COPYING >COPYING &&
     echo frotz >rezrov &&
    git-update-cache --add COPYING rezrov &&
    tree=$(git-write-tree) &&
    echo $tree'

test_expect_success \
    'prepare work tree' \
    'sed -e 's/HOWEVER/However/' <COPYING >COPYING.1 &&
    sed -e 's/GPL/G.P.L/g' <COPYING >COPYING.2 &&
    rm -f COPYING &&
    git-update-cache --add --remove COPYING COPYING.?'

# tree has COPYING and rezrov.  work tree has COPYING.1 and COPYING.2,
# both are slightly edited, and unchanged rezrov.  We say COPYING.1
# and COPYING.2 are based on COPYING, and do not say anything about
# rezrov.

git-diff-cache -z -M $tree >current

cat >expected <<\EOF
:100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 0603b3238a076dc6c8022aedc6648fa523a17178 C1234
COPYING
COPYING.1
:100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 06c67961bbaed34a127f76d261f4c0bf73eda471 R1234
COPYING
COPYING.2
EOF

test_expect_success \
    'validate output from rename/copy detection (#1)' \
    'compare_diff_raw current expected'

# make sure diff-helper can grok it.
mv current diff-raw
GIT_DIFF_OPTS=--unified=0 git-diff-helper -z <diff-raw >current
cat >expected <<\EOF
diff --git a/COPYING b/COPYING.1
copy from COPYING
copy to COPYING.1
--- a/COPYING
+++ b/COPYING.1
@@ -6 +6 @@
- HOWEVER, in order to allow a migration to GPLv3 if that seems like
+ However, in order to allow a migration to GPLv3 if that seems like
diff --git a/COPYING b/COPYING.2
rename old COPYING
rename new COPYING.2
--- a/COPYING
+++ b/COPYING.2
@@ -2 +2 @@
- Note that the only valid version of the GPL as far as this project
+ Note that the only valid version of the G.P.L as far as this project
@@ -6 +6 @@
- HOWEVER, in order to allow a migration to GPLv3 if that seems like
+ HOWEVER, in order to allow a migration to G.P.Lv3 if that seems like
@@ -12 +12 @@
-	This file is licensed under the GPL v2, or a later version
+	This file is licensed under the G.P.L v2, or a later version
EOF

test_expect_success \
    'validate output from diff-helper (#1)' \
    'compare_diff_patch current expected'

################################################################

test_expect_success \
    'prepare work tree again' \
    'mv COPYING.2 COPYING &&
     git-update-cache --add --remove COPYING COPYING.1 COPYING.2'

# tree has COPYING and rezrov.  work tree has COPYING and COPYING.1,
# both are slightly edited, and unchanged rezrov.  We say COPYING.1
# is based on COPYING and COPYING is still there, and do not say anything
# about rezrov.

git-diff-cache -z -C $tree >current
cat >expected <<\EOF
:100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 06c67961bbaed34a127f76d261f4c0bf73eda471 M
COPYING
:100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 0603b3238a076dc6c8022aedc6648fa523a17178 C1234
COPYING
COPYING.1
EOF

test_expect_success \
    'validate output from rename/copy detection (#2)' \
    'compare_diff_raw current expected'

# make sure diff-helper can grok it.
mv current diff-raw
GIT_DIFF_OPTS=--unified=0 git-diff-helper -z <diff-raw >current
cat >expected <<\EOF
diff --git a/COPYING b/COPYING
--- a/COPYING
+++ b/COPYING
@@ -2 +2 @@
- Note that the only valid version of the GPL as far as this project
+ Note that the only valid version of the G.P.L as far as this project
@@ -6 +6 @@
- HOWEVER, in order to allow a migration to GPLv3 if that seems like
+ HOWEVER, in order to allow a migration to G.P.Lv3 if that seems like
@@ -12 +12 @@
-	This file is licensed under the GPL v2, or a later version
+	This file is licensed under the G.P.L v2, or a later version
diff --git a/COPYING b/COPYING.1
copy from COPYING
copy to COPYING.1
--- a/COPYING
+++ b/COPYING.1
@@ -6 +6 @@
- HOWEVER, in order to allow a migration to GPLv3 if that seems like
+ However, in order to allow a migration to GPLv3 if that seems like
EOF

test_expect_success \
    'validate output from diff-helper (#2)' \
    'compare_diff_patch current expected'

################################################################

# tree has COPYING and rezrov.  work tree has the same COPYING and
# copy-edited COPYING.1, and unchanged rezrov.  We should not say
# anything about rezrov nor COPYING, since the revised again diff-raw
# nows how to say Copy.

test_expect_success \
    'prepare work tree once again' \
    'cat ../../COPYING >COPYING &&
     git-update-cache --add --remove COPYING COPYING.1'

git-diff-cache -z -C $tree >current
cat >expected <<\EOF
:100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 0603b3238a076dc6c8022aedc6648fa523a17178 C1234
COPYING
COPYING.1
EOF

test_expect_success \
    'validate output from rename/copy detection (#3)' \
    'compare_diff_raw current expected'

# make sure diff-helper can grok it.
mv current diff-raw
GIT_DIFF_OPTS=--unified=0 git-diff-helper -z <diff-raw >current
cat >expected <<\EOF
diff --git a/COPYING b/COPYING.1
copy from COPYING
copy to COPYING.1
--- a/COPYING
+++ b/COPYING.1
@@ -6 +6 @@
- HOWEVER, in order to allow a migration to GPLv3 if that seems like
+ However, in order to allow a migration to GPLv3 if that seems like
EOF

test_expect_success \
    'validate output from diff-helper (#3)' \
    'compare_diff_patch current expected'

test_done
Commit	Line	Data
ddafa7e9 JH	1	#!/bin/sh
	2	#
	3	# Copyright (c) 2005 Junio C Hamano
	4	#
	5
	6	test_description='Same rename detection as t4003 but testing diff-raw -z.
	7
	8	'
	9	. ./test-lib.sh
	10
	11	_x40='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]'
	12	_x40="$_x40$_x40$_x40$_x40$_x40$_x40$_x40$_x40"
	13	sanitize_diff_raw='/^:/s/ '"$_x40"' '"$_x40"' \([A-Z]\)[0-9]*$/ X X \1#/'
	14	compare_diff_raw () {
	15	# When heuristics are improved, the score numbers would change.
	16	# Ignore them while comparing.
	17	# Also we do not check SHA1 hash generation in this test, which
	18	# is a job for t0000-basic.sh
	19
	20	tr '\0' '\012' <"$1" \| sed -e "$sanitize_diff_raw" >.tmp-1
	21	tr '\0' '\012' <"$2" \| sed -e "$sanitize_diff_raw" >.tmp-2
	22	diff -u .tmp-1 .tmp-2 && rm -f .tmp-1 .tmp-2
	23	}
	24
	25	compare_diff_patch () {
	26	# When heuristics are improved, the score numbers would change.
	27	# Ignore them while comparing.
	28	sed -e '/^similarity index [0-9]*%$/d' <"$1" >.tmp-1
	29	sed -e '/^similarity index [0-9]*%$/d' <"$2" >.tmp-2
	30	diff -u .tmp-1 .tmp-2 && rm -f .tmp-1 .tmp-2
	31	}
	32
	33	test_expect_success \
	34	'prepare reference tree' \
	35	'cat ../../COPYING >COPYING &&
	36	echo frotz >rezrov &&
	37	git-update-cache --add COPYING rezrov &&
	38	tree=$(git-write-tree) &&
	39	echo $tree'
	40
	41	test_expect_success \
	42	'prepare work tree' \
	43	'sed -e 's/HOWEVER/However/' <COPYING >COPYING.1 &&
	44	sed -e 's/GPL/G.P.L/g' <COPYING >COPYING.2 &&
	45	rm -f COPYING &&
	46	git-update-cache --add --remove COPYING COPYING.?'
	47
	48	# tree has COPYING and rezrov. work tree has COPYING.1 and COPYING.2,
	49	# both are slightly edited, and unchanged rezrov. We say COPYING.1
	50	# and COPYING.2 are based on COPYING, and do not say anything about
	51	# rezrov.
	52
	53	git-diff-cache -z -M $tree >current
	54
	55	cat >expected <<\EOF
	56	:100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 0603b3238a076dc6c8022aedc6648fa523a17178 C1234
	57	COPYING
	58	COPYING.1
	59	:100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 06c67961bbaed34a127f76d261f4c0bf73eda471 R1234
	60	COPYING
	61	COPYING.2
	62	EOF
	63
	64	test_expect_success \
65	'validate output from rename/copy detection (#1)' \
66	'compare_diff_raw current expected'
67
68	# make sure diff-helper can grok it.
69	mv current diff-raw
70	GIT_DIFF_OPTS=--unified=0 git-diff-helper -z <diff-raw >current
71	cat >expected <<\EOF
72	diff --git a/COPYING b/COPYING.1
73	copy from COPYING
74	copy to COPYING.1
75	--- a/COPYING
76	+++ b/COPYING.1
77	@@ -6 +6 @@
78	- HOWEVER, in order to allow a migration to GPLv3 if that seems like
79	+ However, in order to allow a migration to GPLv3 if that seems like
80	diff --git a/COPYING b/COPYING.2
81	rename old COPYING
82	rename new COPYING.2
83	--- a/COPYING
84	+++ b/COPYING.2
85	@@ -2 +2 @@
86	- Note that the only valid version of the GPL as far as this project
87	+ Note that the only valid version of the G.P.L as far as this project
88	@@ -6 +6 @@
89	- HOWEVER, in order to allow a migration to GPLv3 if that seems like
90	+ HOWEVER, in order to allow a migration to G.P.Lv3 if that seems like
91	@@ -12 +12 @@
92	- This file is licensed under the GPL v2, or a later version
93	+ This file is licensed under the G.P.L v2, or a later version
94	EOF
95
96	test_expect_success \
97	'validate output from diff-helper (#1)' \
98	'compare_diff_patch current expected'
99
100	################################################################
101
102	test_expect_success \
103	'prepare work tree again' \
104	'mv COPYING.2 COPYING &&
105	git-update-cache --add --remove COPYING COPYING.1 COPYING.2'
106
107	# tree has COPYING and rezrov. work tree has COPYING and COPYING.1,
108	# both are slightly edited, and unchanged rezrov. We say COPYING.1
109	# is based on COPYING and COPYING is still there, and do not say anything
110	# about rezrov.
111
112	git-diff-cache -z -C $tree >current
113	cat >expected <<\EOF
114	:100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 06c67961bbaed34a127f76d261f4c0bf73eda471 M
115	COPYING
116	:100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 0603b3238a076dc6c8022aedc6648fa523a17178 C1234
117	COPYING
118	COPYING.1
119	EOF
120
121	test_expect_success \
122	'validate output from rename/copy detection (#2)' \
123	'compare_diff_raw current expected'
124
125	# make sure diff-helper can grok it.
126	mv current diff-raw
127	GIT_DIFF_OPTS=--unified=0 git-diff-helper -z <diff-raw >current
128	cat >expected <<\EOF
129	diff --git a/COPYING b/COPYING
130	--- a/COPYING
131	+++ b/COPYING
132	@@ -2 +2 @@
133	- Note that the only valid version of the GPL as far as this project
134	+ Note that the only valid version of the G.P.L as far as this project
135	@@ -6 +6 @@
136	- HOWEVER, in order to allow a migration to GPLv3 if that seems like
137	+ HOWEVER, in order to allow a migration to G.P.Lv3 if that seems like
138	@@ -12 +12 @@
139	- This file is licensed under the GPL v2, or a later version
140	+ This file is licensed under the G.P.L v2, or a later version
141	diff --git a/COPYING b/COPYING.1
142	copy from COPYING
143	copy to COPYING.1
144	--- a/COPYING
145	+++ b/COPYING.1
146	@@ -6 +6 @@
147	- HOWEVER, in order to allow a migration to GPLv3 if that seems like
148	+ However, in order to allow a migration to GPLv3 if that seems like
149	EOF
150
151	test_expect_success \
152	'validate output from diff-helper (#2)' \
153	'compare_diff_patch current expected'
154
155	################################################################
156
157	# tree has COPYING and rezrov. work tree has the same COPYING and
158	# copy-edited COPYING.1, and unchanged rezrov. We should not say
159	# anything about rezrov nor COPYING, since the revised again diff-raw
160	# nows how to say Copy.
161
162	test_expect_success \
163	'prepare work tree once again' \
164	'cat ../../COPYING >COPYING &&
165	git-update-cache --add --remove COPYING COPYING.1'
166
167	git-diff-cache -z -C $tree >current
168	cat >expected <<\EOF
169	:100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 0603b3238a076dc6c8022aedc6648fa523a17178 C1234
170	COPYING
171	COPYING.1
172	EOF
173
174	test_expect_success \
175	'validate output from rename/copy detection (#3)' \
176	'compare_diff_raw current expected'
177
178	# make sure diff-helper can grok it.
179	mv current diff-raw
180	GIT_DIFF_OPTS=--unified=0 git-diff-helper -z <diff-raw >current
181	cat >expected <<\EOF
182	diff --git a/COPYING b/COPYING.1
183	copy from COPYING
184	copy to COPYING.1
185	--- a/COPYING
186	+++ b/COPYING.1
187	@@ -6 +6 @@
188	- HOWEVER, in order to allow a migration to GPLv3 if that seems like
189	+ However, in order to allow a migration to GPLv3 if that seems like
190	EOF
191
192	test_expect_success \
193	'validate output from diff-helper (#3)' \
194	'compare_diff_patch current expected'
195
196	test_done