Mercurial > hg
comparison tests/test-extdiff.t @ 24108:d65ecb814fc0 stable
shellquote: fix missing quotes for empty string
"hg kdiff3 -rREV" did not work because 1642eb429536 and 5edb387158a1 failed
to handle empty argument.
| author | Yuya Nishihara <yuya@tcha.org> |
|---|---|
| date | Wed, 11 Feb 2015 19:57:07 +0900 |
| parents | e484546a7c18 |
| children | f7401f816cc9 |
comparison
equal
deleted
inserted
replaced
| 24013:942a5a34b2d0 | 24108:d65ecb814fc0 |
|---|---|
| 180 #else | 180 #else |
| 181 $ hg --debug odd | grep '^running' | 181 $ hg --debug odd | grep '^running' |
| 182 running "*/bin/echo --foo='sp ace' 'sp ace' --bar='sp ace' 'sp ace'" in * (glob) | 182 running "*/bin/echo --foo='sp ace' 'sp ace' --bar='sp ace' 'sp ace'" in * (glob) |
| 183 #endif | 183 #endif |
| 184 | 184 |
| 185 Empty argument must be quoted | |
| 186 | |
| 187 $ cat <<EOF >> $HGRCPATH | |
| 188 > [extdiff] | |
| 189 > kdiff3 = echo | |
| 190 > [merge-tools] | |
| 191 > kdiff3.diffargs=--L1 \$plabel1 --L2 \$clabel \$parent \$child | |
| 192 > EOF | |
| 193 #if windows | |
| 194 $ hg --debug kdiff3 -r0 | grep '^running' | |
| 195 running 'echo --L1 "@0" --L2 "" a.8a5febb7f867 a' in * (glob) | |
| 196 #else | |
| 197 $ hg --debug kdiff3 -r0 | grep '^running' | |
| 198 running "echo --L1 '@0' --L2 '' a.8a5febb7f867 a" in * (glob) | |
| 199 #endif | |
| 200 | |
| 185 #if execbit | 201 #if execbit |
| 186 | 202 |
| 187 Test extdiff of multiple files in tmp dir: | 203 Test extdiff of multiple files in tmp dir: |
| 188 | 204 |
| 189 $ hg update -C 0 > /dev/null | 205 $ hg update -C 0 > /dev/null |