t/t4061-diff-indent.sh

   1 #!/bin/sh
   2
   3 test_description='Test diff indent heuristic.
   4
   5 '
   6 GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
   7 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
   8
   9 TEST_PASSES_SANITIZE_LEAK=true
  10 . ./test-lib.sh
  11 . "$TEST_DIRECTORY"/lib-diff.sh
  12
  13 # Compare two diff outputs. Ignore "index" lines, because we don't
  14 # care about SHA-1s or file modes.
  15 compare_diff () {
  16         sed -e "/^index /d" <"$1" >.tmp-1
  17         sed -e "/^index /d" <"$2" >.tmp-2
  18         test_cmp .tmp-1 .tmp-2 && rm -f .tmp-1 .tmp-2
  19 }
  20
  21 # Compare blame output using the expectation for a diff as reference.
  22 # Only look for the lines coming from non-boundary commits.
  23 compare_blame () {
  24         sed -n -e "1,4d" -e "s/^+//p" <"$1" >.tmp-1
  25         sed -ne "s/^[^^][^)]*) *//p" <"$2" >.tmp-2
  26         test_cmp .tmp-1 .tmp-2 && rm -f .tmp-1 .tmp-2
  27 }
  28
  29 test_expect_success 'prepare' '
  30         cat <<-\EOF >spaces.txt &&
  31         1
  32         2
  33         a
  34
  35         b
  36         3
  37         4
  38         EOF
  39
  40         cat <<-\EOF >functions.c &&
  41         1
  42         2
  43         /* function */
  44         foo() {
  45             foo
  46         }
  47
  48         3
  49         4
  50         EOF
  51
  52         git add spaces.txt functions.c &&
  53         test_tick &&
  54         git commit -m initial &&
  55         git branch old &&
  56
  57         cat <<-\EOF >spaces.txt &&
  58         1
  59         2
  60         a
  61
  62         b
  63         a
  64
  65         b
  66         3
  67         4
  68         EOF
  69
  70         cat <<-\EOF >functions.c &&
  71         1
  72         2
  73         /* function */
  74         bar() {
  75             foo
  76         }
  77
  78         /* function */
  79         foo() {
  80             foo
  81         }
  82
  83         3
  84         4
  85         EOF
  86
  87         git add spaces.txt functions.c &&
  88         test_tick &&
  89         git commit -m initial &&
  90         git branch new &&
  91
  92         tr "_" " " <<-\EOF >spaces-expect &&
  93         diff --git a/spaces.txt b/spaces.txt
  94         --- a/spaces.txt
  95         +++ b/spaces.txt
  96         @@ -3,5 +3,8 @@
  97          a
  98         _
  99          b
 100         +a
 101         +
 102         +b
 103          3
 104          4
 105         EOF
 106
 107         tr "_" " " <<-\EOF >spaces-compacted-expect &&
 108         diff --git a/spaces.txt b/spaces.txt
 109         --- a/spaces.txt
 110         +++ b/spaces.txt
 111         @@ -2,6 +2,9 @@
 112          2
 113          a
 114         _
 115         +b
 116         +a
 117         +
 118          b
 119          3
 120          4
 121         EOF
 122
 123         tr "_" " " <<-\EOF >functions-expect &&
 124         diff --git a/functions.c b/functions.c
 125         --- a/functions.c
 126         +++ b/functions.c
 127         @@ -1,6 +1,11 @@
 128          1
 129          2
 130          /* function */
 131         +bar() {
 132         +    foo
 133         +}
 134         +
 135         +/* function */
 136          foo() {
 137              foo
 138          }
 139         EOF
 140
 141         tr "_" " " <<-\EOF >functions-compacted-expect
 142         diff --git a/functions.c b/functions.c
 143         --- a/functions.c
 144         +++ b/functions.c
 145         @@ -1,5 +1,10 @@
 146          1
 147          2
 148         +/* function */
 149         +bar() {
 150         +    foo
 151         +}
 152         +
 153          /* function */
 154          foo() {
 155              foo
 156         EOF
 157 '
 158
 159 # --- diff tests ----------------------------------------------------------
 160
 161 test_expect_success 'diff: ugly spaces' '
 162         git diff --no-indent-heuristic old new -- spaces.txt >out &&
 163         compare_diff spaces-expect out
 164 '
 165
 166 test_expect_success 'diff: --no-indent-heuristic overrides config' '
 167         git -c diff.indentHeuristic=true diff --no-indent-heuristic old new -- spaces.txt >out2 &&
 168         compare_diff spaces-expect out2
 169 '
 170
 171 test_expect_success 'diff: nice spaces with --indent-heuristic' '
 172         git -c diff.indentHeuristic=false diff --indent-heuristic old new -- spaces.txt >out-compacted &&
 173         compare_diff spaces-compacted-expect out-compacted
 174 '
 175
 176 test_expect_success 'diff: nice spaces with diff.indentHeuristic=true' '
 177         git -c diff.indentHeuristic=true diff old new -- spaces.txt >out-compacted2 &&
 178         compare_diff spaces-compacted-expect out-compacted2
 179 '
 180
 181 test_expect_success 'diff: --indent-heuristic with --patience' '
 182         git diff --indent-heuristic --patience old new -- spaces.txt >out-compacted3 &&
 183         compare_diff spaces-compacted-expect out-compacted3
 184 '
 185
 186 test_expect_success 'diff: --indent-heuristic with --histogram' '
 187         git diff --indent-heuristic --histogram old new -- spaces.txt >out-compacted4 &&
 188         compare_diff spaces-compacted-expect out-compacted4
 189 '
 190
 191 test_expect_success 'diff: ugly functions' '
 192         git diff --no-indent-heuristic old new -- functions.c >out &&
 193         compare_diff functions-expect out
 194 '
 195
 196 test_expect_success 'diff: nice functions with --indent-heuristic' '
 197         git diff --indent-heuristic old new -- functions.c >out-compacted &&
 198         compare_diff functions-compacted-expect out-compacted
 199 '
 200
 201 # --- blame tests ---------------------------------------------------------
 202
 203 test_expect_success 'blame: nice spaces with --indent-heuristic' '
 204         git blame --indent-heuristic old..new -- spaces.txt >out-blame-compacted &&
 205         compare_blame spaces-compacted-expect out-blame-compacted
 206 '
 207
 208 test_expect_success 'blame: nice spaces with diff.indentHeuristic=true' '
 209         git -c diff.indentHeuristic=true blame old..new -- spaces.txt >out-blame-compacted2 &&
 210         compare_blame spaces-compacted-expect out-blame-compacted2
 211 '
 212
 213 test_expect_success 'blame: ugly spaces with --no-indent-heuristic' '
 214         git blame --no-indent-heuristic old..new -- spaces.txt >out-blame &&
 215         compare_blame spaces-expect out-blame
 216 '
 217
 218 test_expect_success 'blame: ugly spaces with diff.indentHeuristic=false' '
 219         git -c diff.indentHeuristic=false blame old..new -- spaces.txt >out-blame2 &&
 220         compare_blame spaces-expect out-blame2
 221 '
 222
 223 test_expect_success 'blame: --no-indent-heuristic overrides config' '
 224         git -c diff.indentHeuristic=true blame --no-indent-heuristic old..new -- spaces.txt >out-blame3 &&
 225         git blame old..new -- spaces.txt >out-blame &&
 226         compare_blame spaces-expect out-blame3
 227 '
 228
 229 test_expect_success 'blame: --indent-heuristic overrides config' '
 230         git -c diff.indentHeuristic=false blame --indent-heuristic old..new -- spaces.txt >out-blame-compacted3 &&
 231         compare_blame spaces-compacted-expect out-blame-compacted2
 232 '
 233
 234 # --- diff-tree tests -----------------------------------------------------
 235
 236 test_expect_success 'diff-tree: nice spaces with --indent-heuristic' '
 237         git diff-tree --indent-heuristic -p old new -- spaces.txt >out-diff-tree-compacted &&
 238         compare_diff spaces-compacted-expect out-diff-tree-compacted
 239 '
 240
 241 test_expect_success 'diff-tree: nice spaces with diff.indentHeuristic=true' '
 242         git -c diff.indentHeuristic=true diff-tree -p old new -- spaces.txt >out-diff-tree-compacted2 &&
 243         compare_diff spaces-compacted-expect out-diff-tree-compacted2
 244 '
 245
 246 test_expect_success 'diff-tree: ugly spaces with --no-indent-heuristic' '
 247         git diff-tree --no-indent-heuristic -p old new -- spaces.txt >out-diff-tree &&
 248         compare_diff spaces-expect out-diff-tree
 249 '
 250
 251 test_expect_success 'diff-tree: ugly spaces with diff.indentHeuristic=false' '
 252         git -c diff.indentHeuristic=false diff-tree -p old new -- spaces.txt >out-diff-tree2 &&
 253         compare_diff spaces-expect out-diff-tree2
 254 '
 255
 256 test_expect_success 'diff-tree: --indent-heuristic overrides config' '
 257         git -c diff.indentHeuristic=false diff-tree --indent-heuristic -p old new -- spaces.txt >out-diff-tree-compacted3 &&
 258         compare_diff spaces-compacted-expect out-diff-tree-compacted3
 259 '
 260
 261 test_expect_success 'diff-tree: --no-indent-heuristic overrides config' '
 262         git -c diff.indentHeuristic=true diff-tree --no-indent-heuristic -p old new -- spaces.txt >out-diff-tree3 &&
 263         compare_diff spaces-expect out-diff-tree3
 264 '
 265
 266 # --- diff-index tests ----------------------------------------------------
 267
 268 test_expect_success 'diff-index: nice spaces with --indent-heuristic' '
 269         git checkout -B diff-index &&
 270         git reset --soft HEAD~ &&
 271         git diff-index --indent-heuristic -p old -- spaces.txt >out-diff-index-compacted &&
 272         compare_diff spaces-compacted-expect out-diff-index-compacted &&
 273         git checkout -f main
 274 '
 275
 276 test_expect_success 'diff-index: nice spaces with diff.indentHeuristic=true' '
 277         git checkout -B diff-index &&
 278         git reset --soft HEAD~ &&
 279         git -c diff.indentHeuristic=true diff-index -p old -- spaces.txt >out-diff-index-compacted2 &&
 280         compare_diff spaces-compacted-expect out-diff-index-compacted2 &&
 281         git checkout -f main
 282 '
 283
 284 test_expect_success 'diff-index: ugly spaces with --no-indent-heuristic' '
 285         git checkout -B diff-index &&
 286         git reset --soft HEAD~ &&
 287         git diff-index --no-indent-heuristic -p old -- spaces.txt >out-diff-index &&
 288         compare_diff spaces-expect out-diff-index &&
 289         git checkout -f main
 290 '
 291
 292 test_expect_success 'diff-index: ugly spaces with diff.indentHeuristic=false' '
 293         git checkout -B diff-index &&
 294         git reset --soft HEAD~ &&
 295         git -c diff.indentHeuristic=false diff-index -p old -- spaces.txt >out-diff-index2 &&
 296         compare_diff spaces-expect out-diff-index2 &&
 297         git checkout -f main
 298 '
 299
 300 test_expect_success 'diff-index: --indent-heuristic overrides config' '
 301         git checkout -B diff-index &&
 302         git reset --soft HEAD~ &&
 303         git -c diff.indentHeuristic=false diff-index --indent-heuristic -p old -- spaces.txt >out-diff-index-compacted3 &&
 304         compare_diff spaces-compacted-expect out-diff-index-compacted3 &&
 305         git checkout -f main
 306 '
 307
 308 test_expect_success 'diff-index: --no-indent-heuristic overrides config' '
 309         git checkout -B diff-index &&
 310         git reset --soft HEAD~ &&
 311         git -c diff.indentHeuristic=true diff-index --no-indent-heuristic -p old -- spaces.txt >out-diff-index3 &&
 312         compare_diff spaces-expect out-diff-index3 &&
 313         git checkout -f main
 314 '
 315
 316 # --- diff-files tests ----------------------------------------------------
 317
 318 test_expect_success 'diff-files: nice spaces with --indent-heuristic' '
 319         git checkout -B diff-files &&
 320         git reset HEAD~ &&
 321         git diff-files --indent-heuristic -p spaces.txt >out-diff-files-raw &&
 322         grep -v index out-diff-files-raw >out-diff-files-compacted &&
 323         compare_diff spaces-compacted-expect out-diff-files-compacted &&
 324         git checkout -f main
 325 '
 326
 327 test_expect_success 'diff-files: nice spaces with diff.indentHeuristic=true' '
 328         git checkout -B diff-files &&
 329         git reset HEAD~ &&
 330         git -c diff.indentHeuristic=true diff-files -p spaces.txt >out-diff-files-raw2 &&
 331         grep -v index out-diff-files-raw2 >out-diff-files-compacted2 &&
 332         compare_diff spaces-compacted-expect out-diff-files-compacted2 &&
 333         git checkout -f main
 334 '
 335
 336 test_expect_success 'diff-files: ugly spaces with --no-indent-heuristic' '
 337         git checkout -B diff-files &&
 338         git reset HEAD~ &&
 339         git diff-files --no-indent-heuristic -p spaces.txt >out-diff-files-raw &&
 340         grep -v index out-diff-files-raw >out-diff-files &&
 341         compare_diff spaces-expect out-diff-files &&
 342         git checkout -f main
 343 '
 344
 345 test_expect_success 'diff-files: ugly spaces with diff.indentHeuristic=false' '
 346         git checkout -B diff-files &&
 347         git reset HEAD~ &&
 348         git -c diff.indentHeuristic=false diff-files -p spaces.txt >out-diff-files-raw2 &&
 349         grep -v index out-diff-files-raw2 >out-diff-files &&
 350         compare_diff spaces-expect out-diff-files &&
 351         git checkout -f main
 352 '
 353
 354 test_expect_success 'diff-files: --indent-heuristic overrides config' '
 355         git checkout -B diff-files &&
 356         git reset HEAD~ &&
 357         git -c diff.indentHeuristic=false diff-files --indent-heuristic -p spaces.txt >out-diff-files-raw3 &&
 358         grep -v index out-diff-files-raw3 >out-diff-files-compacted &&
 359         compare_diff spaces-compacted-expect out-diff-files-compacted &&
 360         git checkout -f main
 361 '
 362
 363 test_expect_success 'diff-files: --no-indent-heuristic overrides config' '
 364         git checkout -B diff-files &&
 365         git reset HEAD~ &&
 366         git -c diff.indentHeuristic=true diff-files --no-indent-heuristic -p spaces.txt >out-diff-files-raw4 &&
 367         grep -v index out-diff-files-raw4 >out-diff-files &&
 368         compare_diff spaces-expect out-diff-files &&
 369         git checkout -f main
 370 '
 371
 372 test_done