#!/bin/sh # There's more than one "correct" way to represent the history graphically. # These tests depend on the current behavior of the graphing code. If the # graphing code is ever changed to draw the output differently, these tests # cases will need to be updated to know about the new layout. global test_description := ''--graph and simplified history'' source ./test-lib.sh test_expect_success 'set up rev-list --graph test' ' # 3 commits on branch A test_commit A1 foo.txt && test_commit A2 bar.txt && test_commit A3 bar.txt && git branch -m master A && # 2 commits on branch B, started from A1 git checkout -b B A1 && test_commit B1 foo.txt && test_commit B2 abc.txt && # 2 commits on branch C, started from A2 git checkout -b C A2 && test_commit C1 xyz.txt && test_commit C2 xyz.txt && # Octopus merge B and C into branch A git checkout A && git merge B C && git tag A4 && test_commit A5 bar.txt && # More commits on C, then merge C into A git checkout C && test_commit C3 foo.txt && test_commit C4 bar.txt && git checkout A && git merge -s ours C && git tag A6 && test_commit A7 bar.txt && # Store commit names in variables for later use A1=$(git rev-parse --verify A1) && A2=$(git rev-parse --verify A2) && A3=$(git rev-parse --verify A3) && A4=$(git rev-parse --verify A4) && A5=$(git rev-parse --verify A5) && A6=$(git rev-parse --verify A6) && A7=$(git rev-parse --verify A7) && B1=$(git rev-parse --verify B1) && B2=$(git rev-parse --verify B2) && C1=$(git rev-parse --verify C1) && C2=$(git rev-parse --verify C2) && C3=$(git rev-parse --verify C3) && C4=$(git rev-parse --verify C4) ' test_expect_success '--graph --all' ' rm -f expected && echo "* $A7" >> expected && echo "* $A6" >> expected && echo "|\\ " >> expected && echo "| * $C4" >> expected && echo "| * $C3" >> expected && echo "* | $A5" >> expected && echo "| | " >> expected && echo "| \\ " >> expected && echo "*-. \\ $A4" >> expected && echo "|\\ \\ \\ " >> expected && echo "| | |/ " >> expected && echo "| | * $C2" >> expected && echo "| | * $C1" >> expected && echo "| * | $B2" >> expected && echo "| * | $B1" >> expected && echo "* | | $A3" >> expected && echo "| |/ " >> expected && echo "|/| " >> expected && echo "* | $A2" >> expected && echo "|/ " >> expected && echo "* $A1" >> expected && git rev-list --graph --all > actual && test_cmp expected actual ' # Make sure the graph_is_interesting() code still realizes # that undecorated merges are interesting, even with --simplify-by-decoration test_expect_success '--graph --simplify-by-decoration' ' rm -f expected && git tag -d A4 && echo "* $A7" >> expected && echo "* $A6" >> expected && echo "|\\ " >> expected && echo "| * $C4" >> expected && echo "| * $C3" >> expected && echo "* | $A5" >> expected && echo "| | " >> expected && echo "| \\ " >> expected && echo "*-. \\ $A4" >> expected && echo "|\\ \\ \\ " >> expected && echo "| | |/ " >> expected && echo "| | * $C2" >> expected && echo "| | * $C1" >> expected && echo "| * | $B2" >> expected && echo "| * | $B1" >> expected && echo "* | | $A3" >> expected && echo "| |/ " >> expected && echo "|/| " >> expected && echo "* | $A2" >> expected && echo "|/ " >> expected && echo "* $A1" >> expected && git rev-list --graph --all --simplify-by-decoration > actual && test_cmp expected actual ' test_expect_success 'setup: get rid of decorations on B' ' git tag -d B2 && git tag -d B1 && git branch -d B ' # Graph with branch B simplified away test_expect_success '--graph --simplify-by-decoration prune branch B' ' rm -f expected && echo "* $A7" >> expected && echo "* $A6" >> expected && echo "|\\ " >> expected && echo "| * $C4" >> expected && echo "| * $C3" >> expected && echo "* | $A5" >> expected && echo "* | $A4" >> expected && echo "|\\ \\ " >> expected && echo "| |/ " >> expected && echo "| * $C2" >> expected && echo "| * $C1" >> expected && echo "* | $A3" >> expected && echo "|/ " >> expected && echo "* $A2" >> expected && echo "* $A1" >> expected && git rev-list --graph --simplify-by-decoration --all > actual && test_cmp expected actual ' test_expect_success '--graph --full-history -- bar.txt' ' rm -f expected && echo "* $A7" >> expected && echo "* $A6" >> expected && echo "|\\ " >> expected && echo "| * $C4" >> expected && echo "* | $A5" >> expected && echo "* | $A4" >> expected && echo "|\\ \\ " >> expected && echo "| |/ " >> expected && echo "* | $A3" >> expected && echo "|/ " >> expected && echo "* $A2" >> expected && git rev-list --graph --full-history --all -- bar.txt > actual && test_cmp expected actual ' test_expect_success '--graph --full-history --simplify-merges -- bar.txt' ' rm -f expected && echo "* $A7" >> expected && echo "* $A6" >> expected && echo "|\\ " >> expected && echo "| * $C4" >> expected && echo "* | $A5" >> expected && echo "* | $A3" >> expected && echo "|/ " >> expected && echo "* $A2" >> expected && git rev-list --graph --full-history --simplify-merges --all \ -- bar.txt > actual && test_cmp expected actual ' test_expect_success '--graph -- bar.txt' ' rm -f expected && echo "* $A7" >> expected && echo "* $A5" >> expected && echo "* $A3" >> expected && echo "| * $C4" >> expected && echo "|/ " >> expected && echo "* $A2" >> expected && git rev-list --graph --all -- bar.txt > actual && test_cmp expected actual ' test_expect_success '--graph --sparse -- bar.txt' ' rm -f expected && echo "* $A7" >> expected && echo "* $A6" >> expected && echo "* $A5" >> expected && echo "* $A4" >> expected && echo "* $A3" >> expected && echo "| * $C4" >> expected && echo "| * $C3" >> expected && echo "| * $C2" >> expected && echo "| * $C1" >> expected && echo "|/ " >> expected && echo "* $A2" >> expected && echo "* $A1" >> expected && git rev-list --graph --sparse --all -- bar.txt > actual && test_cmp expected actual ' test_expect_success '--graph ^C4' ' rm -f expected && echo "* $A7" >> expected && echo "* $A6" >> expected && echo "* $A5" >> expected && echo "* $A4" >> expected && echo "|\\ " >> expected && echo "| * $B2" >> expected && echo "| * $B1" >> expected && echo "* $A3" >> expected && git rev-list --graph --all ^C4 > actual && test_cmp expected actual ' test_expect_success '--graph ^C3' ' rm -f expected && echo "* $A7" >> expected && echo "* $A6" >> expected && echo "|\\ " >> expected && echo "| * $C4" >> expected && echo "* $A5" >> expected && echo "* $A4" >> expected && echo "|\\ " >> expected && echo "| * $B2" >> expected && echo "| * $B1" >> expected && echo "* $A3" >> expected && git rev-list --graph --all ^C3 > actual && test_cmp expected actual ' # I don't think the ordering of the boundary commits is really # that important, but this test depends on it. If the ordering ever changes # in the code, we'll need to update this test. test_expect_success '--graph --boundary ^C3' ' rm -f expected && echo "* $A7" >> expected && echo "* $A6" >> expected && echo "|\\ " >> expected && echo "| * $C4" >> expected && echo "* | $A5" >> expected && echo "| | " >> expected && echo "| \\ " >> expected && echo "*-. \\ $A4" >> expected && echo "|\\ \\ \\ " >> expected && echo "| * | | $B2" >> expected && echo "| * | | $B1" >> expected && echo "* | | | $A3" >> expected && echo "o | | | $A2" >> expected && echo "|/ / / " >> expected && echo "o | | $A1" >> expected && echo " / / " >> expected && echo "| o $C3" >> expected && echo "|/ " >> expected && echo "o $C2" >> expected && git rev-list --graph --boundary --all ^C3 > actual && test_cmp expected actual ' test_done (CommandList children: [ (Assignment keyword: Assign_None pairs: [ (assign_pair lhs: (LhsName name:test_description) op: Equal rhs: {(SQ <"--graph and simplified history">)} spids: [17] ) ] spids: [17] ) (C {(.)} {(./test-lib.sh)}) (C {(test_expect_success)} {(SQ <"set up rev-list --graph test">)} { (SQ <"\n"> <"\t# 3 commits on branch A\n"> <"\ttest_commit A1 foo.txt &&\n"> <"\ttest_commit A2 bar.txt &&\n"> <"\ttest_commit A3 bar.txt &&\n"> <"\tgit branch -m master A &&\n"> <"\n"> <"\t# 2 commits on branch B, started from A1\n"> <"\tgit checkout -b B A1 &&\n"> <"\ttest_commit B1 foo.txt &&\n"> <"\ttest_commit B2 abc.txt &&\n"> <"\n"> <"\t# 2 commits on branch C, started from A2\n"> <"\tgit checkout -b C A2 &&\n"> <"\ttest_commit C1 xyz.txt &&\n"> <"\ttest_commit C2 xyz.txt &&\n"> <"\n"> <"\t# Octopus merge B and C into branch A\n"> <"\tgit checkout A &&\n"> <"\tgit merge B C &&\n"> <"\tgit tag A4 &&\n"> <"\n"> <"\ttest_commit A5 bar.txt &&\n"> <"\n"> <"\t# More commits on C, then merge C into A\n"> <"\tgit checkout C &&\n"> <"\ttest_commit C3 foo.txt &&\n"> <"\ttest_commit C4 bar.txt &&\n"> <"\tgit checkout A &&\n"> <"\tgit merge -s ours C &&\n"> <"\tgit tag A6 &&\n"> <"\n"> <"\ttest_commit A7 bar.txt &&\n"> <"\n"> <"\t# Store commit names in variables for later use\n"> <"\tA1=$(git rev-parse --verify A1) &&\n"> <"\tA2=$(git rev-parse --verify A2) &&\n"> <"\tA3=$(git rev-parse --verify A3) &&\n"> <"\tA4=$(git rev-parse --verify A4) &&\n"> <"\tA5=$(git rev-parse --verify A5) &&\n"> <"\tA6=$(git rev-parse --verify A6) &&\n"> <"\tA7=$(git rev-parse --verify A7) &&\n"> <"\tB1=$(git rev-parse --verify B1) &&\n"> <"\tB2=$(git rev-parse --verify B2) &&\n"> <"\tC1=$(git rev-parse --verify C1) &&\n"> <"\tC2=$(git rev-parse --verify C2) &&\n"> <"\tC3=$(git rev-parse --verify C3) &&\n"> <"\tC4=$(git rev-parse --verify C4)\n"> <"\t"> ) } ) (C {(test_expect_success)} {(SQ <"--graph --all">)} { (SQ <"\n"> <"\trm -f expected &&\n"> <"\techo \"* $A7\" >> expected &&\n"> <"\techo \"* $A6\" >> expected &&\n"> <"\techo \"|\\\\ \" >> expected &&\n"> <"\techo \"| * $C4\" >> expected &&\n"> <"\techo \"| * $C3\" >> expected &&\n"> <"\techo \"* | $A5\" >> expected &&\n"> <"\techo \"| | \" >> expected &&\n"> <"\techo \"| \\\\ \" >> expected &&\n"> <"\techo \"*-. \\\\ $A4\" >> expected &&\n"> <"\techo \"|\\\\ \\\\ \\\\ \" >> expected &&\n"> <"\techo \"| | |/ \" >> expected &&\n"> <"\techo \"| | * $C2\" >> expected &&\n"> <"\techo \"| | * $C1\" >> expected &&\n"> <"\techo \"| * | $B2\" >> expected &&\n"> <"\techo \"| * | $B1\" >> expected &&\n"> <"\techo \"* | | $A3\" >> expected &&\n"> <"\techo \"| |/ \" >> expected &&\n"> <"\techo \"|/| \" >> expected &&\n"> <"\techo \"* | $A2\" >> expected &&\n"> <"\techo \"|/ \" >> expected &&\n"> <"\techo \"* $A1\" >> expected &&\n"> <"\tgit rev-list --graph --all > actual &&\n"> <"\ttest_cmp expected actual\n"> <"\t"> ) } ) (C {(test_expect_success)} {(SQ <"--graph --simplify-by-decoration">)} { (SQ <"\n"> <"\trm -f expected &&\n"> <"\tgit tag -d A4 &&\n"> <"\techo \"* $A7\" >> expected &&\n"> <"\techo \"* $A6\" >> expected &&\n"> <"\techo \"|\\\\ \" >> expected &&\n"> <"\techo \"| * $C4\" >> expected &&\n"> <"\techo \"| * $C3\" >> expected &&\n"> <"\techo \"* | $A5\" >> expected &&\n"> <"\techo \"| | \" >> expected &&\n"> <"\techo \"| \\\\ \" >> expected &&\n"> <"\techo \"*-. \\\\ $A4\" >> expected &&\n"> <"\techo \"|\\\\ \\\\ \\\\ \" >> expected &&\n"> <"\techo \"| | |/ \" >> expected &&\n"> <"\techo \"| | * $C2\" >> expected &&\n"> <"\techo \"| | * $C1\" >> expected &&\n"> <"\techo \"| * | $B2\" >> expected &&\n"> <"\techo \"| * | $B1\" >> expected &&\n"> <"\techo \"* | | $A3\" >> expected &&\n"> <"\techo \"| |/ \" >> expected &&\n"> <"\techo \"|/| \" >> expected &&\n"> <"\techo \"* | $A2\" >> expected &&\n"> <"\techo \"|/ \" >> expected &&\n"> <"\techo \"* $A1\" >> expected &&\n"> <"\tgit rev-list --graph --all --simplify-by-decoration > actual &&\n"> <"\ttest_cmp expected actual\n"> <"\t"> ) } ) (C {(test_expect_success)} {(SQ <"setup: get rid of decorations on B">)} {(SQ <"\n"> <"\tgit tag -d B2 &&\n"> <"\tgit tag -d B1 &&\n"> <"\tgit branch -d B\n">)} ) (C {(test_expect_success)} {(SQ <"--graph --simplify-by-decoration prune branch B">)} { (SQ <"\n"> <"\trm -f expected &&\n"> <"\techo \"* $A7\" >> expected &&\n"> <"\techo \"* $A6\" >> expected &&\n"> <"\techo \"|\\\\ \" >> expected &&\n"> <"\techo \"| * $C4\" >> expected &&\n"> <"\techo \"| * $C3\" >> expected &&\n"> <"\techo \"* | $A5\" >> expected &&\n"> <"\techo \"* | $A4\" >> expected &&\n"> <"\techo \"|\\\\ \\\\ \" >> expected &&\n"> <"\techo \"| |/ \" >> expected &&\n"> <"\techo \"| * $C2\" >> expected &&\n"> <"\techo \"| * $C1\" >> expected &&\n"> <"\techo \"* | $A3\" >> expected &&\n"> <"\techo \"|/ \" >> expected &&\n"> <"\techo \"* $A2\" >> expected &&\n"> <"\techo \"* $A1\" >> expected &&\n"> <"\tgit rev-list --graph --simplify-by-decoration --all > actual &&\n"> <"\ttest_cmp expected actual\n"> <"\t"> ) } ) (C {(test_expect_success)} {(SQ <"--graph --full-history -- bar.txt">)} { (SQ <"\n"> <"\trm -f expected &&\n"> <"\techo \"* $A7\" >> expected &&\n"> <"\techo \"* $A6\" >> expected &&\n"> <"\techo \"|\\\\ \" >> expected &&\n"> <"\techo \"| * $C4\" >> expected &&\n"> <"\techo \"* | $A5\" >> expected &&\n"> <"\techo \"* | $A4\" >> expected &&\n"> <"\techo \"|\\\\ \\\\ \" >> expected &&\n"> <"\techo \"| |/ \" >> expected &&\n"> <"\techo \"* | $A3\" >> expected &&\n"> <"\techo \"|/ \" >> expected &&\n"> <"\techo \"* $A2\" >> expected &&\n"> <"\tgit rev-list --graph --full-history --all -- bar.txt > actual &&\n"> <"\ttest_cmp expected actual\n"> <"\t"> ) } ) (C {(test_expect_success)} {(SQ <"--graph --full-history --simplify-merges -- bar.txt">)} { (SQ <"\n"> <"\trm -f expected &&\n"> <"\techo \"* $A7\" >> expected &&\n"> <"\techo \"* $A6\" >> expected &&\n"> <"\techo \"|\\\\ \" >> expected &&\n"> <"\techo \"| * $C4\" >> expected &&\n"> <"\techo \"* | $A5\" >> expected &&\n"> <"\techo \"* | $A3\" >> expected &&\n"> <"\techo \"|/ \" >> expected &&\n"> <"\techo \"* $A2\" >> expected &&\n"> <"\tgit rev-list --graph --full-history --simplify-merges --all \\\n"> <"\t\t-- bar.txt > actual &&\n"> <"\ttest_cmp expected actual\n"> <"\t"> ) } ) (C {(test_expect_success)} {(SQ <"--graph -- bar.txt">)} { (SQ <"\n"> <"\trm -f expected &&\n"> <"\techo \"* $A7\" >> expected &&\n"> <"\techo \"* $A5\" >> expected &&\n"> <"\techo \"* $A3\" >> expected &&\n"> <"\techo \"| * $C4\" >> expected &&\n"> <"\techo \"|/ \" >> expected &&\n"> <"\techo \"* $A2\" >> expected &&\n"> <"\tgit rev-list --graph --all -- bar.txt > actual &&\n"> <"\ttest_cmp expected actual\n"> <"\t"> ) } ) (C {(test_expect_success)} {(SQ <"--graph --sparse -- bar.txt">)} { (SQ <"\n"> <"\trm -f expected &&\n"> <"\techo \"* $A7\" >> expected &&\n"> <"\techo \"* $A6\" >> expected &&\n"> <"\techo \"* $A5\" >> expected &&\n"> <"\techo \"* $A4\" >> expected &&\n"> <"\techo \"* $A3\" >> expected &&\n"> <"\techo \"| * $C4\" >> expected &&\n"> <"\techo \"| * $C3\" >> expected &&\n"> <"\techo \"| * $C2\" >> expected &&\n"> <"\techo \"| * $C1\" >> expected &&\n"> <"\techo \"|/ \" >> expected &&\n"> <"\techo \"* $A2\" >> expected &&\n"> <"\techo \"* $A1\" >> expected &&\n"> <"\tgit rev-list --graph --sparse --all -- bar.txt > actual &&\n"> <"\ttest_cmp expected actual\n"> <"\t"> ) } ) (C {(test_expect_success)} {(SQ <"--graph ^C4">)} { (SQ <"\n"> <"\trm -f expected &&\n"> <"\techo \"* $A7\" >> expected &&\n"> <"\techo \"* $A6\" >> expected &&\n"> <"\techo \"* $A5\" >> expected &&\n"> <"\techo \"* $A4\" >> expected &&\n"> <"\techo \"|\\\\ \" >> expected &&\n"> <"\techo \"| * $B2\" >> expected &&\n"> <"\techo \"| * $B1\" >> expected &&\n"> <"\techo \"* $A3\" >> expected &&\n"> <"\tgit rev-list --graph --all ^C4 > actual &&\n"> <"\ttest_cmp expected actual\n"> <"\t"> ) } ) (C {(test_expect_success)} {(SQ <"--graph ^C3">)} { (SQ <"\n"> <"\trm -f expected &&\n"> <"\techo \"* $A7\" >> expected &&\n"> <"\techo \"* $A6\" >> expected &&\n"> <"\techo \"|\\\\ \" >> expected &&\n"> <"\techo \"| * $C4\" >> expected &&\n"> <"\techo \"* $A5\" >> expected &&\n"> <"\techo \"* $A4\" >> expected &&\n"> <"\techo \"|\\\\ \" >> expected &&\n"> <"\techo \"| * $B2\" >> expected &&\n"> <"\techo \"| * $B1\" >> expected &&\n"> <"\techo \"* $A3\" >> expected &&\n"> <"\tgit rev-list --graph --all ^C3 > actual &&\n"> <"\ttest_cmp expected actual\n"> <"\t"> ) } ) (C {(test_expect_success)} {(SQ <"--graph --boundary ^C3">)} { (SQ <"\n"> <"\trm -f expected &&\n"> <"\techo \"* $A7\" >> expected &&\n"> <"\techo \"* $A6\" >> expected &&\n"> <"\techo \"|\\\\ \" >> expected &&\n"> <"\techo \"| * $C4\" >> expected &&\n"> <"\techo \"* | $A5\" >> expected &&\n"> <"\techo \"| | \" >> expected &&\n"> <"\techo \"| \\\\ \" >> expected &&\n"> <"\techo \"*-. \\\\ $A4\" >> expected &&\n"> <"\techo \"|\\\\ \\\\ \\\\ \" >> expected &&\n"> <"\techo \"| * | | $B2\" >> expected &&\n"> <"\techo \"| * | | $B1\" >> expected &&\n"> <"\techo \"* | | | $A3\" >> expected &&\n"> <"\techo \"o | | | $A2\" >> expected &&\n"> <"\techo \"|/ / / \" >> expected &&\n"> <"\techo \"o | | $A1\" >> expected &&\n"> <"\techo \" / / \" >> expected &&\n"> <"\techo \"| o $C3\" >> expected &&\n"> <"\techo \"|/ \" >> expected &&\n"> <"\techo \"o $C2\" >> expected &&\n"> <"\tgit rev-list --graph --boundary --all ^C3 > actual &&\n"> <"\ttest_cmp expected actual\n"> <"\t"> ) } ) (C {(test_done)}) ] )