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             @@
 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             @@
 113              @@ A
 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 --no-patch diff option' '
 126         git range-diff --no-color --no-patch 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         4:  a63e992 ! 4:  d966c5c s/12/B/
 132         EOF
 133         test_cmp expected actual
 134 '
 135
 136 test_expect_success 'changed commit with --stat diff option' '
 137         git range-diff --no-color --stat topic...changed >actual &&
 138         cat >expected <<-EOF &&
 139         1:  4de457d = 1:  a4b3333 s/5/A/
 140              a => b | 0
 141              1 file changed, 0 insertions(+), 0 deletions(-)
 142         2:  fccce22 = 2:  f51d370 s/4/A/
 143              a => b | 0
 144              1 file changed, 0 insertions(+), 0 deletions(-)
 145         3:  147e64e ! 3:  0559556 s/11/B/
 146              a => b | 0
 147              1 file changed, 0 insertions(+), 0 deletions(-)
 148         4:  a63e992 ! 4:  d966c5c s/12/B/
 149              a => b | 0
 150              1 file changed, 0 insertions(+), 0 deletions(-)
 151         EOF
 152         test_cmp expected actual
 153 '
 154
 155 test_expect_success 'changed commit with sm config' '
 156         git range-diff --no-color --submodule=log topic...changed >actual &&
 157         cat >expected <<-EOF &&
 158         1:  4de457d = 1:  a4b3333 s/5/A/
 159         2:  fccce22 = 2:  f51d370 s/4/A/
 160         3:  147e64e ! 3:  0559556 s/11/B/
 161             @@
 162               9
 163               10
 164              -11
 165             -+B
 166             ++BB
 167               12
 168               13
 169               14
 170         4:  a63e992 ! 4:  d966c5c s/12/B/
 171             @@
 172              @@ A
 173               9
 174               10
 175             - B
 176             + BB
 177              -12
 178              +B
 179               13
 180         EOF
 181         test_cmp expected actual
 182 '
 183
 184 test_expect_success 'renamed file' '
 185         git range-diff --no-color --submodule=log topic...renamed-file >actual &&
 186         sed s/Z/\ /g >expected <<-EOF &&
 187         1:  4de457d = 1:  f258d75 s/5/A/
 188         2:  fccce22 ! 2:  017b62d s/4/A/
 189             @@
 190             ZAuthor: Thomas Rast <trast@inf.ethz.ch>
 191             Z
 192             -    s/4/A/
 193             +    s/4/A/ + rename file
 194             Z
 195             - ## file ##
 196             + ## file => renamed-file ##
 197             Z@@
 198             Z 1
 199             Z 2
 200         3:  147e64e ! 3:  3ce7af6 s/11/B/
 201             @@
 202             Z
 203             Z    s/11/B/
 204             Z
 205             - ## file ##
 206             + ## renamed-file ##
 207             Z@@ A
 208             Z 8
 209             Z 9
 210         4:  a63e992 ! 4:  1e6226b s/12/B/
 211             @@
 212             Z
 213             Z    s/12/B/
 214             Z
 215             - ## file ##
 216             + ## renamed-file ##
 217             Z@@ A
 218             Z 9
 219             Z 10
 220         EOF
 221         test_cmp expected actual
 222 '
 223
 224 test_expect_success 'file added and later removed' '
 225         git range-diff --no-color --submodule=log topic...added-removed >actual &&
 226         sed s/Z/\ /g >expected <<-EOF &&
 227         1:  4de457d = 1:  096b1ba s/5/A/
 228         2:  fccce22 ! 2:  d92e698 s/4/A/
 229             @@
 230             ZAuthor: Thomas Rast <trast@inf.ethz.ch>
 231             Z
 232             -    s/4/A/
 233             +    s/4/A/ + new-file
 234             Z
 235             Z ## file ##
 236             Z@@
 237             @@
 238             Z A
 239             Z 6
 240             Z 7
 241             +
 242             + ## new-file (new) ##
 243         3:  147e64e ! 3:  9a1db4d s/11/B/
 244             @@
 245             ZAuthor: Thomas Rast <trast@inf.ethz.ch>
 246             Z
 247             -    s/11/B/
 248             +    s/11/B/ + remove file
 249             Z
 250             Z ## file ##
 251             Z@@ A
 252             @@
 253             Z 12
 254             Z 13
 255             Z 14
 256             +
 257             + ## new-file (deleted) ##
 258         4:  a63e992 = 4:  fea3b5c s/12/B/
 259         EOF
 260         test_cmp expected actual
 261 '
 262
 263 test_expect_success 'no commits on one side' '
 264         git commit --amend -m "new message" &&
 265         git range-diff master HEAD@{1} HEAD
 266 '
 267
 268 test_expect_success 'changed message' '
 269         git range-diff --no-color topic...changed-message >actual &&
 270         sed s/Z/\ /g >expected <<-EOF &&
 271         1:  4de457d = 1:  f686024 s/5/A/
 272         2:  fccce22 ! 2:  4ab067d s/4/A/
 273             @@
 274             Z
 275             Z    s/4/A/
 276             Z
 277             +    Also a silly comment here!
 278             +
 279             Z ## file ##
 280             Z@@
 281             Z 1
 282         3:  147e64e = 3:  b9cb956 s/11/B/
 283         4:  a63e992 = 4:  8add5f1 s/12/B/
 284         EOF
 285         test_cmp expected actual
 286 '
 287
 288 test_expect_success 'dual-coloring' '
 289         sed -e "s|^:||" >expect <<-\EOF &&
 290         :<YELLOW>1:  a4b3333 = 1:  f686024 s/5/A/<RESET>
 291         :<RED>2:  f51d370 <RESET><YELLOW>!<RESET><GREEN> 2:  4ab067d<RESET><YELLOW> s/4/A/<RESET>
 292         :    <REVERSE><CYAN>@@<RESET>
 293         :     <RESET>
 294         :         s/4/A/<RESET>
 295         :     <RESET>
 296         :    <REVERSE><GREEN>+<RESET><BOLD>    Also a silly comment here!<RESET>
 297         :    <REVERSE><GREEN>+<RESET>
 298         :      ## file ##<RESET>
 299         :    <CYAN> @@<RESET>
 300         :      1<RESET>
 301         :<RED>3:  0559556 <RESET><YELLOW>!<RESET><GREEN> 3:  b9cb956<RESET><YELLOW> s/11/B/<RESET>
 302         :    <REVERSE><CYAN>@@<RESET>
 303         :      9<RESET>
 304         :      10<RESET>
 305         :    <RED> -11<RESET>
 306         :    <REVERSE><RED>-<RESET><FAINT;GREEN>+BB<RESET>
 307         :    <REVERSE><GREEN>+<RESET><BOLD;GREEN>+B<RESET>
 308         :      12<RESET>
 309         :      13<RESET>
 310         :      14<RESET>
 311         :<RED>4:  d966c5c <RESET><YELLOW>!<RESET><GREEN> 4:  8add5f1<RESET><YELLOW> s/12/B/<RESET>
 312         :    <REVERSE><CYAN>@@<RESET>
 313         :    <CYAN> @@ A<RESET>
 314         :      9<RESET>
 315         :      10<RESET>
 316         :    <REVERSE><RED>-<RESET><FAINT> BB<RESET>
 317         :    <REVERSE><GREEN>+<RESET><BOLD> B<RESET>
 318         :    <RED> -12<RESET>
 319         :    <GREEN> +B<RESET>
 320         :      13<RESET>
 321         EOF
 322         git range-diff changed...changed-message --color --dual-color >actual.raw &&
 323         test_decode_color >actual <actual.raw &&
 324         test_cmp expect actual
 325 '
 326
 327 for prev in topic master..topic
 328 do
 329         test_expect_success "format-patch --range-diff=$prev" '
 330                 git format-patch --cover-letter --range-diff=$prev \
 331                         master..unmodified >actual &&
 332                 test_when_finished "rm 000?-*" &&
 333                 test_line_count = 5 actual &&
 334                 test_i18ngrep "^Range-diff:$" 0000-* &&
 335                 grep "= 1: .* s/5/A" 0000-* &&
 336                 grep "= 2: .* s/4/A" 0000-* &&
 337                 grep "= 3: .* s/11/B" 0000-* &&
 338                 grep "= 4: .* s/12/B" 0000-*
 339         '
 340 done
 341
 342 test_expect_success 'format-patch --range-diff as commentary' '
 343         git format-patch --range-diff=HEAD~1 HEAD~1 >actual &&
 344         test_when_finished "rm 0001-*" &&
 345         test_line_count = 1 actual &&
 346         test_i18ngrep "^Range-diff:$" 0001-* &&
 347         grep "> 1: .* new message" 0001-*
 348 '
 349
 350 test_done