Andrew's git - gitweb.git/blob - t/t4211-line-log.sh

   1#!/bin/sh
   2
   3test_description='test log -L'
   4. ./test-lib.sh
   5
   6test_expect_success 'setup (import history)' '
   7        git fast-import < "$TEST_DIRECTORY"/t4211/history.export &&
   8        git reset --hard
   9'
  10
  11canned_test_1 () {
  12        test_expect_$1 "$2" "
  13                git log $2 >actual &&
  14                test_cmp \"\$TEST_DIRECTORY\"/t4211/expect.$3 actual
  15        "
  16}
  17
  18canned_test () {
  19        canned_test_1 success "$@"
  20}
  21canned_test_failure () {
  22        canned_test_1 failure "$@"
  23}
  24
  25test_bad_opts () {
  26        test_expect_success "invalid args: $1" "
  27                test_must_fail git log $1 2>errors &&
  28                test_i18ngrep '$2' errors
  29        "
  30}
  31
  32canned_test "-L 4,12:a.c simple" simple-f
  33canned_test "-L 4,+9:a.c simple" simple-f
  34canned_test "-L '/long f/,/^}/:a.c' simple" simple-f
  35canned_test "-L :f:a.c simple" simple-f-to-main
  36
  37canned_test "-L '/main/,/^}/:a.c' simple" simple-main
  38canned_test "-L :main:a.c simple" simple-main-to-end
  39
  40canned_test "-L 1,+4:a.c simple" beginning-of-file
  41
  42canned_test "-L 20:a.c simple" end-of-file
  43
  44canned_test "-L '/long f/',/^}/:a.c -L /main/,/^}/:a.c simple" two-ranges
  45canned_test "-L 24,+1:a.c simple" vanishes-early
  46
  47canned_test "-M -L '/long f/,/^}/:b.c' move-support" move-support-f
  48canned_test "-M -L ':f:b.c' parallel-change" parallel-change-f-to-main
  49
  50canned_test "-L 4,12:a.c -L :main:a.c simple" multiple
  51canned_test "-L 4,18:a.c -L ^:main:a.c simple" multiple-overlapping
  52canned_test "-L :main:a.c -L 4,18:a.c simple" multiple-overlapping
  53canned_test "-L 4:a.c -L 8,12:a.c simple" multiple-superset
  54canned_test "-L 8,12:a.c -L 4:a.c simple" multiple-superset
  55
  56test_bad_opts "-L" "switch.*requires a value"
  57test_bad_opts "-L b.c" "argument not .start,end:file"
  58test_bad_opts "-L 1:" "argument not .start,end:file"
  59test_bad_opts "-L 1:nonexistent" "There is no path"
  60test_bad_opts "-L 1:simple" "There is no path"
  61test_bad_opts "-L '/foo:b.c'" "argument not .start,end:file"
  62test_bad_opts "-L 1000:b.c" "has only.*lines"
  63test_bad_opts "-L :b.c" "argument not .start,end:file"
  64test_bad_opts "-L :foo:b.c" "no match"
  65
  66test_expect_success '-L X (X == nlines)' '
  67        n=$(wc -l <b.c) &&
  68        git log -L $n:b.c
  69'
  70
  71test_expect_success '-L X (X == nlines + 1)' '
  72        n=$(expr $(wc -l <b.c) + 1) &&
  73        test_must_fail git log -L $n:b.c
  74'
  75
  76test_expect_success '-L X (X == nlines + 2)' '
  77        n=$(expr $(wc -l <b.c) + 2) &&
  78        test_must_fail git log -L $n:b.c
  79'
  80
  81test_expect_success '-L ,Y (Y == nlines)' '
  82        n=$(printf "%d" $(wc -l <b.c)) &&
  83        git log -L ,$n:b.c
  84'
  85
  86test_expect_success '-L ,Y (Y == nlines + 1)' '
  87        n=$(expr $(wc -l <b.c) + 1) &&
  88        git log -L ,$n:b.c
  89'
  90
  91test_expect_success '-L ,Y (Y == nlines + 2)' '
  92        n=$(expr $(wc -l <b.c) + 2) &&
  93        git log -L ,$n:b.c
  94'
  95
  96test_expect_success '-L with --first-parent and a merge' '
  97        git checkout parallel-change &&
  98        git log --first-parent -L 1,1:b.c
  99'
 100
 101test_expect_success '-L with --output' '
 102        git checkout parallel-change &&
 103        git log --output=log -L :main:b.c >output &&
 104        test_must_be_empty output &&
 105        test_line_count = 70 log
 106'
 107
 108test_expect_success 'range_set_union' '
 109        test_seq 500 > c.c &&
 110        git add c.c &&
 111        git commit -m "many lines" &&
 112        test_seq 1000 > c.c &&
 113        git add c.c &&
 114        git commit -m "modify many lines" &&
 115        git log $(for x in $(test_seq 200); do echo -L $((2*x)),+1:c.c; done)
 116'
 117
 118test_expect_success '-s shows only line-log commits' '
 119        git log --format="commit %s" -L1,24:b.c >expect.raw &&
 120        grep ^commit expect.raw >expect &&
 121        git log --format="commit %s" -L1,24:b.c -s >actual &&
 122        test_cmp expect actual
 123'
 124
 125test_expect_success '-p shows the default patch output' '
 126        git log -L1,24:b.c >expect &&
 127        git log -L1,24:b.c -p >actual &&
 128        test_cmp expect actual
 129'
 130
 131test_expect_success '--raw is forbidden' '
 132        test_must_fail git log -L1,24:b.c --raw
 133'
 134
 135test_expect_success 'setup for checking fancy rename following' '
 136        git checkout --orphan moves-start &&
 137        git reset --hard &&
 138
 139        printf "%s\n"    12 13 14 15      b c d e   >file-1 &&
 140        printf "%s\n"    22 23 24 25      B C D E   >file-2 &&
 141        git add file-1 file-2 &&
 142        test_tick &&
 143        git commit -m "Add file-1 and file-2" &&
 144        oid_add_f1_f2=$(git rev-parse --short HEAD) &&
 145
 146        git checkout -b moves-main &&
 147        printf "%s\n" 11 12 13 14 15      b c d e   >file-1 &&
 148        git commit -a -m "Modify file-1 on main" &&
 149        oid_mod_f1_main=$(git rev-parse --short HEAD) &&
 150
 151        printf "%s\n" 21 22 23 24 25      B C D E   >file-2 &&
 152        git commit -a -m "Modify file-2 on main #1" &&
 153        oid_mod_f2_main_1=$(git rev-parse --short HEAD) &&
 154
 155        git mv file-1 renamed-1 &&
 156        git commit -m "Rename file-1 to renamed-1 on main" &&
 157
 158        printf "%s\n" 11 12 13 14 15      b c d e f >renamed-1 &&
 159        git commit -a -m "Modify renamed-1 on main" &&
 160        oid_mod_r1_main=$(git rev-parse --short HEAD) &&
 161
 162        printf "%s\n" 21 22 23 24 25      B C D E F >file-2 &&
 163        git commit -a -m "Modify file-2 on main #2" &&
 164        oid_mod_f2_main_2=$(git rev-parse --short HEAD) &&
 165
 166        git checkout -b moves-side moves-start &&
 167        printf "%s\n"    12 13 14 15 16   b c d e   >file-1 &&
 168        git commit -a -m "Modify file-1 on side #1" &&
 169        oid_mod_f1_side_1=$(git rev-parse --short HEAD) &&
 170
 171        printf "%s\n"    22 23 24 25 26   B C D E   >file-2 &&
 172        git commit -a -m "Modify file-2 on side" &&
 173        oid_mod_f2_side=$(git rev-parse --short HEAD) &&
 174
 175        git mv file-2 renamed-2 &&
 176        git commit -m "Rename file-2 to renamed-2 on side" &&
 177
 178        printf "%s\n"    12 13 14 15 16 a b c d e   >file-1 &&
 179        git commit -a -m "Modify file-1 on side #2" &&
 180        oid_mod_f1_side_2=$(git rev-parse --short HEAD) &&
 181
 182        printf "%s\n"    22 23 24 25 26 A B C D E   >renamed-2 &&
 183        git commit -a -m "Modify renamed-2 on side" &&
 184        oid_mod_r2_side=$(git rev-parse --short HEAD) &&
 185
 186        git checkout moves-main &&
 187        git merge moves-side &&
 188        oid_merge=$(git rev-parse --short HEAD)
 189'
 190
 191test_expect_success 'fancy rename following #1' '
 192        cat >expect <<-EOF &&
 193        $oid_merge Merge branch '\''moves-side'\'' into moves-main
 194        $oid_mod_f1_side_2 Modify file-1 on side #2
 195        $oid_mod_f1_side_1 Modify file-1 on side #1
 196        $oid_mod_r1_main Modify renamed-1 on main
 197        $oid_mod_f1_main Modify file-1 on main
 198        $oid_add_f1_f2 Add file-1 and file-2
 199        EOF
 200        git log -L1:renamed-1 --oneline --no-patch >actual &&
 201        test_cmp expect actual
 202'
 203
 204test_expect_success 'fancy rename following #2' '
 205        cat >expect <<-EOF &&
 206        $oid_merge Merge branch '\''moves-side'\'' into moves-main
 207        $oid_mod_r2_side Modify renamed-2 on side
 208        $oid_mod_f2_side Modify file-2 on side
 209        $oid_mod_f2_main_2 Modify file-2 on main #2
 210        $oid_mod_f2_main_1 Modify file-2 on main #1
 211        $oid_add_f1_f2 Add file-1 and file-2
 212        EOF
 213        git log -L1:renamed-2 --oneline --no-patch >actual &&
 214        test_cmp expect actual
 215'
 216
 217test_done