t/t3206-range-diff.sh

   1 #!/bin/sh
   2
   3 test_description='range-diff tests'
   4
   5 . ./test-lib.sh
   6
   7 # Note that because of the range-diff's heuristics, test_commit does more
   8 # harm than good.  We need some real history.
   9
  10 test_expect_success 'setup' '
  11         git fast-import < "$TEST_DIRECTORY"/t3206/history.export
  12 '
  13
  14 test_expect_success 'simple A..B A..C (unmodified)' '
  15         git range-diff --no-color master..topic master..unmodified \
  16                 >actual &&
  17         cat >expected <<-EOF &&
  18         1:  4de457d = 1:  35b9b25 s/5/A/
  19         2:  fccce22 = 2:  de345ab s/4/A/
  20         3:  147e64e = 3:  9af6654 s/11/B/
  21         4:  a63e992 = 4:  2901f77 s/12/B/
  22         EOF
  23         test_cmp expected actual
  24 '
  25
  26 test_expect_success 'simple B...C (unmodified)' '
  27         git range-diff --no-color topic...unmodified >actual &&
  28         # same "expected" as above
  29         test_cmp expected actual
  30 '
  31
  32 test_expect_success 'simple A B C (unmodified)' '
  33         git range-diff --no-color master topic unmodified >actual &&
  34         # same "expected" as above
  35         test_cmp expected actual
  36 '
  37
  38 test_expect_success 'trivial reordering' '
  39         git range-diff --no-color master topic reordered >actual &&
  40         cat >expected <<-EOF &&
  41         1:  4de457d = 1:  aca177a s/5/A/
  42         3:  147e64e = 2:  14ad629 s/11/B/
  43         4:  a63e992 = 3:  ee58208 s/12/B/
  44         2:  fccce22 = 4:  307b27a s/4/A/
  45         EOF
  46         test_cmp expected actual
  47 '
  48
  49 test_expect_success 'removed a commit' '
  50         git range-diff --no-color master topic removed >actual &&
  51         cat >expected <<-EOF &&
  52         1:  4de457d = 1:  7657159 s/5/A/
  53         2:  fccce22 < -:  ------- s/4/A/
  54         3:  147e64e = 2:  43d84d3 s/11/B/
  55         4:  a63e992 = 3:  a740396 s/12/B/
  56         EOF
  57         test_cmp expected actual
  58 '
  59
  60 test_expect_success 'added a commit' '
  61         git range-diff --no-color master topic added >actual &&
  62         cat >expected <<-EOF &&
  63         1:  4de457d = 1:  2716022 s/5/A/
  64         2:  fccce22 = 2:  b62accd s/4/A/
  65         -:  ------- > 3:  df46cfa s/6/A/
  66         3:  147e64e = 4:  3e64548 s/11/B/
  67         4:  a63e992 = 5:  12b4063 s/12/B/
  68         EOF
  69         test_cmp expected actual
  70 '
  71
  72 test_expect_success 'new base, A B C' '
  73         git range-diff --no-color master topic rebased >actual &&
  74         cat >expected <<-EOF &&
  75         1:  4de457d = 1:  cc9c443 s/5/A/
  76         2:  fccce22 = 2:  c5d9641 s/4/A/
  77         3:  147e64e = 3:  28cc2b6 s/11/B/
  78         4:  a63e992 = 4:  5628ab7 s/12/B/
  79         EOF
  80         test_cmp expected actual
  81 '
  82
  83 test_expect_success 'new base, B...C' '
  84         # this syntax includes the commits from master!
  85         git range-diff --no-color topic...rebased >actual &&
  86         cat >expected <<-EOF &&
  87         -:  ------- > 1:  a31b12e unrelated
  88         1:  4de457d = 2:  cc9c443 s/5/A/
  89         2:  fccce22 = 3:  c5d9641 s/4/A/
  90         3:  147e64e = 4:  28cc2b6 s/11/B/
  91         4:  a63e992 = 5:  5628ab7 s/12/B/
  92         EOF
  93         test_cmp expected actual
  94 '
  95
  96 test_expect_success 'changed commit' '
  97         git range-diff --no-color topic...changed >actual &&
  98         cat >expected <<-EOF &&
  99         1:  4de457d = 1:  a4b3333 s/5/A/
 100         2:  fccce22 = 2:  f51d370 s/4/A/
 101         3:  147e64e ! 3:  0559556 s/11/B/
 102             @@ -10,7 +10,7 @@
 103               9
 104               10
 105              -11
 106             -+B
 107             ++BB
 108               12
 109               13
 110               14
 111         4:  a63e992 ! 4:  d966c5c s/12/B/
 112             @@ -8,7 +8,7 @@
 113              @@
 114               9
 115               10
 116             - B
 117             + BB
 118              -12
 119              +B
 120               13
 121         EOF
 122         test_cmp expected actual
 123 '
 124
 125 test_expect_success 'changed commit with sm config' '
 126         git range-diff --no-color --submodule=log topic...changed >actual &&
 127         cat >expected <<-EOF &&
 128         1:  4de457d = 1:  a4b3333 s/5/A/
 129         2:  fccce22 = 2:  f51d370 s/4/A/
 130         3:  147e64e ! 3:  0559556 s/11/B/
 131             @@ -10,7 +10,7 @@
 132               9
 133               10
 134              -11
 135             -+B
 136             ++BB
 137               12
 138               13
 139               14
 140         4:  a63e992 ! 4:  d966c5c s/12/B/
 141             @@ -8,7 +8,7 @@
 142              @@
 143               9
 144               10
 145             - B
 146             + BB
 147              -12
 148              +B
 149               13
 150         EOF
 151         test_cmp expected actual
 152 '
 153
 154 test_expect_success 'no commits on one side' '
 155         git commit --amend -m "new message" &&
 156         git range-diff master HEAD@{1} HEAD
 157 '
 158
 159 test_expect_success 'changed message' '
 160         git range-diff --no-color topic...changed-message >actual &&
 161         sed s/Z/\ /g >expected <<-EOF &&
 162         1:  4de457d = 1:  f686024 s/5/A/
 163         2:  fccce22 ! 2:  4ab067d s/4/A/
 164             @@ -2,6 +2,8 @@
 165             Z
 166             Z    s/4/A/
 167             Z
 168             +    Also a silly comment here!
 169             +
 170             Z diff --git a/file b/file
 171             Z --- a/file
 172             Z +++ b/file
 173         3:  147e64e = 3:  b9cb956 s/11/B/
 174         4:  a63e992 = 4:  8add5f1 s/12/B/
 175         EOF
 176         test_cmp expected actual
 177 '
 178
 179 test_expect_success 'dual-coloring' '
 180         sed -e "s|^:||" >expect <<-\EOF &&
 181         :<YELLOW>1:  a4b3333 = 1:  f686024 s/5/A/<RESET>
 182         :<RED>2:  f51d370 <RESET><YELLOW>!<RESET><GREEN> 2:  4ab067d<RESET><YELLOW> s/4/A/<RESET>
 183         :    <REVERSE><CYAN>@@ -2,6 +2,8 @@<RESET>
 184         :     <RESET>
 185         :         s/4/A/<RESET>
 186         :     <RESET>
 187         :    <REVERSE><GREEN>+<RESET><BOLD>    Also a silly comment here!<RESET>
 188         :    <REVERSE><GREEN>+<RESET>
 189         :      diff --git a/file b/file<RESET>
 190         :      --- a/file<RESET>
 191         :      +++ b/file<RESET>
 192         :<RED>3:  0559556 <RESET><YELLOW>!<RESET><GREEN> 3:  b9cb956<RESET><YELLOW> s/11/B/<RESET>
 193         :    <REVERSE><CYAN>@@ -10,7 +10,7 @@<RESET>
 194         :      9<RESET>
 195         :      10<RESET>
 196         :    <RED> -11<RESET>
 197         :    <REVERSE><RED>-<RESET><FAINT;GREEN>+BB<RESET>
 198         :    <REVERSE><GREEN>+<RESET><BOLD;GREEN>+B<RESET>
 199         :      12<RESET>
 200         :      13<RESET>
 201         :      14<RESET>
 202         :<RED>4:  d966c5c <RESET><YELLOW>!<RESET><GREEN> 4:  8add5f1<RESET><YELLOW> s/12/B/<RESET>
 203         :    <REVERSE><CYAN>@@ -8,7 +8,7 @@<RESET>
 204         :    <CYAN> @@<RESET>
 205         :      9<RESET>
 206         :      10<RESET>
 207         :    <REVERSE><RED>-<RESET><FAINT> BB<RESET>
 208         :    <REVERSE><GREEN>+<RESET><BOLD> B<RESET>
 209         :    <RED> -12<RESET>
 210         :    <GREEN> +B<RESET>
 211         :      13<RESET>
 212         EOF
 213         git range-diff changed...changed-message --color --dual-color >actual.raw &&
 214         test_decode_color >actual <actual.raw &&
 215         test_cmp expect actual
 216 '
 217
 218 for prev in topic master..topic
 219 do
 220         test_expect_success "format-patch --range-diff=$prev" '
 221                 git format-patch --stdout --cover-letter --range-diff=$prev \
 222                         master..unmodified >actual &&
 223                 grep "= 1: .* s/5/A" actual &&
 224                 grep "= 2: .* s/4/A" actual &&
 225                 grep "= 3: .* s/11/B" actual &&
 226                 grep "= 4: .* s/12/B" actual
 227         '
 228 done
 229
 230 test_expect_success 'format-patch --range-diff as commentary' '
 231         git format-patch --stdout --range-diff=HEAD~1 HEAD~1 >actual &&
 232         test_i18ngrep "^Range-diff:$" actual
 233 '
 234
 235 test_done