t/t6001-rev-list-merge-order.sh

   1 #!/bin/sh
   2 #
   3 # Copyright (c) 2005 Jon Seymour
   4 #
   5
   6 test_description='Tests git-rev-list --merge-order functionality'
   7
   8 . ./test-lib.sh
   9 . ../t6000-lib.sh # t6xxx specific functions
  10
  11 # test-case specific test function
  12 check_adjacency()
  13 {
  14     read previous
  15     echo "= $previous"
  16     while read next
  17     do
  18         if ! (git-cat-file commit $previous | grep "^parent $next" >/dev/null)
  19         then
  20             echo "^ $next"
  21         else
  22             echo "| $next"
  23         fi
  24         previous=$next
  25     done
  26 }
  27
  28 list_duplicates()
  29 {
  30     "$@" | sort | uniq -d
  31 }
  32
  33 grep_stderr()
  34 {
  35     args=$1
  36     shift 1
  37     "$@" 2>&1 | grep "$args"
  38 }
  39
  40 date >path0
  41 git-update-cache --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
  69
  70
  71 #
  72 # note: as of 20/6, it isn't possible to create duplicate parents, so this
  73 # can't be tested.
  74 #
  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
  95
  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
 103
 104 tag l5 > .git/HEAD
 105
 106 test_expect_success 'rev-list has correct number of entries' 'git-rev-list HEAD | wc -l | tr -s " "' <<EOF
 107 19
 108 EOF
 109
 110 normal_adjacency_count=$(git-rev-list HEAD | check_adjacency | grep -c "\^" | tr -d ' ')
 111 merge_order_adjacency_count=$(git-rev-list --merge-order HEAD | check_adjacency | grep -c "\^" | tr -d ' ')
 112 test_expect_success '--merge-order produces as many or fewer discontinuities' '[ $merge_order_adjacency_count -le $normal_adjacency_count ]'
 113 test_output_expect_success 'simple merge order' 'git-rev-list --merge-order --show-breaks HEAD' <<EOF
 114 = l5
 115 | l4
 116 | l3
 117 = a4
 118 | c3
 119 | c2
 120 | c1
 121 ^ b4
 122 | b3
 123 | b2
 124 | b1
 125 ^ a3
 126 | a2
 127 | a1
 128 = a0
 129 | l2
 130 | l1
 131 | l0
 132 = root
 133 EOF
 134
 135 test_output_expect_success 'two diamonds merge order (g6)' 'git-rev-list --merge-order --show-breaks g4' <<EOF
 136 = g4
 137 | h2
 138 ^ g3
 139 = g2
 140 | h1
 141 ^ g1
 142 = g0
 143 EOF
 144
 145 test_output_expect_success 'multiple heads' 'git-rev-list --merge-order a3 b3 c3' <<EOF
 146 c3
 147 c2
 148 c1
 149 b3
 150 b2
 151 b1
 152 a3
 153 a2
 154 a1
 155 a0
 156 l2
 157 l1
 158 l0
 159 root
 160 EOF
 161
 162 test_output_expect_success 'multiple heads, prune at a1' 'git-rev-list --merge-order a3 b3 c3 ^a1' <<EOF
 163 c3
 164 c2
 165 c1
 166 b3
 167 b2
 168 b1
 169 a3
 170 a2
 171 EOF
 172
 173 test_output_expect_success 'multiple heads, prune at l1' 'git-rev-list --merge-order a3 b3 c3 ^l1' <<EOF
 174 c3
 175 c2
 176 c1
 177 b3
 178 b2
 179 b1
 180 a3
 181 a2
 182 a1
 183 a0
 184 l2
 185 EOF
 186
 187 test_output_expect_success 'cross-epoch, head at l5, prune at l1' 'git-rev-list --merge-order l5 ^l1' <<EOF
 188 l5
 189 l4
 190 l3
 191 a4
 192 c3
 193 c2
 194 c1
 195 b4
 196 b3
 197 b2
 198 b1
 199 a3
 200 a2
 201 a1
 202 a0
 203 l2
 204 EOF
 205
 206 test_output_expect_success 'duplicated head arguments' 'git-rev-list --merge-order l5 l5 ^l1' <<EOF
 207 l5
 208 l4
 209 l3
 210 a4
 211 c3
 212 c2
 213 c1
 214 b4
 215 b3
 216 b2
 217 b1
 218 a3
 219 a2
 220 a1
 221 a0
 222 l2
 223 EOF
 224
 225 test_output_expect_success 'prune near merge' 'git-rev-list --merge-order a4 ^c3' <<EOF
 226 a4
 227 b4
 228 b3
 229 a3
 230 a2
 231 a1
 232 EOF
 233
 234 test_output_expect_success "head has no parent" 'git-rev-list --merge-order --show-breaks root' <<EOF
 235 = root
 236 EOF
 237
 238 test_output_expect_success "two nodes - one head, one base" 'git-rev-list --merge-order --show-breaks l0' <<EOF
 239 = l0
 240 = root
 241 EOF
 242
 243 test_output_expect_success "three nodes one head, one internal, one base" 'git-rev-list --merge-order --show-breaks l1' <<EOF
 244 = l1
 245 | l0
 246 = root
 247 EOF
 248
 249 test_output_expect_success "linear prune l2 ^root" 'git-rev-list --merge-order --show-breaks l2 ^root' <<EOF
 250 ^ l2
 251 | l1
 252 | l0
 253 EOF
 254
 255 test_output_expect_success "linear prune l2 ^l0" 'git-rev-list --merge-order --show-breaks l2 ^l0' <<EOF
 256 ^ l2
 257 | l1
 258 EOF
 259
 260 test_output_expect_success "linear prune l2 ^l1" 'git-rev-list --merge-order --show-breaks l2 ^l1' <<EOF
 261 ^ l2
 262 EOF
 263
 264 test_output_expect_success "linear prune l5 ^a4" 'git-rev-list --merge-order --show-breaks l5 ^a4' <<EOF
 265 ^ l5
 266 | l4
 267 | l3
 268 EOF
 269
 270 test_output_expect_success "linear prune l5 ^l3" 'git-rev-list --merge-order --show-breaks l5 ^l3' <<EOF
 271 ^ l5
 272 | l4
 273 EOF
 274
 275 test_output_expect_success "linear prune l5 ^l4" 'git-rev-list --merge-order --show-breaks l5 ^l4' <<EOF
 276 ^ l5
 277 EOF
 278
 279 test_output_expect_success "max-count 10 - merge order" 'git-rev-list --merge-order --show-breaks --max-count=10 l5' <<EOF
 280 = l5
 281 | l4
 282 | l3
 283 = a4
 284 | c3
 285 | c2
 286 | c1
 287 ^ b4
 288 | b3
 289 | b2
 290 EOF
 291
 292 test_output_expect_success "max-count 10 - non merge order" 'git-rev-list --max-count=10 l5' <<EOF
 293 l5
 294 l4
 295 l3
 296 a4
 297 b4
 298 a3
 299 a2
 300 c3
 301 c2
 302 b3
 303 EOF
 304
 305 test_output_expect_success '--max-age=c3, no --merge-order' "git-rev-list --max-age=$(commit_date c3) l5" <<EOF
 306 l5
 307 l4
 308 l3
 309 a4
 310 b4
 311 a3
 312 a2
 313 c3
 314 EOF
 315
 316 test_output_expect_success '--max-age=c3, --merge-order' "git-rev-list --merge-order --max-age=$(commit_date c3) l5" <<EOF
 317 l5
 318 l4
 319 l3
 320 a4
 321 c3
 322 b4
 323 a3
 324 a2
 325 EOF
 326
 327 test_output_expect_success 'one specified head reachable from another a4, c3, --merge-order' "list_duplicates git-rev-list --merge-order a4 c3" <<EOF
 328 EOF
 329
 330 test_output_expect_success 'one specified head reachable from another c3, a4, --merge-order' "list_duplicates git-rev-list --merge-order c3 a4" <<EOF
 331 EOF
 332
 333 test_output_expect_success 'one specified head reachable from another a4, c3, no --merge-order' "list_duplicates git-rev-list a4 c3" <<EOF
 334 EOF
 335
 336 test_output_expect_success 'one specified head reachable from another c3, a4, no --merge-order' "list_duplicates git-rev-list c3 a4" <<EOF
 337 EOF
 338
 339 test_output_expect_success 'graph with c3 and a4 parents of head' "list_duplicates git-rev-list m1" <<EOF
 340 EOF
 341
 342 test_output_expect_success 'graph with a4 and c3 parents of head' "list_duplicates git-rev-list m2" <<EOF
 343 EOF
 344
 345 test_expect_success "head ^head --merge-order" 'git-rev-list --merge-order --show-breaks a3 ^a3' <<EOF
 346 EOF
 347
 348 #
 349 # can't test this now - duplicate parents can't be created
 350 #
 351 #test_output_expect_success 'duplicate parents' 'git-rev-list --parents --merge-order --show-breaks m3' <<EOF
 352 #= m3 c3 a4 c3
 353 #| a4 c3 b4 a3
 354 #| b4 a3 b3
 355 #| b3 b2
 356 #^ a3 a2
 357 #| a2 a1
 358 #| a1 a0
 359 #^ c3 c2
 360 #| c2 b2 c1
 361 #| b2 b1
 362 #^ c1 b1
 363 #| b1 a0
 364 #= a0 l2
 365 #| l2 l1
 366 #| l1 l0
 367 #| l0 root
 368 #= root
 369 #EOF
 370
 371 test_expect_success "head ^head no --merge-order" 'git-rev-list a3 ^a3' <<EOF
 372 EOF
 373
 374 test_output_expect_success 'simple merge order (l5r1)' 'git-rev-list --merge-order --show-breaks l5r1' <<EOF
 375 = l5r1
 376 | r1
 377 | r0
 378 | alt_root
 379 ^ l5
 380 | l4
 381 | l3
 382 | a4
 383 | c3
 384 | c2
 385 | c1
 386 ^ b4
 387 | b3
 388 | b2
 389 | b1
 390 ^ a3
 391 | a2
 392 | a1
 393 | a0
 394 | l2
 395 | l1
 396 | l0
 397 = root
 398 EOF
 399
 400 test_output_expect_success 'simple merge order (r1l5)' 'git-rev-list --merge-order --show-breaks r1l5' <<EOF
 401 = r1l5
 402 | l5
 403 | l4
 404 | l3
 405 | a4
 406 | c3
 407 | c2
 408 | c1
 409 ^ b4
 410 | b3
 411 | b2
 412 | b1
 413 ^ a3
 414 | a2
 415 | a1
 416 | a0
 417 | l2
 418 | l1
 419 | l0
 420 | root
 421 ^ r1
 422 | r0
 423 = alt_root
 424 EOF
 425
 426 test_output_expect_success "don't print things unreachable from one branch" "git-rev-list a3 ^b3 --merge-order" <<EOF
 427 a3
 428 a2
 429 a1
 430 EOF
 431
 432 test_output_expect_success "--merge-order a4 l3" "git-rev-list --merge-order a4 l3" <<EOF
 433 l3
 434 a4
 435 c3
 436 c2
 437 c1
 438 b4
 439 b3
 440 b2
 441 b1
 442 a3
 443 a2
 444 a1
 445 a0
 446 l2
 447 l1
 448 l0
 449 root
 450 EOF
 451
 452 #
 453 #
 454
 455 test_done