Document git-diff-tree --always
[git/dscho.git] / t / t6001-rev-list-merge-order.sh
blob7724e8a8c52509efbbc5728dc727d740ed87e97f
1 #!/bin/sh
3 # Copyright (c) 2005 Jon Seymour
6 test_description='Tests git-rev-list --merge-order functionality'
8 . ./test-lib.sh
9 . ../t6000lib.sh # t6xxx specific functions
11 # test-case specific test function
12 check_adjacency()
14 read previous
15 echo "= $previous"
16 while read next
18 if ! (git-cat-file commit $previous | grep "^parent $next" >/dev/null)
19 then
20 echo "^ $next"
21 else
22 echo "| $next"
24 previous=$next
25 done
28 list_duplicates()
30 "$@" | sort | uniq -d
33 grep_stderr()
35 args=$1
36 shift 1
37 "$@" 2>&1 | grep "$args"
40 date >path0
41 git-update-index --add path0
42 save_tag tree git-write-tree
43 on_committer_date "1971-08-16 00:00:00" hide_error save_tag root unique_commit root tree
44 on_committer_date "1971-08-16 00:00:01" save_tag l0 unique_commit l0 tree -p root
45 on_committer_date "1971-08-16 00:00:02" save_tag l1 unique_commit l1 tree -p l0
46 on_committer_date "1971-08-16 00:00:03" save_tag l2 unique_commit l2 tree -p l1
47 on_committer_date "1971-08-16 00:00:04" save_tag a0 unique_commit a0 tree -p l2
48 on_committer_date "1971-08-16 00:00:05" save_tag a1 unique_commit a1 tree -p a0
49 on_committer_date "1971-08-16 00:00:06" save_tag b1 unique_commit b1 tree -p a0
50 on_committer_date "1971-08-16 00:00:07" save_tag c1 unique_commit c1 tree -p b1
51 on_committer_date "1971-08-16 00:00:08" as_author foobar@example.com save_tag b2 unique_commit b2 tree -p b1
52 on_committer_date "1971-08-16 00:00:09" save_tag b3 unique_commit b2 tree -p b2
53 on_committer_date "1971-08-16 00:00:10" save_tag c2 unique_commit c2 tree -p c1 -p b2
54 on_committer_date "1971-08-16 00:00:11" save_tag c3 unique_commit c3 tree -p c2
55 on_committer_date "1971-08-16 00:00:12" save_tag a2 unique_commit a2 tree -p a1
56 on_committer_date "1971-08-16 00:00:13" save_tag a3 unique_commit a3 tree -p a2
57 on_committer_date "1971-08-16 00:00:14" save_tag b4 unique_commit b4 tree -p b3 -p a3
58 on_committer_date "1971-08-16 00:00:15" save_tag a4 unique_commit a4 tree -p a3 -p b4 -p c3
59 on_committer_date "1971-08-16 00:00:16" save_tag l3 unique_commit l3 tree -p a4
60 on_committer_date "1971-08-16 00:00:17" save_tag l4 unique_commit l4 tree -p l3
61 on_committer_date "1971-08-16 00:00:18" save_tag l5 unique_commit l5 tree -p l4
62 on_committer_date "1971-08-16 00:00:19" save_tag m1 unique_commit m1 tree -p a4 -p c3
63 on_committer_date "1971-08-16 00:00:20" save_tag m2 unique_commit m2 tree -p c3 -p a4
64 on_committer_date "1971-08-16 00:00:21" hide_error save_tag alt_root unique_commit alt_root tree
65 on_committer_date "1971-08-16 00:00:22" save_tag r0 unique_commit r0 tree -p alt_root
66 on_committer_date "1971-08-16 00:00:23" save_tag r1 unique_commit r1 tree -p r0
67 on_committer_date "1971-08-16 00:00:24" save_tag l5r1 unique_commit l5r1 tree -p l5 -p r1
68 on_committer_date "1971-08-16 00:00:25" save_tag r1l5 unique_commit r1l5 tree -p r1 -p l5
72 # note: as of 20/6, it isn't possible to create duplicate parents, so this
73 # can't be tested.
75 #on_committer_date "1971-08-16 00:00:20" save_tag m3 unique_commit m3 tree -p c3 -p a4 -p c3
76 hide_error save_tag e1 as_author e@example.com unique_commit e1 tree
77 save_tag e2 as_author e@example.com unique_commit e2 tree -p e1
78 save_tag f1 as_author f@example.com unique_commit f1 tree -p e1
79 save_tag e3 as_author e@example.com unique_commit e3 tree -p e2
80 save_tag f2 as_author f@example.com unique_commit f2 tree -p f1
81 save_tag e4 as_author e@example.com unique_commit e4 tree -p e3 -p f2
82 save_tag e5 as_author e@example.com unique_commit e5 tree -p e4
83 save_tag f3 as_author f@example.com unique_commit f3 tree -p f2
84 save_tag f4 as_author f@example.com unique_commit f4 tree -p f3
85 save_tag e6 as_author e@example.com unique_commit e6 tree -p e5 -p f4
86 save_tag f5 as_author f@example.com unique_commit f5 tree -p f4
87 save_tag f6 as_author f@example.com unique_commit f6 tree -p f5 -p e6
88 save_tag e7 as_author e@example.com unique_commit e7 tree -p e6
89 save_tag e8 as_author e@example.com unique_commit e8 tree -p e7
90 save_tag e9 as_author e@example.com unique_commit e9 tree -p e8
91 save_tag f7 as_author f@example.com unique_commit f7 tree -p f6
92 save_tag f8 as_author f@example.com unique_commit f8 tree -p f7
93 save_tag f9 as_author f@example.com unique_commit f9 tree -p f8
94 save_tag e10 as_author e@example.com unique_commit e1 tree -p e9 -p f8
96 hide_error save_tag g0 unique_commit g0 tree
97 save_tag g1 unique_commit g1 tree -p g0
98 save_tag h1 unique_commit g2 tree -p g0
99 save_tag g2 unique_commit g3 tree -p g1 -p h1
100 save_tag h2 unique_commit g4 tree -p g2
101 save_tag g3 unique_commit g5 tree -p g2
102 save_tag g4 unique_commit g6 tree -p g3 -p h2
104 git-update-ref HEAD $(tag l5)
106 test_output_expect_success 'rev-list has correct number of entries' 'git-rev-list HEAD | wc -l | tr -d \" \"' <<EOF
110 if git-rev-list --merge-order HEAD 2>&1 | grep 'OpenSSL not linked' >/dev/null
111 then
112 test_expect_success 'skipping merge-order test' :
113 test_done
114 exit
117 normal_adjacency_count=$(git-rev-list HEAD | check_adjacency | grep -c "\^" | tr -d ' ')
118 merge_order_adjacency_count=$(git-rev-list --merge-order HEAD | check_adjacency | grep -c "\^" | tr -d ' ')
119 test_expect_success '--merge-order produces as many or fewer discontinuities' '[ $merge_order_adjacency_count -le $normal_adjacency_count ]'
120 test_output_expect_success 'simple merge order' 'git-rev-list --merge-order --show-breaks HEAD' <<EOF
121 = l5
122 | l4
123 | l3
124 = a4
125 | c3
126 | c2
127 | c1
128 ^ b4
129 | b3
130 | b2
131 | b1
132 ^ a3
133 | a2
134 | a1
135 = a0
136 | l2
137 | l1
138 | l0
139 = root
142 test_output_expect_success 'two diamonds merge order (g6)' 'git-rev-list --merge-order --show-breaks g4' <<EOF
143 = g4
144 | h2
145 ^ g3
146 = g2
147 | h1
148 ^ g1
149 = g0
152 test_output_expect_success 'multiple heads' 'git-rev-list --merge-order a3 b3 c3' <<EOF
166 root
169 test_output_expect_success 'multiple heads, prune at a1' 'git-rev-list --merge-order a3 b3 c3 ^a1' <<EOF
180 test_output_expect_success 'multiple heads, prune at l1' 'git-rev-list --merge-order a3 b3 c3 ^l1' <<EOF
194 test_output_expect_success 'cross-epoch, head at l5, prune at l1' 'git-rev-list --merge-order l5 ^l1' <<EOF
213 test_output_expect_success 'duplicated head arguments' 'git-rev-list --merge-order l5 l5 ^l1' <<EOF
232 test_output_expect_success 'prune near merge' 'git-rev-list --merge-order a4 ^c3' <<EOF
241 test_output_expect_success "head has no parent" 'git-rev-list --merge-order --show-breaks root' <<EOF
242 = root
245 test_output_expect_success "two nodes - one head, one base" 'git-rev-list --merge-order --show-breaks l0' <<EOF
246 = l0
247 = root
250 test_output_expect_success "three nodes one head, one internal, one base" 'git-rev-list --merge-order --show-breaks l1' <<EOF
251 = l1
252 | l0
253 = root
256 test_output_expect_success "linear prune l2 ^root" 'git-rev-list --merge-order --show-breaks l2 ^root' <<EOF
257 ^ l2
258 | l1
259 | l0
262 test_output_expect_success "linear prune l2 ^l0" 'git-rev-list --merge-order --show-breaks l2 ^l0' <<EOF
263 ^ l2
264 | l1
267 test_output_expect_success "linear prune l2 ^l1" 'git-rev-list --merge-order --show-breaks l2 ^l1' <<EOF
268 ^ l2
271 test_output_expect_success "linear prune l5 ^a4" 'git-rev-list --merge-order --show-breaks l5 ^a4' <<EOF
272 ^ l5
273 | l4
274 | l3
277 test_output_expect_success "linear prune l5 ^l3" 'git-rev-list --merge-order --show-breaks l5 ^l3' <<EOF
278 ^ l5
279 | l4
282 test_output_expect_success "linear prune l5 ^l4" 'git-rev-list --merge-order --show-breaks l5 ^l4' <<EOF
283 ^ l5
286 test_output_expect_success "max-count 10 - merge order" 'git-rev-list --merge-order --show-breaks --max-count=10 l5' <<EOF
287 = l5
288 | l4
289 | l3
290 = a4
291 | c3
292 | c2
293 | c1
294 ^ b4
295 | b3
296 | b2
299 test_output_expect_success "max-count 10 - non merge order" 'git-rev-list --max-count=10 l5' <<EOF
312 test_output_expect_success '--max-age=c3, no --merge-order' "git-rev-list --max-age=$(commit_date c3) l5" <<EOF
323 test_output_expect_success '--max-age=c3, --merge-order' "git-rev-list --merge-order --max-age=$(commit_date c3) l5" <<EOF
334 test_output_expect_success 'one specified head reachable from another a4, c3, --merge-order' "list_duplicates git-rev-list --merge-order a4 c3" <<EOF
337 test_output_expect_success 'one specified head reachable from another c3, a4, --merge-order' "list_duplicates git-rev-list --merge-order c3 a4" <<EOF
340 test_output_expect_success 'one specified head reachable from another a4, c3, no --merge-order' "list_duplicates git-rev-list a4 c3" <<EOF
343 test_output_expect_success 'one specified head reachable from another c3, a4, no --merge-order' "list_duplicates git-rev-list c3 a4" <<EOF
346 test_output_expect_success 'graph with c3 and a4 parents of head' "list_duplicates git-rev-list m1" <<EOF
349 test_output_expect_success 'graph with a4 and c3 parents of head' "list_duplicates git-rev-list m2" <<EOF
352 test_expect_success "head ^head --merge-order" 'git-rev-list --merge-order --show-breaks a3 ^a3' <<EOF
356 # can't test this now - duplicate parents can't be created
358 #test_output_expect_success 'duplicate parents' 'git-rev-list --parents --merge-order --show-breaks m3' <<EOF
359 #= m3 c3 a4 c3
360 #| a4 c3 b4 a3
361 #| b4 a3 b3
362 #| b3 b2
363 #^ a3 a2
364 #| a2 a1
365 #| a1 a0
366 #^ c3 c2
367 #| c2 b2 c1
368 #| b2 b1
369 #^ c1 b1
370 #| b1 a0
371 #= a0 l2
372 #| l2 l1
373 #| l1 l0
374 #| l0 root
375 #= root
376 #EOF
378 test_expect_success "head ^head no --merge-order" 'git-rev-list a3 ^a3' <<EOF
381 test_output_expect_success 'simple merge order (l5r1)' 'git-rev-list --merge-order --show-breaks l5r1' <<EOF
382 = l5r1
383 | r1
384 | r0
385 | alt_root
386 ^ l5
387 | l4
388 | l3
389 | a4
390 | c3
391 | c2
392 | c1
393 ^ b4
394 | b3
395 | b2
396 | b1
397 ^ a3
398 | a2
399 | a1
400 | a0
401 | l2
402 | l1
403 | l0
404 = root
407 test_output_expect_success 'simple merge order (r1l5)' 'git-rev-list --merge-order --show-breaks r1l5' <<EOF
408 = r1l5
409 | l5
410 | l4
411 | l3
412 | a4
413 | c3
414 | c2
415 | c1
416 ^ b4
417 | b3
418 | b2
419 | b1
420 ^ a3
421 | a2
422 | a1
423 | a0
424 | l2
425 | l1
426 | l0
427 | root
428 ^ r1
429 | r0
430 = alt_root
433 test_output_expect_success "don't print things unreachable from one branch" "git-rev-list a3 ^b3 --merge-order" <<EOF
439 test_output_expect_success "--merge-order a4 l3" "git-rev-list --merge-order a4 l3" <<EOF
456 root
462 test_done