[thirdparty/git.git] / t / t4013-diff-various.sh

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

test_description='Various diff formatting options'

. ./test-lib.sh

LF='
'

test_expect_success setup '

	GIT_AUTHOR_DATE="2006-06-26 00:00:00 +0000" &&
	GIT_COMMITTER_DATE="2006-06-26 00:00:00 +0000" &&
	export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&

	mkdir dir &&
	mkdir dir2 &&
	for i in 1 2 3; do echo $i; done >file0 &&
	for i in A B; do echo $i; done >dir/sub &&
	cat file0 >file2 &&
	git add file0 file2 dir/sub &&
	git commit -m Initial &&

	git branch initial &&
	git branch side &&

	GIT_AUTHOR_DATE="2006-06-26 00:01:00 +0000" &&
	GIT_COMMITTER_DATE="2006-06-26 00:01:00 +0000" &&
	export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&

	for i in 4 5 6; do echo $i; done >>file0 &&
	for i in C D; do echo $i; done >>dir/sub &&
	rm -f file2 &&
	git update-index --remove file0 file2 dir/sub &&
	git commit -m "Second${LF}${LF}This is the second commit." &&

	GIT_AUTHOR_DATE="2006-06-26 00:02:00 +0000" &&
	GIT_COMMITTER_DATE="2006-06-26 00:02:00 +0000" &&
	export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&

	for i in A B C; do echo $i; done >file1 &&
	git add file1 &&
	for i in E F; do echo $i; done >>dir/sub &&
	git update-index dir/sub &&
	git commit -m Third &&

	GIT_AUTHOR_DATE="2006-06-26 00:03:00 +0000" &&
	GIT_COMMITTER_DATE="2006-06-26 00:03:00 +0000" &&
	export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&

	git checkout side &&
	for i in A B C; do echo $i; done >>file0 &&
	for i in 1 2; do echo $i; done >>dir/sub &&
	cat dir/sub >file3 &&
	git add file3 &&
	git update-index file0 dir/sub &&
	git commit -m Side &&

	GIT_AUTHOR_DATE="2006-06-26 00:04:00 +0000" &&
	GIT_COMMITTER_DATE="2006-06-26 00:04:00 +0000" &&
	export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&

	git checkout master &&
	git pull -s ours . side &&

	GIT_AUTHOR_DATE="2006-06-26 00:05:00 +0000" &&
	GIT_COMMITTER_DATE="2006-06-26 00:05:00 +0000" &&
	export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&

	for i in A B C; do echo $i; done >>file0 &&
	for i in 1 2; do echo $i; done >>dir/sub &&
	git update-index file0 dir/sub &&

	mkdir dir3 &&
	cp dir/sub dir3/sub &&
	test-chmtime +1 dir3/sub &&

	git config log.showroot false &&
	git commit --amend &&
	git show-branch
'

: <<\EOF
! [initial] Initial
 * [master] Merge branch 'side'
  ! [side] Side
---
 -  [master] Merge branch 'side'
 *+ [side] Side
 *  [master^] Second
+*+ [initial] Initial
EOF

V=`git version | sed -e 's/^git version //' -e 's/\./\\./g'`
while read cmd
do
	case "$cmd" in
	'' | '#'*) continue ;;
	esac
	test=`echo "$cmd" | sed -e 's|[/ ][/ ]*|_|g'`
	pfx=`printf "%04d" $test_count`
	expect="$TEST_DIRECTORY/t4013/diff.$test"
	actual="$pfx-diff.$test"

	test_expect_success "git $cmd" '
		{
			echo "\$ git $cmd"
			git $cmd |
			sed -e "s/^\\(-*\\)$V\\(-*\\)\$/\\1g-i-t--v-e-r-s-i-o-n\2/" \
			    -e "s/^\\(.*mixed; boundary=\"-*\\)$V\\(-*\\)\"\$/\\1g-i-t--v-e-r-s-i-o-n\2\"/"
			echo "\$"
		} >"$actual" &&
		if test -f "$expect"
		then
			test_cmp "$expect" "$actual" &&
			rm -f "$actual"
		else
			# this is to help developing new tests.
			cp "$actual" "$expect"
			false
		fi
	'
done <<\EOF
diff-tree initial
diff-tree -r initial
diff-tree -r --abbrev initial
diff-tree -r --abbrev=4 initial
diff-tree --root initial
diff-tree --root --abbrev initial
diff-tree --root -r initial
diff-tree --root -r --abbrev initial
diff-tree --root -r --abbrev=4 initial
diff-tree -p initial
diff-tree --root -p initial
diff-tree --patch-with-stat initial
diff-tree --root --patch-with-stat initial
diff-tree --patch-with-raw initial
diff-tree --root --patch-with-raw initial

diff-tree --pretty initial
diff-tree --pretty --root initial
diff-tree --pretty -p initial
diff-tree --pretty --stat initial
diff-tree --pretty --summary initial
diff-tree --pretty --stat --summary initial
diff-tree --pretty --root -p initial
diff-tree --pretty --root --stat initial
# improved by Timo's patch
diff-tree --pretty --root --summary initial
# improved by Timo's patch
diff-tree --pretty --root --summary -r initial
diff-tree --pretty --root --stat --summary initial
diff-tree --pretty --patch-with-stat initial
diff-tree --pretty --root --patch-with-stat initial
diff-tree --pretty --patch-with-raw initial
diff-tree --pretty --root --patch-with-raw initial

diff-tree --pretty=oneline initial
diff-tree --pretty=oneline --root initial
diff-tree --pretty=oneline -p initial
diff-tree --pretty=oneline --root -p initial
diff-tree --pretty=oneline --patch-with-stat initial
# improved by Timo's patch
diff-tree --pretty=oneline --root --patch-with-stat initial
diff-tree --pretty=oneline --patch-with-raw initial
diff-tree --pretty=oneline --root --patch-with-raw initial

diff-tree --pretty side
diff-tree --pretty -p side
diff-tree --pretty --patch-with-stat side

diff-tree master
diff-tree -p master
diff-tree -p -m master
diff-tree -c master
diff-tree -c --abbrev master
diff-tree --cc master
# stat only should show the diffstat with the first parent
diff-tree -c --stat master
diff-tree --cc --stat master
diff-tree -c --stat --summary master
diff-tree --cc --stat --summary master
# stat summary should show the diffstat and summary with the first parent
diff-tree -c --stat --summary side
diff-tree --cc --stat --summary side
# improved by Timo's patch
diff-tree --cc --patch-with-stat master
# improved by Timo's patch
diff-tree --cc --patch-with-stat --summary master
# this is correct
diff-tree --cc --patch-with-stat --summary side

log master
log -p master
log --root master
log --root -p master
log --patch-with-stat master
log --root --patch-with-stat master
log --root --patch-with-stat --summary master
# improved by Timo's patch
log --root -c --patch-with-stat --summary master
# improved by Timo's patch
log --root --cc --patch-with-stat --summary master
log -p --first-parent master
log -m -p --first-parent master
log -m -p master
log -SF master
log -S F master
log -SF -p master
log -GF master
log -GF -p master
log -GF -p --pickaxe-all master
log --decorate --all
log --decorate=full --all

rev-list --parents HEAD
rev-list --children HEAD

whatchanged master
whatchanged -p master
whatchanged --root master
whatchanged --root -p master
whatchanged --patch-with-stat master
whatchanged --root --patch-with-stat master
whatchanged --root --patch-with-stat --summary master
# improved by Timo's patch
whatchanged --root -c --patch-with-stat --summary master
# improved by Timo's patch
whatchanged --root --cc --patch-with-stat --summary master
whatchanged -SF master
whatchanged -SF -p master

log --patch-with-stat master -- dir/
whatchanged --patch-with-stat master -- dir/
log --patch-with-stat --summary master -- dir/
whatchanged --patch-with-stat --summary master -- dir/

show initial
show --root initial
show side
show master
show -c master
show -m master
show --first-parent master
show --stat side
show --stat --summary side
show --patch-with-stat side
show --patch-with-raw side
show --patch-with-stat --summary side

format-patch --stdout initial..side
format-patch --stdout initial..master^
format-patch --stdout initial..master
format-patch --stdout --no-numbered initial..master
format-patch --stdout --numbered initial..master
format-patch --attach --stdout initial..side
format-patch --attach --stdout --suffix=.diff initial..side
format-patch --attach --stdout initial..master^
format-patch --attach --stdout initial..master
format-patch --inline --stdout initial..side
format-patch --inline --stdout initial..master^
format-patch --inline --stdout --numbered-files initial..master
format-patch --inline --stdout initial..master
format-patch --inline --stdout --subject-prefix=TESTCASE initial..master
config format.subjectprefix DIFFERENT_PREFIX
format-patch --inline --stdout initial..master^^
format-patch --stdout --cover-letter -n initial..master^

diff --abbrev initial..side
diff -r initial..side
diff --stat initial..side
diff -r --stat initial..side
diff initial..side
diff --patch-with-stat initial..side
diff --patch-with-raw initial..side
diff --patch-with-stat -r initial..side
diff --patch-with-raw -r initial..side
diff --name-status dir2 dir
diff --no-index --name-status dir2 dir
diff --no-index --name-status -- dir2 dir
diff --no-index dir dir3
diff master master^ side
diff --dirstat master~1 master~2
EOF

test_expect_success 'log -S requires an argument' '
	test_must_fail git log -S
'

test_done
Commit	Line	Data
3c2f75b5 JH	1	#!/bin/sh
	2	#
	3	# Copyright (c) 2006 Junio C Hamano
	4	#
	5
	6	test_description='Various diff formatting options'
	7
	8	. ./test-lib.sh
	9
a40d384c JH	10	LF='
	11	'
	12
3c2f75b5 JH	13	test_expect_success setup '
	14
	15	GIT_AUTHOR_DATE="2006-06-26 00:00:00 +0000" &&
	16	GIT_COMMITTER_DATE="2006-06-26 00:00:00 +0000" &&
	17	export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
	18
	19	mkdir dir &&
3cb56738	20	mkdir dir2 &&
3c2f75b5 JH	21	for i in 1 2 3; do echo $i; done >file0 &&
	22	for i in A B; do echo $i; done >dir/sub &&
	23	cat file0 >file2 &&
	24	git add file0 file2 dir/sub &&
	25	git commit -m Initial &&
	26
	27	git branch initial &&
	28	git branch side &&
	29
	30	GIT_AUTHOR_DATE="2006-06-26 00:01:00 +0000" &&
	31	GIT_COMMITTER_DATE="2006-06-26 00:01:00 +0000" &&
	32	export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
	33
	34	for i in 4 5 6; do echo $i; done >>file0 &&
	35	for i in C D; do echo $i; done >>dir/sub &&
	36	rm -f file2 &&
	37	git update-index --remove file0 file2 dir/sub &&
a40d384c	38	git commit -m "Second${LF}${LF}This is the second commit." &&
3c2f75b5 JH	39
	40	GIT_AUTHOR_DATE="2006-06-26 00:02:00 +0000" &&
	41	GIT_COMMITTER_DATE="2006-06-26 00:02:00 +0000" &&
	42	export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
	43
	44	for i in A B C; do echo $i; done >file1 &&
	45	git add file1 &&
	46	for i in E F; do echo $i; done >>dir/sub &&
	47	git update-index dir/sub &&
	48	git commit -m Third &&
	49
	50	GIT_AUTHOR_DATE="2006-06-26 00:03:00 +0000" &&
	51	GIT_COMMITTER_DATE="2006-06-26 00:03:00 +0000" &&
	52	export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
	53
	54	git checkout side &&
	55	for i in A B C; do echo $i; done >>file0 &&
	56	for i in 1 2; do echo $i; done >>dir/sub &&
	57	cat dir/sub >file3 &&
	58	git add file3 &&
	59	git update-index file0 dir/sub &&
	60	git commit -m Side &&
	61
	62	GIT_AUTHOR_DATE="2006-06-26 00:04:00 +0000" &&
	63	GIT_COMMITTER_DATE="2006-06-26 00:04:00 +0000" &&
	64	export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
	65
	66	git checkout master &&
	67	git pull -s ours . side &&
	68
	69	GIT_AUTHOR_DATE="2006-06-26 00:05:00 +0000" &&
	70	GIT_COMMITTER_DATE="2006-06-26 00:05:00 +0000" &&
	71	export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
	72
	73	for i in A B C; do echo $i; done >>file0 &&
	74	for i in 1 2; do echo $i; done >>dir/sub &&
	75	git update-index file0 dir/sub &&
	76
d61027b2 MS	77	mkdir dir3 &&
	78	cp dir/sub dir3/sub &&
	79	test-chmtime +1 dir3/sub &&
	80
e0d10e1c	81	git config log.showroot false &&
8ff99e74	82	git commit --amend &&
3c2f75b5 JH	83	git show-branch
	84	'
	85
	86	: <<\EOF
	87	! [initial] Initial
	88	* [master] Merge branch 'side'
	89	! [side] Side
	90	---
	91	- [master] Merge branch 'side'
	92	*+ [side] Side
	93	* [master^] Second
	94	+*+ [initial] Initial
	95	EOF
	96
6c7f4ceb	97	V=`git version \| sed -e 's/^git version //' -e 's/\./\\./g'`
3c2f75b5 JH	98	while read cmd
	99	do
	100	case "$cmd" in
	101	'' \| '#'*) continue ;;
	102	esac
	103	test=`echo "$cmd" \| sed -e 's\|[/ ][/ ]*\|_\|g'`
8586f98b	104	pfx=`printf "%04d" $test_count`
bfdbee98	105	expect="$TEST_DIRECTORY/t4013/diff.$test"
3c2f75b5 JH	106	actual="$pfx-diff.$test"
	107
	108	test_expect_success "git $cmd" '
	109	{
	110	echo "\$ git $cmd"
6c7f4ceb JH	111	git $cmd \|
6c7f4ceb JH	112	sed -e "s/^\\(-\\)$V\\(-\\)\$/\\1g-i-t--v-e-r-s-i-o-n\2/" \
33ee4cfb	113	-e "s/^\\(.mixed; boundary=\"-\\)$V\\(-*\\)\"\$/\\1g-i-t--v-e-r-s-i-o-n\2\"/"
3c2f75b5 JH	114	echo "\$"
	115	} >"$actual" &&
	116	if test -f "$expect"
	117	then
3af82863	118	test_cmp "$expect" "$actual" &&
3c2f75b5 JH	119	rm -f "$actual"
	120	else
	121	# this is to help developing new tests.
	122	cp "$actual" "$expect"
	123	false
	124	fi
	125	'
	126	done <<\EOF
	127	diff-tree initial
	128	diff-tree -r initial
	129	diff-tree -r --abbrev initial
	130	diff-tree -r --abbrev=4 initial
	131	diff-tree --root initial
	132	diff-tree --root --abbrev initial
	133	diff-tree --root -r initial
	134	diff-tree --root -r --abbrev initial
	135	diff-tree --root -r --abbrev=4 initial
	136	diff-tree -p initial
	137	diff-tree --root -p initial
	138	diff-tree --patch-with-stat initial
	139	diff-tree --root --patch-with-stat initial
	140	diff-tree --patch-with-raw initial
	141	diff-tree --root --patch-with-raw initial
	142
	143	diff-tree --pretty initial
	144	diff-tree --pretty --root initial
	145	diff-tree --pretty -p initial
	146	diff-tree --pretty --stat initial
	147	diff-tree --pretty --summary initial
	148	diff-tree --pretty --stat --summary initial
	149	diff-tree --pretty --root -p initial
	150	diff-tree --pretty --root --stat initial
026625e7 JH	151	# improved by Timo's patch
	152	diff-tree --pretty --root --summary initial
	153	# improved by Timo's patch
	154	diff-tree --pretty --root --summary -r initial
3c2f75b5 JH	155	diff-tree --pretty --root --stat --summary initial
	156	diff-tree --pretty --patch-with-stat initial
	157	diff-tree --pretty --root --patch-with-stat initial
	158	diff-tree --pretty --patch-with-raw initial
	159	diff-tree --pretty --root --patch-with-raw initial
	160
	161	diff-tree --pretty=oneline initial
	162	diff-tree --pretty=oneline --root initial
	163	diff-tree --pretty=oneline -p initial
	164	diff-tree --pretty=oneline --root -p initial
	165	diff-tree --pretty=oneline --patch-with-stat initial
026625e7	166	# improved by Timo's patch
3c2f75b5 JH	167	diff-tree --pretty=oneline --root --patch-with-stat initial
	168	diff-tree --pretty=oneline --patch-with-raw initial
	169	diff-tree --pretty=oneline --root --patch-with-raw initial
	170
	171	diff-tree --pretty side
	172	diff-tree --pretty -p side
	173	diff-tree --pretty --patch-with-stat side
	174
	175	diff-tree master
	176	diff-tree -p master
	177	diff-tree -p -m master
	178	diff-tree -c master
	179	diff-tree -c --abbrev master
	180	diff-tree --cc master
47979d5d JH	181	# stat only should show the diffstat with the first parent
	182	diff-tree -c --stat master
	183	diff-tree --cc --stat master
	184	diff-tree -c --stat --summary master
	185	diff-tree --cc --stat --summary master
	186	# stat summary should show the diffstat and summary with the first parent
	187	diff-tree -c --stat --summary side
	188	diff-tree --cc --stat --summary side
026625e7 JH	189	# improved by Timo's patch
	190	diff-tree --cc --patch-with-stat master
	191	# improved by Timo's patch
47979d5d JH	192	diff-tree --cc --patch-with-stat --summary master
	193	# this is correct
	194	diff-tree --cc --patch-with-stat --summary side
3c2f75b5 JH	195
	196	log master
	197	log -p master
	198	log --root master
	199	log --root -p master
	200	log --patch-with-stat master
	201	log --root --patch-with-stat master
47979d5d	202	log --root --patch-with-stat --summary master
026625e7	203	# improved by Timo's patch
47979d5d	204	log --root -c --patch-with-stat --summary master
026625e7	205	# improved by Timo's patch
47979d5d	206	log --root --cc --patch-with-stat --summary master
126f431a JH	207	log -p --first-parent master
	208	log -m -p --first-parent master
	209	log -m -p master
3c2f75b5	210	log -SF master
dea007fb	211	log -S F master
47979d5d	212	log -SF -p master
bf1dfc31 JH	213	log -GF master
	214	log -GF -p master
	215	log -GF -p --pickaxe-all master
28fd76bd	216	log --decorate --all
33e7018c	217	log --decorate=full --all
3c2f75b5	218
fcbc6efc TR	219	rev-list --parents HEAD
fcbc6efc TR	220	rev-list --children HEAD
3c2f75b5 JH	221
	222	whatchanged master
	223	whatchanged -p master
	224	whatchanged --root master
	225	whatchanged --root -p master
	226	whatchanged --patch-with-stat master
	227	whatchanged --root --patch-with-stat master
	228	whatchanged --root --patch-with-stat --summary master
026625e7	229	# improved by Timo's patch
47979d5d	230	whatchanged --root -c --patch-with-stat --summary master
026625e7	231	# improved by Timo's patch
47979d5d	232	whatchanged --root --cc --patch-with-stat --summary master
3c2f75b5	233	whatchanged -SF master
47979d5d	234	whatchanged -SF -p master
3c2f75b5 JH	235
	236	log --patch-with-stat master -- dir/
	237	whatchanged --patch-with-stat master -- dir/
47979d5d JH	238	log --patch-with-stat --summary master -- dir/
47979d5d JH	239	whatchanged --patch-with-stat --summary master -- dir/
3c2f75b5 JH	240
	241	show initial
	242	show --root initial
	243	show side
	244	show master
b4490059	245	show -c master
2bf65873 JH	246	show -m master
2bf65873 JH	247	show --first-parent master
3c2f75b5 JH	248	show --stat side
	249	show --stat --summary side
	250	show --patch-with-stat side
	251	show --patch-with-raw side
	252	show --patch-with-stat --summary side
	253
d410e43b JH	254	format-patch --stdout initial..side
	255	format-patch --stdout initial..master^
	256	format-patch --stdout initial..master
a567fdcb BG	257	format-patch --stdout --no-numbered initial..master
a567fdcb BG	258	format-patch --stdout --numbered initial..master
d410e43b	259	format-patch --attach --stdout initial..side
108dab28	260	format-patch --attach --stdout --suffix=.diff initial..side
d410e43b JH	261	format-patch --attach --stdout initial..master^
d410e43b JH	262	format-patch --attach --stdout initial..master
c112f689 JS	263	format-patch --inline --stdout initial..side
c112f689 JS	264	format-patch --inline --stdout initial..master^
747e2505	265	format-patch --inline --stdout --numbered-files initial..master
a567fdcb	266	format-patch --inline --stdout initial..master
171ddd91	267	format-patch --inline --stdout --subject-prefix=TESTCASE initial..master
dbd21447 AR	268	config format.subjectprefix DIFFERENT_PREFIX
dbd21447 AR	269	format-patch --inline --stdout initial..master^^
a5a27c79	270	format-patch --stdout --cover-letter -n initial..master^
d410e43b	271
b319b02e JH	272	diff --abbrev initial..side
	273	diff -r initial..side
	274	diff --stat initial..side
	275	diff -r --stat initial..side
	276	diff initial..side
	277	diff --patch-with-stat initial..side
	278	diff --patch-with-raw initial..side
	279	diff --patch-with-stat -r initial..side
	280	diff --patch-with-raw -r initial..side
3cb56738	281	diff --name-status dir2 dir
0569e9b8	282	diff --no-index --name-status dir2 dir
e423ffd8	283	diff --no-index --name-status -- dir2 dir
d61027b2	284	diff --no-index dir dir3
b75271d9	285	diff master master^ side
f37bfb7a	286	diff --dirstat master~1 master~2
3c2f75b5 JH	287	EOF
3c2f75b5 JH	288
dea007fb MM	289	test_expect_success 'log -S requires an argument' '
	290	test_must_fail git log -S
	291	'
	292
3c2f75b5	293	test_done