t / t6001-rev-list-merge-order.shon commit Merge branch 'fixes' (8ac3a61)
   1#!/bin/sh
   2#
   3# Copyright (c) 2005 Jon Seymour
   4#
   5
   6test_description='Tests git-rev-list --merge-order functionality'
   7
   8. ./test-lib.sh
   9. ../t6000lib.sh # t6xxx specific functions
  10
  11if git-rev-list --merge-order 2>&1 | grep 'OpenSSL not linked' >/dev/null
  12then
  13    test_expect_success 'skipping merge-order test' :
  14    test_done
  15    exit
  16fi    
  17
  18# test-case specific test function
  19check_adjacency()
  20{
  21    read previous
  22    echo "= $previous"
  23    while read next
  24    do
  25        if ! (git-cat-file commit $previous | grep "^parent $next" >/dev/null)
  26        then
  27            echo "^ $next"
  28        else
  29            echo "| $next"
  30        fi
  31        previous=$next
  32    done
  33}
  34
  35list_duplicates()
  36{
  37    "$@" | sort | uniq -d
  38}
  39
  40grep_stderr()
  41{
  42    args=$1
  43    shift 1
  44    "$@" 2>&1 | grep "$args"
  45}
  46
  47date >path0
  48git-update-index --add path0
  49save_tag tree git-write-tree
  50on_committer_date "1971-08-16 00:00:00" hide_error save_tag root unique_commit root tree
  51on_committer_date "1971-08-16 00:00:01" save_tag l0 unique_commit l0 tree -p root
  52on_committer_date "1971-08-16 00:00:02" save_tag l1 unique_commit l1 tree -p l0
  53on_committer_date "1971-08-16 00:00:03" save_tag l2 unique_commit l2 tree -p l1
  54on_committer_date "1971-08-16 00:00:04" save_tag a0 unique_commit a0 tree -p l2
  55on_committer_date "1971-08-16 00:00:05" save_tag a1 unique_commit a1 tree -p a0
  56on_committer_date "1971-08-16 00:00:06" save_tag b1 unique_commit b1 tree -p a0
  57on_committer_date "1971-08-16 00:00:07" save_tag c1 unique_commit c1 tree -p b1
  58on_committer_date "1971-08-16 00:00:08" as_author foobar@example.com save_tag b2 unique_commit b2 tree -p b1
  59on_committer_date "1971-08-16 00:00:09" save_tag b3 unique_commit b2 tree -p b2
  60on_committer_date "1971-08-16 00:00:10" save_tag c2 unique_commit c2 tree -p c1 -p b2
  61on_committer_date "1971-08-16 00:00:11" save_tag c3 unique_commit c3 tree -p c2
  62on_committer_date "1971-08-16 00:00:12" save_tag a2 unique_commit a2 tree -p a1
  63on_committer_date "1971-08-16 00:00:13" save_tag a3 unique_commit a3 tree -p a2
  64on_committer_date "1971-08-16 00:00:14" save_tag b4 unique_commit b4 tree -p b3 -p a3
  65on_committer_date "1971-08-16 00:00:15" save_tag a4 unique_commit a4 tree -p a3 -p b4 -p c3
  66on_committer_date "1971-08-16 00:00:16" save_tag l3 unique_commit l3 tree -p a4
  67on_committer_date "1971-08-16 00:00:17" save_tag l4 unique_commit l4 tree -p l3
  68on_committer_date "1971-08-16 00:00:18" save_tag l5 unique_commit l5 tree -p l4
  69on_committer_date "1971-08-16 00:00:19" save_tag m1 unique_commit m1 tree -p a4 -p c3
  70on_committer_date "1971-08-16 00:00:20" save_tag m2 unique_commit m2 tree -p c3 -p a4
  71on_committer_date "1971-08-16 00:00:21" hide_error save_tag alt_root unique_commit alt_root tree
  72on_committer_date "1971-08-16 00:00:22" save_tag r0 unique_commit r0 tree -p alt_root
  73on_committer_date "1971-08-16 00:00:23" save_tag r1 unique_commit r1 tree -p r0
  74on_committer_date "1971-08-16 00:00:24" save_tag l5r1 unique_commit l5r1 tree -p l5 -p r1
  75on_committer_date "1971-08-16 00:00:25" save_tag r1l5 unique_commit r1l5 tree -p r1 -p l5
  76
  77
  78#
  79# note: as of 20/6, it isn't possible to create duplicate parents, so this
  80# can't be tested.
  81#
  82#on_committer_date "1971-08-16 00:00:20" save_tag m3 unique_commit m3 tree -p c3 -p a4 -p c3
  83hide_error save_tag e1 as_author e@example.com unique_commit e1 tree
  84save_tag e2 as_author e@example.com unique_commit e2 tree -p e1
  85save_tag f1 as_author f@example.com unique_commit f1 tree -p e1
  86save_tag e3 as_author e@example.com unique_commit e3 tree -p e2
  87save_tag f2 as_author f@example.com unique_commit f2 tree -p f1
  88save_tag e4 as_author e@example.com unique_commit e4 tree -p e3 -p f2
  89save_tag e5 as_author e@example.com unique_commit e5 tree -p e4
  90save_tag f3 as_author f@example.com unique_commit f3 tree -p f2
  91save_tag f4 as_author f@example.com unique_commit f4 tree -p f3
  92save_tag e6 as_author e@example.com unique_commit e6 tree -p e5 -p f4
  93save_tag f5 as_author f@example.com unique_commit f5 tree -p f4
  94save_tag f6 as_author f@example.com unique_commit f6 tree -p f5 -p e6
  95save_tag e7 as_author e@example.com unique_commit e7 tree -p e6
  96save_tag e8 as_author e@example.com unique_commit e8 tree -p e7
  97save_tag e9 as_author e@example.com unique_commit e9 tree -p e8
  98save_tag f7 as_author f@example.com unique_commit f7 tree -p f6
  99save_tag f8 as_author f@example.com unique_commit f8 tree -p f7
 100save_tag f9 as_author f@example.com unique_commit f9 tree -p f8
 101save_tag e10 as_author e@example.com unique_commit e1 tree -p e9 -p f8
 102
 103hide_error save_tag g0 unique_commit g0 tree
 104save_tag g1 unique_commit g1 tree -p g0
 105save_tag h1 unique_commit g2 tree -p g0
 106save_tag g2 unique_commit g3 tree -p g1 -p h1
 107save_tag h2 unique_commit g4 tree -p g2
 108save_tag g3 unique_commit g5 tree -p g2
 109save_tag g4 unique_commit g6 tree -p g3 -p h2
 110
 111git-update-ref HEAD $(tag l5)
 112
 113test_expect_success 'rev-list has correct number of entries' 'git-rev-list HEAD | wc -l | tr -s " "' <<EOF
 11419
 115EOF
 116
 117normal_adjacency_count=$(git-rev-list HEAD | check_adjacency | grep -c "\^" | tr -d ' ')
 118merge_order_adjacency_count=$(git-rev-list --merge-order HEAD | check_adjacency | grep -c "\^" | tr -d ' ')
 119test_expect_success '--merge-order produces as many or fewer discontinuities' '[ $merge_order_adjacency_count -le $normal_adjacency_count ]'
 120test_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
 140EOF
 141
 142test_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
 150EOF
 151
 152test_output_expect_success 'multiple heads' 'git-rev-list --merge-order a3 b3 c3' <<EOF
 153c3
 154c2
 155c1
 156b3
 157b2
 158b1
 159a3
 160a2
 161a1
 162a0
 163l2
 164l1
 165l0
 166root
 167EOF
 168
 169test_output_expect_success 'multiple heads, prune at a1' 'git-rev-list --merge-order a3 b3 c3 ^a1' <<EOF
 170c3
 171c2
 172c1
 173b3
 174b2
 175b1
 176a3
 177a2
 178EOF
 179
 180test_output_expect_success 'multiple heads, prune at l1' 'git-rev-list --merge-order a3 b3 c3 ^l1' <<EOF
 181c3
 182c2
 183c1
 184b3
 185b2
 186b1
 187a3
 188a2
 189a1
 190a0
 191l2
 192EOF
 193
 194test_output_expect_success 'cross-epoch, head at l5, prune at l1' 'git-rev-list --merge-order l5 ^l1' <<EOF
 195l5
 196l4
 197l3
 198a4
 199c3
 200c2
 201c1
 202b4
 203b3
 204b2
 205b1
 206a3
 207a2
 208a1
 209a0
 210l2
 211EOF
 212
 213test_output_expect_success 'duplicated head arguments' 'git-rev-list --merge-order l5 l5 ^l1' <<EOF
 214l5
 215l4
 216l3
 217a4
 218c3
 219c2
 220c1
 221b4
 222b3
 223b2
 224b1
 225a3
 226a2
 227a1
 228a0
 229l2
 230EOF
 231
 232test_output_expect_success 'prune near merge' 'git-rev-list --merge-order a4 ^c3' <<EOF
 233a4
 234b4
 235b3
 236a3
 237a2
 238a1
 239EOF
 240
 241test_output_expect_success "head has no parent" 'git-rev-list --merge-order --show-breaks root' <<EOF
 242= root
 243EOF
 244
 245test_output_expect_success "two nodes - one head, one base" 'git-rev-list --merge-order --show-breaks l0' <<EOF
 246= l0
 247= root
 248EOF
 249
 250test_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
 254EOF
 255
 256test_output_expect_success "linear prune l2 ^root" 'git-rev-list --merge-order --show-breaks l2 ^root' <<EOF
 257^ l2
 258| l1
 259| l0
 260EOF
 261
 262test_output_expect_success "linear prune l2 ^l0" 'git-rev-list --merge-order --show-breaks l2 ^l0' <<EOF
 263^ l2
 264| l1
 265EOF
 266
 267test_output_expect_success "linear prune l2 ^l1" 'git-rev-list --merge-order --show-breaks l2 ^l1' <<EOF
 268^ l2
 269EOF
 270
 271test_output_expect_success "linear prune l5 ^a4" 'git-rev-list --merge-order --show-breaks l5 ^a4' <<EOF
 272^ l5
 273| l4
 274| l3
 275EOF
 276
 277test_output_expect_success "linear prune l5 ^l3" 'git-rev-list --merge-order --show-breaks l5 ^l3' <<EOF
 278^ l5
 279| l4
 280EOF
 281
 282test_output_expect_success "linear prune l5 ^l4" 'git-rev-list --merge-order --show-breaks l5 ^l4' <<EOF
 283^ l5
 284EOF
 285
 286test_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
 297EOF
 298
 299test_output_expect_success "max-count 10 - non merge order" 'git-rev-list --max-count=10 l5' <<EOF
 300l5
 301l4
 302l3
 303a4
 304b4
 305a3
 306a2
 307c3
 308c2
 309b3
 310EOF
 311
 312test_output_expect_success '--max-age=c3, no --merge-order' "git-rev-list --max-age=$(commit_date c3) l5" <<EOF
 313l5
 314l4
 315l3
 316a4
 317b4
 318a3
 319a2
 320c3
 321EOF
 322
 323test_output_expect_success '--max-age=c3, --merge-order' "git-rev-list --merge-order --max-age=$(commit_date c3) l5" <<EOF
 324l5
 325l4
 326l3
 327a4
 328c3
 329b4
 330a3
 331a2
 332EOF
 333
 334test_output_expect_success 'one specified head reachable from another a4, c3, --merge-order' "list_duplicates git-rev-list --merge-order a4 c3" <<EOF
 335EOF
 336
 337test_output_expect_success 'one specified head reachable from another c3, a4, --merge-order' "list_duplicates git-rev-list --merge-order c3 a4" <<EOF
 338EOF
 339
 340test_output_expect_success 'one specified head reachable from another a4, c3, no --merge-order' "list_duplicates git-rev-list a4 c3" <<EOF
 341EOF
 342
 343test_output_expect_success 'one specified head reachable from another c3, a4, no --merge-order' "list_duplicates git-rev-list c3 a4" <<EOF
 344EOF
 345
 346test_output_expect_success 'graph with c3 and a4 parents of head' "list_duplicates git-rev-list m1" <<EOF
 347EOF
 348
 349test_output_expect_success 'graph with a4 and c3 parents of head' "list_duplicates git-rev-list m2" <<EOF
 350EOF
 351
 352test_expect_success "head ^head --merge-order" 'git-rev-list --merge-order --show-breaks a3 ^a3' <<EOF
 353EOF
 354
 355#
 356# can't test this now - duplicate parents can't be created
 357#
 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
 377
 378test_expect_success "head ^head no --merge-order" 'git-rev-list a3 ^a3' <<EOF
 379EOF
 380
 381test_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
 405EOF
 406
 407test_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
 431EOF
 432
 433test_output_expect_success "don't print things unreachable from one branch" "git-rev-list a3 ^b3 --merge-order" <<EOF
 434a3
 435a2
 436a1
 437EOF
 438
 439test_output_expect_success "--merge-order a4 l3" "git-rev-list --merge-order a4 l3" <<EOF
 440l3
 441a4
 442c3
 443c2
 444c1
 445b4
 446b3
 447b2
 448b1
 449a3
 450a2
 451a1
 452a0
 453l2
 454l1
 455l0
 456root
 457EOF
 458
 459#
 460#
 461
 462test_done