3 # Copyright (c) 2005 Jon Seymour
6 test_description
='Tests git-rev-list --merge-order functionality'
11 # TODO: move the following block (upto --- end ...) into testlib.sh
13 [ -d .git
/refs
/tags
] || mkdir
-p .git
/refs
/tags
17 # Answer the sha1 has associated with the tag. The tag must exist in .git or .git/refs/tags
21 [ -f .git
/refs
/tags
/$_tag ] || error
"tag: \"$_tag\" does not exist"
22 cat .git
/refs
/tags
/$_tag
25 # Generate a commit using the text specified to make it unique and the tree
26 # named by the tag specified.
32 echo $_text | git-commit-tree $
(tag
$_tree) "$@"
35 # Save the output of a command into the tag specified. Prepend
36 # a substitution script for the tag onto the front of $sed_script
40 [ -n "$_tag" ] || error
"usage: save_tag tag commit-args ..."
42 "$@" >.git
/refs
/tags
/$_tag
43 sed_script
="s/$(tag $_tag)/$_tag/g${sed_script+;}$sed_script"
46 # Replace unhelpful sha1 hashses with their symbolic equivalents
52 # Execute a command after first saving, then setting the GIT_AUTHOR_EMAIL
53 # tag to a specified value. Restore the original value on return.
58 _save
=$GIT_AUTHOR_EMAIL
60 export GIT_AUTHOR_EMAIL
="$_author"
62 export GIT_AUTHOR_EMAIL
="$_save"
68 git-cat-file commit
$_commit |
sed -n "s/^committer .*> \([0-9]*\) .*/\1/p"
75 GIT_COMMITTER_DATE
=$_date "$@"
78 # Execute a command and suppress any error output.
88 if "$@" | entag
> $_name.actual
90 diff $_name.expected
$_name.actual
97 # Turn a reasonable test description into a reasonable test name.
98 # All alphanums translated into -'s which are then compressed and stripped
99 # from front and back.
100 name_from_description
()
102 tr "'" '-' |
tr '~`!@#$%^&*()_+={}[]|\;:"<>,/? ' '-' |
tr -s '-' |
tr '[A-Z]' '[a-z]' |
sed "s/^-*//;s/-*\$//"
106 # Execute the test described by the first argument, by eval'ing
107 # command line specified in the 2nd argument. Check the status code
108 # is zero and that the output matches the stream read from
110 test_output_expect_success
()
114 [ $# -eq 2 ] || error
"usage: test_output_expect_success description test <<EOF ... EOF"
115 _name
=$
(echo $_description | name_from_description
)
116 cat > $_name.expected
117 test_expect_success
"$_description" "check_output $_name $_test"
120 # --- end of stuff to move ---
122 # test-case specific test function
129 if ! (git-cat-file commit
$previous |
grep "^parent $next" >/dev
/null
)
141 "$@" |
sort |
uniq -d
148 "$@" 2>&1 |
grep "$args"
152 git-update-cache
--add path0
153 save_tag tree git-write-tree
154 on_committer_date
"1971-08-16 00:00:00" hide_error save_tag root unique_commit root tree
155 on_committer_date
"1971-08-16 00:00:01" save_tag l0 unique_commit l0 tree
-p root
156 on_committer_date
"1971-08-16 00:00:02" save_tag l1 unique_commit l1 tree
-p l0
157 on_committer_date
"1971-08-16 00:00:03" save_tag l2 unique_commit l2 tree
-p l1
158 on_committer_date
"1971-08-16 00:00:04" save_tag a0 unique_commit a0 tree
-p l2
159 on_committer_date
"1971-08-16 00:00:05" save_tag a1 unique_commit a1 tree
-p a0
160 on_committer_date
"1971-08-16 00:00:06" save_tag b1 unique_commit b1 tree
-p a0
161 on_committer_date
"1971-08-16 00:00:07" save_tag c1 unique_commit c1 tree
-p b1
162 on_committer_date
"1971-08-16 00:00:08" as_author foobar@example.com save_tag b2 unique_commit b2 tree
-p b1
163 on_committer_date
"1971-08-16 00:00:09" save_tag b3 unique_commit b2 tree
-p b2
164 on_committer_date
"1971-08-16 00:00:10" save_tag c2 unique_commit c2 tree
-p c1
-p b2
165 on_committer_date
"1971-08-16 00:00:11" save_tag c3 unique_commit c3 tree
-p c2
166 on_committer_date
"1971-08-16 00:00:12" save_tag a2 unique_commit a2 tree
-p a1
167 on_committer_date
"1971-08-16 00:00:13" save_tag a3 unique_commit a3 tree
-p a2
168 on_committer_date
"1971-08-16 00:00:14" save_tag b4 unique_commit b4 tree
-p b3
-p a3
169 on_committer_date
"1971-08-16 00:00:15" save_tag a4 unique_commit a4 tree
-p a3
-p b4
-p c3
170 on_committer_date
"1971-08-16 00:00:16" save_tag l3 unique_commit l3 tree
-p a4
171 on_committer_date
"1971-08-16 00:00:17" save_tag l4 unique_commit l4 tree
-p l3
172 on_committer_date
"1971-08-16 00:00:18" save_tag l5 unique_commit l5 tree
-p l4
173 on_committer_date
"1971-08-16 00:00:19" save_tag m1 unique_commit m1 tree
-p a4
-p c3
174 on_committer_date
"1971-08-16 00:00:20" save_tag m2 unique_commit m2 tree
-p c3
-p a4
176 # note: as of 20/6, it isn't possible to create duplicate parents, so this
179 #on_committer_date "1971-08-16 00:00:20" save_tag m3 unique_commit m3 tree -p c3 -p a4 -p c3
180 hide_error save_tag e1 as_author e@example.com unique_commit e1 tree
181 save_tag e2 as_author e@example.com unique_commit e2 tree
-p e1
182 save_tag f1 as_author f@example.com unique_commit f1 tree
-p e1
183 save_tag e3 as_author e@example.com unique_commit e3 tree
-p e2
184 save_tag f2 as_author f@example.com unique_commit f2 tree
-p f1
185 save_tag e4 as_author e@example.com unique_commit e4 tree
-p e3
-p f2
186 save_tag e5 as_author e@example.com unique_commit e5 tree
-p e4
187 save_tag f3 as_author f@example.com unique_commit f3 tree
-p f2
188 save_tag f4 as_author f@example.com unique_commit f4 tree
-p f3
189 save_tag e6 as_author e@example.com unique_commit e6 tree
-p e5
-p f4
190 save_tag f5 as_author f@example.com unique_commit f5 tree
-p f4
191 save_tag f6 as_author f@example.com unique_commit f6 tree
-p f5
-p e6
192 save_tag e7 as_author e@example.com unique_commit e7 tree
-p e6
193 save_tag e8 as_author e@example.com unique_commit e8 tree
-p e7
194 save_tag e9 as_author e@example.com unique_commit e9 tree
-p e8
195 save_tag f7 as_author f@example.com unique_commit f7 tree
-p f6
196 save_tag f8 as_author f@example.com unique_commit f8 tree
-p f7
197 save_tag f9 as_author f@example.com unique_commit f9 tree
-p f8
198 save_tag e10 as_author e@example.com unique_commit e1 tree
-p e9
-p f8
200 hide_error save_tag g0 unique_commit g0 tree
201 save_tag g1 unique_commit g1 tree
-p g0
202 save_tag h1 unique_commit g2 tree
-p g0
203 save_tag g2 unique_commit g3 tree
-p g1
-p h1
204 save_tag h2 unique_commit g4 tree
-p g2
205 save_tag g3 unique_commit g5 tree
-p g2
206 save_tag g4 unique_commit g6 tree
-p g3
-p h2
211 # cd to t/trash and use
213 # git-rev-list ... 2>&1 | sed "$(cat sed.script)"
215 # if you ever want to manually debug the operation of git-rev-list
217 echo $sed_script > sed.
script
219 test_expect_success
'rev-list has correct number of entries' 'git-rev-list HEAD | wc -l | tr -s " "' <<EOF
223 normal_adjacency_count
=$
(git-rev-list HEAD | check_adjacency |
grep -c "\^" |
tr -d ' ')
224 merge_order_adjacency_count
=$
(git-rev-list
--merge-order HEAD | check_adjacency |
grep -c "\^" |
tr -d ' ')
225 test_expect_success
'--merge-order produces as many or fewer discontinuities' '[ $merge_order_adjacency_count -le $normal_adjacency_count ]'
226 test_output_expect_success
'simple merge order' 'git-rev-list --merge-order --show-breaks HEAD' <<EOF
248 test_output_expect_success
'two diamonds merge order (g6)' 'git-rev-list --merge-order --show-breaks g4' <<EOF
258 test_output_expect_success
'multiple heads' 'git-rev-list --merge-order a3 b3 c3' <<EOF
275 test_output_expect_success
'multiple heads, prune at a1' 'git-rev-list --merge-order a3 b3 c3 ^a1' <<EOF
286 test_output_expect_success
'multiple heads, prune at l1' 'git-rev-list --merge-order a3 b3 c3 ^l1' <<EOF
300 test_output_expect_success
'cross-epoch, head at l5, prune at l1' 'git-rev-list --merge-order l5 ^l1' <<EOF
319 test_output_expect_success
'duplicated head arguments' 'git-rev-list --merge-order l5 l5 ^l1' <<EOF
338 test_output_expect_success
'prune near merge' 'git-rev-list --merge-order a4 ^c3' <<EOF
347 test_output_expect_success
"head has no parent" 'git-rev-list --merge-order --show-breaks root' <<EOF
351 test_output_expect_success
"two nodes - one head, one base" 'git-rev-list --merge-order --show-breaks l0' <<EOF
356 test_output_expect_success
"three nodes one head, one internal, one base" 'git-rev-list --merge-order --show-breaks l1' <<EOF
362 test_output_expect_success
"linear prune l2 ^root" 'git-rev-list --merge-order --show-breaks l2 ^root' <<EOF
368 test_output_expect_success
"linear prune l2 ^l0" 'git-rev-list --merge-order --show-breaks l2 ^l0' <<EOF
373 test_output_expect_success
"linear prune l2 ^l1" 'git-rev-list --merge-order --show-breaks l2 ^l1' <<EOF
377 test_output_expect_success
"linear prune l5 ^a4" 'git-rev-list --merge-order --show-breaks l5 ^a4' <<EOF
383 test_output_expect_success
"linear prune l5 ^l3" 'git-rev-list --merge-order --show-breaks l5 ^l3' <<EOF
388 test_output_expect_success
"linear prune l5 ^l4" 'git-rev-list --merge-order --show-breaks l5 ^l4' <<EOF
392 test_output_expect_success
"max-count 10 - merge order" 'git-rev-list --merge-order --show-breaks --max-count=10 l5' <<EOF
405 test_output_expect_success
"max-count 10 - non merge order" 'git-rev-list --max-count=10 l5 | sort' <<EOF
418 test_output_expect_success
'--max-age=c3, no --merge-order' "git-rev-list --max-age=$(commit_date c3) l5" <<EOF
429 test_output_expect_success
'--max-age=c3, --merge-order' "git-rev-list --merge-order --max-age=$(commit_date c3) l5" <<EOF
440 test_output_expect_success
'one specified head reachable from another a4, c3, --merge-order' "list_duplicates git-rev-list --merge-order a4 c3" <<EOF
443 test_output_expect_success
'one specified head reachable from another c3, a4, --merge-order' "list_duplicates git-rev-list --merge-order c3 a4" <<EOF
446 test_output_expect_success
'one specified head reachable from another a4, c3, no --merge-order' "list_duplicates git-rev-list a4 c3" <<EOF
449 test_output_expect_success
'one specified head reachable from another c3, a4, no --merge-order' "list_duplicates git-rev-list c3 a4" <<EOF
452 test_output_expect_success
'graph with c3 and a4 parents of head' "list_duplicates git-rev-list m1" <<EOF
455 test_output_expect_success
'graph with a4 and c3 parents of head' "list_duplicates git-rev-list m2" <<EOF
458 test_expect_success
"head ^head --merge-order" 'git-rev-list --merge-order --show-breaks a3 ^a3' <<EOF
462 # can't test this now - duplicate parents can't be created
464 #test_output_expect_success 'duplicate parents' 'git-rev-list --parents --merge-order --show-breaks m3' <<EOF
484 test_expect_success
"head ^head no --merge-order" 'git-rev-list a3 ^a3' <<EOF