git.oblomov.eu Git - git/blob - t/t4034-diff-words.sh

   1 #!/bin/sh
   2
   3 test_description='word diff colors'
   4
   5 . ./test-lib.sh
   6
   7 test_expect_success setup '
   8
   9         git config diff.color.old red
  10         git config diff.color.new green
  11
  12 '
  13
  14 decrypt_color () {
  15         sed \
  16                 -e 's/.\[1m/<WHITE>/g' \
  17                 -e 's/.\[31m/<RED>/g' \
  18                 -e 's/.\[32m/<GREEN>/g' \
  19                 -e 's/.\[36m/<BROWN>/g' \
  20                 -e 's/.\[m/<RESET>/g'
  21 }
  22
  23 word_diff () {
  24         test_must_fail git diff --no-index "$@" pre post > output &&
  25         decrypt_color < output > output.decrypted &&
  26         test_cmp expect output.decrypted
  27 }
  28
  29 cat > pre <<\EOF
  30 h(4)
  31
  32 a = b + c
  33 EOF
  34
  35 cat > post <<\EOF
  36 h(4),hh[44]
  37
  38 a = b + c
  39
  40 aa = a
  41
  42 aeff = aeff * ( aaa )
  43 EOF
  44
  45 cat > expect <<\EOF
  46 <WHITE>diff --git a/pre b/post<RESET>
  47 <WHITE>index 330b04f..5ed8eff 100644<RESET>
  48 <WHITE>--- a/pre<RESET>
  49 <WHITE>+++ b/post<RESET>
  50 <BROWN>@@ -1,3 +1,7 @@<RESET>
  51 <RED>h(4)<RESET><GREEN>h(4),hh[44]<RESET>
  52 <RESET>
  53 a = b + c<RESET>
  54
  55 <GREEN>aa = a<RESET>
  56
  57 <GREEN>aeff = aeff * ( aaa )<RESET>
  58 EOF
  59
  60 test_expect_success 'word diff with runs of whitespace' '
  61
  62         word_diff --color-words
  63
  64 '
  65
  66 cat > expect <<\EOF
  67 <WHITE>diff --git a/pre b/post<RESET>
  68 <WHITE>index 330b04f..5ed8eff 100644<RESET>
  69 <WHITE>--- a/pre<RESET>
  70 <WHITE>+++ b/post<RESET>
  71 <BROWN>@@ -1,3 +1,7 @@<RESET>
  72 h(4),<GREEN>hh<RESET>[44]
  73 <RESET>
  74 a = b + c<RESET>
  75
  76 <GREEN>aa = a<RESET>
  77
  78 <GREEN>aeff = aeff * ( aaa<RESET> )
  79 EOF
  80 cp expect expect.letter-runs-are-words
  81
  82 test_expect_success 'word diff with a regular expression' '
  83
  84         word_diff --color-words="[a-z]+"
  85
  86 '
  87
  88 test_expect_success 'set a diff driver' '
  89         git config diff.testdriver.wordRegex "[^[:space:]]" &&
  90         cat <<EOF > .gitattributes
  91 pre diff=testdriver
  92 post diff=testdriver
  93 EOF
  94 '
  95
  96 test_expect_success 'option overrides .gitattributes' '
  97
  98         word_diff --color-words="[a-z]+"
  99
 100 '
 101
 102 cat > expect <<\EOF
 103 <WHITE>diff --git a/pre b/post<RESET>
 104 <WHITE>index 330b04f..5ed8eff 100644<RESET>
 105 <WHITE>--- a/pre<RESET>
 106 <WHITE>+++ b/post<RESET>
 107 <BROWN>@@ -1,3 +1,7 @@<RESET>
 108 h(4)<GREEN>,hh[44]<RESET>
 109 <RESET>
 110 a = b + c<RESET>
 111
 112 <GREEN>aa = a<RESET>
 113
 114 <GREEN>aeff = aeff * ( aaa )<RESET>
 115 EOF
 116 cp expect expect.non-whitespace-is-word
 117
 118 test_expect_success 'use regex supplied by driver' '
 119
 120         word_diff --color-words
 121
 122 '
 123
 124 test_expect_success 'set diff.wordRegex option' '
 125         git config diff.wordRegex "[[:alnum:]]+"
 126 '
 127
 128 cp expect.letter-runs-are-words expect
 129
 130 test_expect_success 'command-line overrides config' '
 131         word_diff --color-words="[a-z]+"
 132 '
 133
 134 cp expect.non-whitespace-is-word expect
 135
 136 test_expect_success '.gitattributes override config' '
 137         word_diff --color-words
 138 '
 139
 140 test_expect_success 'remove diff driver regex' '
 141         git config --unset diff.testdriver.wordRegex
 142 '
 143
 144 cat > expect <<\EOF
 145 <WHITE>diff --git a/pre b/post<RESET>
 146 <WHITE>index 330b04f..5ed8eff 100644<RESET>
 147 <WHITE>--- a/pre<RESET>
 148 <WHITE>+++ b/post<RESET>
 149 <BROWN>@@ -1,3 +1,7 @@<RESET>
 150 h(4),<GREEN>hh[44<RESET>]
 151 <RESET>
 152 a = b + c<RESET>
 153
 154 <GREEN>aa = a<RESET>
 155
 156 <GREEN>aeff = aeff * ( aaa<RESET> )
 157 EOF
 158
 159 test_expect_success 'use configured regex' '
 160         word_diff --color-words
 161 '
 162
 163 echo 'aaa (aaa)' > pre
 164 echo 'aaa (aaa) aaa' > post
 165
 166 cat > expect <<\EOF
 167 <WHITE>diff --git a/pre b/post<RESET>
 168 <WHITE>index c29453b..be22f37 100644<RESET>
 169 <WHITE>--- a/pre<RESET>
 170 <WHITE>+++ b/post<RESET>
 171 <BROWN>@@ -1 +1 @@<RESET>
 172 aaa (aaa) <GREEN>aaa<RESET>
 173 EOF
 174
 175 test_expect_success 'test parsing words for newline' '
 176
 177         word_diff --color-words="a+"
 178
 179
 180 '
 181
 182 echo '(:' > pre
 183 echo '(' > post
 184
 185 cat > expect <<\EOF
 186 <WHITE>diff --git a/pre b/post<RESET>
 187 <WHITE>index 289cb9d..2d06f37 100644<RESET>
 188 <WHITE>--- a/pre<RESET>
 189 <WHITE>+++ b/post<RESET>
 190 <BROWN>@@ -1 +1 @@<RESET>
 191 (<RED>:<RESET>
 192 EOF
 193
 194 test_expect_success 'test when words are only removed at the end' '
 195
 196         word_diff --color-words=.
 197
 198 '
 199
 200 test_done