t / t6001-rev-list-merge-order.shon commit [PATCH] Introduce unit tests for git-rev-list --bisect (8904591)
   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. ../t6000-lib.sh # t6xxx specific functions
  10
  11# test-case specific test function
  12check_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
  28list_duplicates()
  29{
  30    "$@" | sort | uniq -d
  31}
  32
  33grep_stderr()
  34{
  35    args=$1
  36    shift 1
  37    "$@" 2>&1 | grep "$args"
  38}
  39
  40date >path0
  41git-update-cache --add path0
  42save_tag tree git-write-tree
  43on_committer_date "1971-08-16 00:00:00" hide_error save_tag root unique_commit root tree
  44on_committer_date "1971-08-16 00:00:01" save_tag l0 unique_commit l0 tree -p root
  45on_committer_date "1971-08-16 00:00:02" save_tag l1 unique_commit l1 tree -p l0
  46on_committer_date "1971-08-16 00:00:03" save_tag l2 unique_commit l2 tree -p l1
  47on_committer_date "1971-08-16 00:00:04" save_tag a0 unique_commit a0 tree -p l2
  48on_committer_date "1971-08-16 00:00:05" save_tag a1 unique_commit a1 tree -p a0
  49on_committer_date "1971-08-16 00:00:06" save_tag b1 unique_commit b1 tree -p a0
  50on_committer_date "1971-08-16 00:00:07" save_tag c1 unique_commit c1 tree -p b1
  51on_committer_date "1971-08-16 00:00:08" as_author foobar@example.com save_tag b2 unique_commit b2 tree -p b1
  52on_committer_date "1971-08-16 00:00:09" save_tag b3 unique_commit b2 tree -p b2
  53on_committer_date "1971-08-16 00:00:10" save_tag c2 unique_commit c2 tree -p c1 -p b2
  54on_committer_date "1971-08-16 00:00:11" save_tag c3 unique_commit c3 tree -p c2
  55on_committer_date "1971-08-16 00:00:12" save_tag a2 unique_commit a2 tree -p a1
  56on_committer_date "1971-08-16 00:00:13" save_tag a3 unique_commit a3 tree -p a2
  57on_committer_date "1971-08-16 00:00:14" save_tag b4 unique_commit b4 tree -p b3 -p a3
  58on_committer_date "1971-08-16 00:00:15" save_tag a4 unique_commit a4 tree -p a3 -p b4 -p c3
  59on_committer_date "1971-08-16 00:00:16" save_tag l3 unique_commit l3 tree -p a4
  60on_committer_date "1971-08-16 00:00:17" save_tag l4 unique_commit l4 tree -p l3
  61on_committer_date "1971-08-16 00:00:18" save_tag l5 unique_commit l5 tree -p l4
  62on_committer_date "1971-08-16 00:00:19" save_tag m1 unique_commit m1 tree -p a4 -p c3
  63on_committer_date "1971-08-16 00:00:20" save_tag m2 unique_commit m2 tree -p c3 -p a4
  64on_committer_date "1971-08-16 00:00:21" hide_error save_tag alt_root unique_commit alt_root tree
  65on_committer_date "1971-08-16 00:00:22" save_tag r0 unique_commit r0 tree -p alt_root
  66on_committer_date "1971-08-16 00:00:23" save_tag r1 unique_commit r1 tree -p r0
  67on_committer_date "1971-08-16 00:00:24" save_tag l5r1 unique_commit l5r1 tree -p l5 -p r1
  68on_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
  76hide_error save_tag e1 as_author e@example.com unique_commit e1 tree
  77save_tag e2 as_author e@example.com unique_commit e2 tree -p e1
  78save_tag f1 as_author f@example.com unique_commit f1 tree -p e1
  79save_tag e3 as_author e@example.com unique_commit e3 tree -p e2
  80save_tag f2 as_author f@example.com unique_commit f2 tree -p f1
  81save_tag e4 as_author e@example.com unique_commit e4 tree -p e3 -p f2
  82save_tag e5 as_author e@example.com unique_commit e5 tree -p e4
  83save_tag f3 as_author f@example.com unique_commit f3 tree -p f2
  84save_tag f4 as_author f@example.com unique_commit f4 tree -p f3
  85save_tag e6 as_author e@example.com unique_commit e6 tree -p e5 -p f4
  86save_tag f5 as_author f@example.com unique_commit f5 tree -p f4
  87save_tag f6 as_author f@example.com unique_commit f6 tree -p f5 -p e6
  88save_tag e7 as_author e@example.com unique_commit e7 tree -p e6
  89save_tag e8 as_author e@example.com unique_commit e8 tree -p e7
  90save_tag e9 as_author e@example.com unique_commit e9 tree -p e8
  91save_tag f7 as_author f@example.com unique_commit f7 tree -p f6
  92save_tag f8 as_author f@example.com unique_commit f8 tree -p f7
  93save_tag f9 as_author f@example.com unique_commit f9 tree -p f8
  94save_tag e10 as_author e@example.com unique_commit e1 tree -p e9 -p f8
  95
  96hide_error save_tag g0 unique_commit g0 tree
  97save_tag g1 unique_commit g1 tree -p g0
  98save_tag h1 unique_commit g2 tree -p g0
  99save_tag g2 unique_commit g3 tree -p g1 -p h1
 100save_tag h2 unique_commit g4 tree -p g2
 101save_tag g3 unique_commit g5 tree -p g2
 102save_tag g4 unique_commit g6 tree -p g3 -p h2
 103
 104tag l5 > .git/HEAD
 105
 106#
 107# cd to t/trash and use 
 108#
 109#    git-rev-list ... 2>&1 | sed "$(cat sed.script)" 
 110#
 111# if you ever want to manually debug the operation of git-rev-list
 112#
 113echo $sed_script > sed.script
 114
 115test_expect_success 'rev-list has correct number of entries' 'git-rev-list HEAD | wc -l | tr -s " "' <<EOF
 11619
 117EOF
 118
 119normal_adjacency_count=$(git-rev-list HEAD | check_adjacency | grep -c "\^" | tr -d ' ')
 120merge_order_adjacency_count=$(git-rev-list --merge-order HEAD | check_adjacency | grep -c "\^" | tr -d ' ')
 121test_expect_success '--merge-order produces as many or fewer discontinuities' '[ $merge_order_adjacency_count -le $normal_adjacency_count ]'
 122test_output_expect_success 'simple merge order' 'git-rev-list --merge-order --show-breaks HEAD' <<EOF
 123= l5
 124| l4
 125| l3
 126= a4
 127| c3
 128| c2
 129| c1
 130^ b4
 131| b3
 132| b2
 133| b1
 134^ a3
 135| a2
 136| a1
 137= a0
 138| l2
 139| l1
 140| l0
 141= root
 142EOF
 143
 144test_output_expect_success 'two diamonds merge order (g6)' 'git-rev-list --merge-order --show-breaks g4' <<EOF
 145= g4
 146| h2
 147^ g3
 148= g2
 149| h1
 150^ g1
 151= g0
 152EOF
 153
 154test_output_expect_success 'multiple heads' 'git-rev-list --merge-order a3 b3 c3' <<EOF
 155c3
 156c2
 157c1
 158b3
 159b2
 160b1
 161a3
 162a2
 163a1
 164a0
 165l2
 166l1
 167l0
 168root
 169EOF
 170
 171test_output_expect_success 'multiple heads, prune at a1' 'git-rev-list --merge-order a3 b3 c3 ^a1' <<EOF
 172c3
 173c2
 174c1
 175b3
 176b2
 177b1
 178a3
 179a2
 180EOF
 181
 182test_output_expect_success 'multiple heads, prune at l1' 'git-rev-list --merge-order a3 b3 c3 ^l1' <<EOF
 183c3
 184c2
 185c1
 186b3
 187b2
 188b1
 189a3
 190a2
 191a1
 192a0
 193l2
 194EOF
 195
 196test_output_expect_success 'cross-epoch, head at l5, prune at l1' 'git-rev-list --merge-order l5 ^l1' <<EOF
 197l5
 198l4
 199l3
 200a4
 201c3
 202c2
 203c1
 204b4
 205b3
 206b2
 207b1
 208a3
 209a2
 210a1
 211a0
 212l2
 213EOF
 214
 215test_output_expect_success 'duplicated head arguments' 'git-rev-list --merge-order l5 l5 ^l1' <<EOF
 216l5
 217l4
 218l3
 219a4
 220c3
 221c2
 222c1
 223b4
 224b3
 225b2
 226b1
 227a3
 228a2
 229a1
 230a0
 231l2
 232EOF
 233
 234test_output_expect_success 'prune near merge' 'git-rev-list --merge-order a4 ^c3' <<EOF
 235a4
 236b4
 237b3
 238a3
 239a2
 240a1
 241EOF
 242
 243test_output_expect_success "head has no parent" 'git-rev-list --merge-order --show-breaks root' <<EOF
 244= root
 245EOF
 246
 247test_output_expect_success "two nodes - one head, one base" 'git-rev-list --merge-order --show-breaks l0' <<EOF
 248= l0
 249= root
 250EOF
 251
 252test_output_expect_success "three nodes one head, one internal, one base" 'git-rev-list --merge-order --show-breaks l1' <<EOF
 253= l1
 254| l0
 255= root
 256EOF
 257
 258test_output_expect_success "linear prune l2 ^root" 'git-rev-list --merge-order --show-breaks l2 ^root' <<EOF
 259^ l2
 260| l1
 261| l0
 262EOF
 263
 264test_output_expect_success "linear prune l2 ^l0" 'git-rev-list --merge-order --show-breaks l2 ^l0' <<EOF
 265^ l2
 266| l1
 267EOF
 268
 269test_output_expect_success "linear prune l2 ^l1" 'git-rev-list --merge-order --show-breaks l2 ^l1' <<EOF
 270^ l2
 271EOF
 272
 273test_output_expect_success "linear prune l5 ^a4" 'git-rev-list --merge-order --show-breaks l5 ^a4' <<EOF
 274^ l5
 275| l4
 276| l3
 277EOF
 278
 279test_output_expect_success "linear prune l5 ^l3" 'git-rev-list --merge-order --show-breaks l5 ^l3' <<EOF
 280^ l5
 281| l4
 282EOF
 283
 284test_output_expect_success "linear prune l5 ^l4" 'git-rev-list --merge-order --show-breaks l5 ^l4' <<EOF
 285^ l5
 286EOF
 287
 288test_output_expect_success "max-count 10 - merge order" 'git-rev-list --merge-order --show-breaks --max-count=10 l5' <<EOF
 289= l5
 290| l4
 291| l3
 292= a4
 293| c3
 294| c2
 295| c1
 296^ b4
 297| b3
 298| b2
 299EOF
 300
 301test_output_expect_success "max-count 10 - non merge order" 'git-rev-list --max-count=10 l5' <<EOF
 302l5
 303l4
 304l3
 305a4
 306b4
 307a3
 308a2
 309c3
 310c2
 311b3
 312EOF
 313
 314test_output_expect_success '--max-age=c3, no --merge-order' "git-rev-list --max-age=$(commit_date c3) l5" <<EOF
 315l5
 316l4
 317l3
 318a4
 319b4
 320a3
 321a2
 322c3
 323EOF
 324
 325test_output_expect_success '--max-age=c3, --merge-order' "git-rev-list --merge-order --max-age=$(commit_date c3) l5" <<EOF
 326l5
 327l4
 328l3
 329a4
 330c3
 331b4
 332a3
 333a2
 334EOF
 335
 336test_output_expect_success 'one specified head reachable from another a4, c3, --merge-order' "list_duplicates git-rev-list --merge-order a4 c3" <<EOF
 337EOF
 338
 339test_output_expect_success 'one specified head reachable from another c3, a4, --merge-order' "list_duplicates git-rev-list --merge-order c3 a4" <<EOF
 340EOF
 341
 342test_output_expect_success 'one specified head reachable from another a4, c3, no --merge-order' "list_duplicates git-rev-list a4 c3" <<EOF
 343EOF
 344
 345test_output_expect_success 'one specified head reachable from another c3, a4, no --merge-order' "list_duplicates git-rev-list c3 a4" <<EOF
 346EOF
 347
 348test_output_expect_success 'graph with c3 and a4 parents of head' "list_duplicates git-rev-list m1" <<EOF
 349EOF
 350
 351test_output_expect_success 'graph with a4 and c3 parents of head' "list_duplicates git-rev-list m2" <<EOF
 352EOF
 353
 354test_expect_success "head ^head --merge-order" 'git-rev-list --merge-order --show-breaks a3 ^a3' <<EOF
 355EOF
 356
 357#
 358# can't test this now - duplicate parents can't be created
 359#
 360#test_output_expect_success 'duplicate parents' 'git-rev-list --parents --merge-order --show-breaks m3' <<EOF
 361#= m3 c3 a4 c3
 362#| a4 c3 b4 a3
 363#| b4 a3 b3
 364#| b3 b2
 365#^ a3 a2
 366#| a2 a1
 367#| a1 a0
 368#^ c3 c2
 369#| c2 b2 c1
 370#| b2 b1
 371#^ c1 b1
 372#| b1 a0
 373#= a0 l2
 374#| l2 l1
 375#| l1 l0
 376#| l0 root
 377#= root
 378#EOF
 379
 380test_expect_success "head ^head no --merge-order" 'git-rev-list a3 ^a3' <<EOF
 381EOF
 382
 383test_output_expect_success 'simple merge order (l5r1)' 'git-rev-list --merge-order --show-breaks l5r1' <<EOF
 384= l5r1
 385| r1
 386| r0
 387| alt_root
 388^ l5
 389| l4
 390| l3
 391| a4
 392| c3
 393| c2
 394| c1
 395^ b4
 396| b3
 397| b2
 398| b1
 399^ a3
 400| a2
 401| a1
 402| a0
 403| l2
 404| l1
 405| l0
 406= root
 407EOF
 408
 409test_output_expect_success 'simple merge order (r1l5)' 'git-rev-list --merge-order --show-breaks r1l5' <<EOF
 410= r1l5
 411| l5
 412| l4
 413| l3
 414| a4
 415| c3
 416| c2
 417| c1
 418^ b4
 419| b3
 420| b2
 421| b1
 422^ a3
 423| a2
 424| a1
 425| a0
 426| l2
 427| l1
 428| l0
 429| root
 430^ r1
 431| r0
 432= alt_root
 433EOF
 434
 435test_output_expect_success "don't print things unreachable from one branch" "git-rev-list a3 ^b3 --merge-order" <<EOF
 436a3
 437a2
 438a1
 439EOF
 440
 441#
 442#
 443
 444test_done