1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545
|
$ echo "[extensions]" >> $HGRCPATH
$ echo "extdiff=" >> $HGRCPATH
$ hg init a
$ cd a
$ echo a > a
$ echo b > b
$ hg add
adding a
adding b
Should diff cloned directories:
$ hg extdiff -o -r $opt
Only in a: a
Only in a: b
[1]
$ cat <<EOF >> $HGRCPATH
> [extdiff]
> cmd.falabala = echo
> opts.falabala = diffing
> cmd.edspace = echo
> opts.edspace = "name <user@example.com>"
> alabalaf =
> [merge-tools]
> alabalaf.executable = echo
> alabalaf.diffargs = diffing
> EOF
$ hg falabala
diffing a.000000000000 a
[1]
$ hg help falabala
hg falabala [OPTION]... [FILE]...
use external program to diff repository (or selected files)
Show differences between revisions for the specified files, using the
following program:
'echo'
When two revision arguments are given, then changes are shown between
those revisions. If only one revision is specified then that revision is
compared to the working directory, and, when no revisions are specified,
the working directory files are compared to its parent.
options ([+] can be repeated):
-o --option OPT [+] pass option to comparison program
-r --rev REV [+] revision
-c --change REV change made by revision
--per-file compare each file instead of revision snapshots
--confirm prompt user before each external program invocation
--patch compare patches for two revisions
-I --include PATTERN [+] include names matching the given patterns
-X --exclude PATTERN [+] exclude names matching the given patterns
-S --subrepos recurse into subrepositories
(some details hidden, use --verbose to show complete help)
$ hg ci -d '0 0' -mtest1
$ echo b >> a
$ hg ci -d '1 0' -mtest2
Should diff cloned files directly:
$ hg falabala -r 0:1
diffing "*\\extdiff.*\\a.8a5febb7f867\\a" "a.34eed99112ab\\a" (glob) (windows !)
diffing */extdiff.*/a.8a5febb7f867/a a.34eed99112ab/a (glob) (no-windows !)
[1]
Specifying an empty revision should abort.
$ hg extdiff -p diff --patch --rev 'ancestor()' --rev 1
abort: empty revision on one side of range
[255]
Test diff during merge:
$ hg update -C 0
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo c >> c
$ hg add c
$ hg ci -m "new branch" -d '1 0'
created new head
$ hg merge 1
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
Should diff cloned file against wc file:
$ hg falabala
diffing "*\\extdiff.*\\a.2a13a4d2da36\\a" "*\\a\\a" (glob) (windows !)
diffing */extdiff.*/a.2a13a4d2da36/a */a/a (glob) (no-windows !)
[1]
Test --change option:
$ hg ci -d '2 0' -mtest3
$ hg falabala -c 1
diffing "*\\extdiff.*\\a.8a5febb7f867\\a" "a.34eed99112ab\\a" (glob) (windows !)
diffing */extdiff.*/a.8a5febb7f867/a a.34eed99112ab/a (glob) (no-windows !)
[1]
Check diff are made from the first parent:
$ hg falabala -c 3 || echo "diff-like tools yield a non-zero exit code"
diffing "*\\extdiff.*\\a.2a13a4d2da36\\a" "a.46c0e4daeb72\\a" (glob) (windows !)
diffing */extdiff.*/a.2a13a4d2da36/a a.46c0e4daeb72/a (glob) (no-windows !)
diff-like tools yield a non-zero exit code
issue3153: ensure using extdiff with removed subrepos doesn't crash:
$ hg init suba
$ cd suba
$ echo suba > suba
$ hg add
adding suba
$ hg ci -m "adding suba file"
$ cd ..
$ echo suba=suba > .hgsub
$ hg add
adding .hgsub
$ hg ci -Sm "adding subrepo"
$ echo > .hgsub
$ hg ci -m "removing subrepo"
$ hg falabala -r 4 -r 5 -S
diffing a.398e36faf9c6 a.5ab95fb166c4
[1]
Test --per-file option:
$ hg up -q -C 3
$ echo a2 > a
$ echo b2 > b
$ hg ci -d '3 0' -mtestmode1
created new head
$ hg falabala -c 6 --per-file
diffing "*\\extdiff.*\\a.46c0e4daeb72\\a" "a.81906f2b98ac\\a" (glob) (windows !)
diffing */extdiff.*/a.46c0e4daeb72/a a.81906f2b98ac/a (glob) (no-windows !)
diffing "*\\extdiff.*\\a.46c0e4daeb72\\b" "a.81906f2b98ac\\b" (glob) (windows !)
diffing */extdiff.*/a.46c0e4daeb72/b a.81906f2b98ac/b (glob) (no-windows !)
[1]
Test --per-file option for gui tool:
$ hg --config extdiff.gui.alabalaf=True alabalaf -c 6 --per-file --debug
diffing */extdiff.*/a.46c0e4daeb72/* a.81906f2b98ac/* (glob)
diffing */extdiff.*/a.46c0e4daeb72/* a.81906f2b98ac/* (glob)
making snapshot of 2 files from rev 46c0e4daeb72
a
b
making snapshot of 2 files from rev 81906f2b98ac
a
b
running '* diffing * *' in * (backgrounded) (glob)
running '* diffing * *' in * (backgrounded) (glob)
cleaning up temp directory
[1]
Test --per-file option for gui tool again:
$ hg --config merge-tools.alabalaf.gui=True alabalaf -c 6 --per-file --debug
diffing */extdiff.*/a.46c0e4daeb72/* a.81906f2b98ac/* (glob)
diffing */extdiff.*/a.46c0e4daeb72/* a.81906f2b98ac/* (glob)
making snapshot of 2 files from rev 46c0e4daeb72
a
b
making snapshot of 2 files from rev 81906f2b98ac
a
b
running '* diffing * *' in * (backgrounded) (glob)
running '* diffing * *' in * (backgrounded) (glob)
cleaning up temp directory
[1]
Test --per-file and --confirm options:
$ hg --config ui.interactive=True falabala -c 6 --per-file --confirm <<EOF
> n
> y
> EOF
diff a (1 of 2) [Yns?] n
diff b (2 of 2) [Yns?] y
diffing "*\\extdiff.*\\a.46c0e4daeb72\\b" "a.81906f2b98ac\\b" (glob) (windows !)
diffing */extdiff.*/a.46c0e4daeb72/b a.81906f2b98ac/b (glob) (no-windows !)
[1]
Test --per-file and --confirm options with skipping:
$ hg --config ui.interactive=True falabala -c 6 --per-file --confirm <<EOF
> s
> EOF
diff a (1 of 2) [Yns?] s
[1]
issue4463: usage of command line configuration without additional quoting
$ cat <<EOF >> $HGRCPATH
> [extdiff]
> cmd.4463a = echo
> opts.4463a = a-naked 'single quoted' "double quoted"
> 4463b = echo b-naked 'single quoted' "double quoted"
> echo =
> EOF
$ hg update -q -C 0
$ echo a >> a
$ hg --debug 4463a | grep '^running'
running 'echo a-naked \'single quoted\' "double quoted" "*\\a" "*\\a"' in */extdiff.* (glob) (windows !)
running 'echo a-naked \'single quoted\' "double quoted" */a $TESTTMP/a/a' in */extdiff.* (glob) (no-windows !)
$ hg --debug 4463b | grep '^running'
running 'echo b-naked \'single quoted\' "double quoted" "*\\a" "*\\a"' in */extdiff.* (glob) (windows !)
running 'echo b-naked \'single quoted\' "double quoted" */a $TESTTMP/a/a' in */extdiff.* (glob) (no-windows !)
$ hg --debug echo | grep '^running'
running '*echo* "*\\a" "*\\a"' in */extdiff.* (glob) (windows !)
running '*echo */a $TESTTMP/a/a' in */extdiff.* (glob) (no-windows !)
(getting options from other than extdiff section)
$ cat <<EOF >> $HGRCPATH
> [extdiff]
> # using diff-tools diffargs
> 4463b2 = echo
> # using merge-tools diffargs
> 4463b3 = echo
> # no diffargs
> 4463b4 = echo
> [diff-tools]
> 4463b2.diffargs = b2-naked 'single quoted' "double quoted"
> [merge-tools]
> 4463b3.diffargs = b3-naked 'single quoted' "double quoted"
> EOF
$ hg --debug 4463b2 | grep '^running'
running 'echo b2-naked \'single quoted\' "double quoted" "*\\a" "*\\a"' in */extdiff.* (glob) (windows !)
running 'echo b2-naked \'single quoted\' "double quoted" */a $TESTTMP/a/a' in */extdiff.* (glob) (no-windows !)
$ hg --debug 4463b3 | grep '^running'
running 'echo b3-naked \'single quoted\' "double quoted" "*\\a" "*\\a"' in */extdiff.* (glob) (windows !)
running 'echo b3-naked \'single quoted\' "double quoted" */a $TESTTMP/a/a' in */extdiff.* (glob) (no-windows !)
$ hg --debug 4463b4 | grep '^running'
running 'echo "*\\a" "*\\a"' in */extdiff.* (glob) (windows !)
running 'echo */a $TESTTMP/a/a' in */extdiff.* (glob) (no-windows !)
$ hg --debug 4463b4 --option b4-naked --option 'being quoted' | grep '^running'
running 'echo b4-naked "being quoted" "*\\a" "*\\a"' in */extdiff.* (glob) (windows !)
running "echo b4-naked 'being quoted' */a $TESTTMP/a/a" in */extdiff.* (glob) (no-windows !)
$ hg --debug extdiff -p echo --option echo-naked --option 'being quoted' | grep '^running'
running 'echo echo-naked "being quoted" "*\\a" "*\\a"' in */extdiff.* (glob) (windows !)
running "echo echo-naked 'being quoted' */a $TESTTMP/a/a" in */extdiff.* (glob) (no-windows !)
$ touch 'sp ace'
$ hg add 'sp ace'
$ hg ci -m 'sp ace'
created new head
$ echo > 'sp ace'
Test pre-72a89cf86fcd backward compatibility with half-baked manual quoting
$ cat <<EOF >> $HGRCPATH
> [extdiff]
> odd =
> [merge-tools]
> odd.diffargs = --foo='\$clabel' '\$clabel' "--bar=\$clabel" "\$clabel"
> odd.executable = echo
> EOF
$ hg --debug odd | grep '^running'
running '"*\\echo.exe" --foo="sp ace" "sp ace" --bar="sp ace" "sp ace"' in * (glob) (windows !)
running "*/echo --foo='sp ace' 'sp ace' --bar='sp ace' 'sp ace'" in * (glob) (no-windows !)
Empty argument must be quoted
$ cat <<EOF >> $HGRCPATH
> [extdiff]
> kdiff3 = echo
> [merge-tools]
> kdiff3.diffargs=--L1 \$plabel1 --L2 \$clabel \$parent \$child
> EOF
$ hg --debug kdiff3 -r0 | grep '^running'
running 'echo --L1 "@0" --L2 "" a.8a5febb7f867 a' in * (glob) (windows !)
running "echo --L1 '@0' --L2 '' a.8a5febb7f867 a" in * (glob) (no-windows !)
Test extdiff of multiple files in tmp dir:
$ hg update -C 0 > /dev/null
$ echo changed > a
$ echo changed > b
#if execbit
$ chmod +x b
#endif
Diff in working directory, before:
$ hg diff --git
diff --git a/a b/a
--- a/a
+++ b/a
@@ -1,1 +1,1 @@
-a
+changed
diff --git a/b b/b
old mode 100644 (execbit !)
new mode 100755 (execbit !)
--- a/b
+++ b/b
@@ -1,1 +1,1 @@
-b
+changed
Edit with extdiff -p:
Prepare custom diff/edit tool:
$ cat > 'diff tool.py' << EOT
> #!$PYTHON
> import time
> time.sleep(1) # avoid unchanged-timestamp problems
> open('a/a', 'ab').write(b'edited\n')
> open('a/b', 'ab').write(b'edited\n')
> EOT
#if execbit
$ chmod +x 'diff tool.py'
#endif
will change to /tmp/extdiff.TMP and populate directories a.TMP and a
and start tool
#if windows
$ cat > 'diff tool.bat' << EOF
> @"$PYTHON" "`pwd`/diff tool.py"
> EOF
$ hg extdiff -p "`pwd`/diff tool.bat"
[1]
#else
$ hg extdiff -p "`pwd`/diff tool.py"
[1]
#endif
Diff in working directory, after:
$ hg diff --git
diff --git a/a b/a
--- a/a
+++ b/a
@@ -1,1 +1,2 @@
-a
+changed
+edited
diff --git a/b b/b
old mode 100644 (execbit !)
new mode 100755 (execbit !)
--- a/b
+++ b/b
@@ -1,1 +1,2 @@
-b
+changed
+edited
Test extdiff with --option:
$ hg extdiff -p echo -o this -c 1
this "*\\a.8a5febb7f867\\a" "a.34eed99112ab\\a" (glob) (windows !)
this */extdiff.*/a.8a5febb7f867/a a.34eed99112ab/a (glob) (no-windows !)
[1]
$ hg falabala -o this -c 1
diffing this "*\\a.8a5febb7f867\\a" "a.34eed99112ab\\a" (glob) (windows !)
diffing this */extdiff.*/a.8a5febb7f867/a a.34eed99112ab/a (glob) (no-windows !)
[1]
Test extdiff's handling of options with spaces in them:
$ hg edspace -c 1
"name <user@example.com>" "*\\a.8a5febb7f867\\a" "a.34eed99112ab\\a" (glob) (windows !)
name <user@example.com> */extdiff.*/a.8a5febb7f867/a a.34eed99112ab/a (glob) (no-windows !)
[1]
$ hg extdiff -p echo -o "name <user@example.com>" -c 1
"name <user@example.com>" "*\\a.8a5febb7f867\\a" "a.34eed99112ab\\a" (glob) (windows !)
name <user@example.com> */extdiff.*/a.8a5febb7f867/a a.34eed99112ab/a (glob) (no-windows !)
[1]
Test with revsets:
$ hg extdif -p echo -c "rev(1)"
"*\\a.8a5febb7f867\\a" "a.34eed99112ab\\a" (glob) (windows !)
*/extdiff.*/a.8a5febb7f867/a a.34eed99112ab/a (glob) (no-windows !)
[1]
$ hg extdif -p echo -r "0::1"
"*\\a.8a5febb7f867\\a" "a.34eed99112ab\\a" (glob) (windows !)
*/extdiff.*/a.8a5febb7f867/a a.34eed99112ab/a (glob) (no-windows !)
[1]
Fallback to merge-tools.tool.executable|regkey
$ mkdir dir
$ cat > 'dir/tool.sh' << 'EOF'
> #!/bin/sh
> # Mimic a tool that syncs all attrs, including mtime
> cp $1/a $2/a
> touch -r $1/a $2/a
> chmod +x $2/a
> echo "** custom diff **"
> EOF
#if execbit
$ chmod +x dir/tool.sh
#endif
Windows can't run *.sh directly, so create a shim executable that can be.
Without something executable, the next hg command will try to run `tl` instead
of $tool (and fail).
#if windows
$ cat > dir/tool.bat <<EOF
> @sh -c "`pwd`/dir/tool.sh %1 %2"
> EOF
$ tool=`pwd`/dir/tool.bat
#else
$ tool=`pwd`/dir/tool.sh
#endif
$ cat a
changed
edited
$ hg --debug tl --config extdiff.tl= --config merge-tools.tl.executable=$tool
making snapshot of 2 files from rev * (glob)
a
b
making snapshot of 2 files from working directory
a
b
running '$TESTTMP/a/dir/tool.bat a.* a' in */extdiff.* (glob) (windows !)
running '$TESTTMP/a/dir/tool.sh a.* a' in */extdiff.* (glob) (no-windows !)
** custom diff **
file changed while diffing. Overwriting: $TESTTMP/a/a (src: */extdiff.*/a/a) (glob)
cleaning up temp directory
[1]
$ cat a
a
#if execbit
$ [ -x a ]
$ cat > 'dir/tool.sh' << 'EOF'
> #!/bin/sh
> chmod -x $2/a
> echo "** custom diff **"
> EOF
$ hg --debug tl --config extdiff.tl= --config merge-tools.tl.executable=$tool
making snapshot of 2 files from rev * (glob)
a
b
making snapshot of 2 files from working directory
a
b
running '$TESTTMP/a/dir/tool.sh a.* a' in */extdiff.* (glob)
** custom diff **
file changed while diffing. Overwriting: $TESTTMP/a/a (src: */extdiff.*/a/a) (glob)
cleaning up temp directory
[1]
$ [ -x a ]
[1]
#endif
$ cd ..
#if symlink
Test symlinks handling (issue1909)
$ hg init testsymlinks
$ cd testsymlinks
$ echo a > a
$ hg ci -Am adda
adding a
$ echo a >> a
$ ln -s missing linka
$ hg add linka
$ hg falabala -r 0 --traceback
diffing testsymlinks.07f494440405 testsymlinks
[1]
$ cd ..
#endif
Test handling of non-ASCII paths in generated docstrings (issue5301)
>>> with open("u", "wb") as f:
... n = f.write(b"\xa5\xa5")
$ U=`cat u`
$ HGPLAIN=1 hg --config hgext.extdiff= --config extdiff.cmd.td=hi help -k xyzzy
abort: no matches
(try 'hg help' for a list of topics)
[255]
$ HGPLAIN=1 hg --config hgext.extdiff= --config extdiff.cmd.td=hi help td > /dev/null
$ LC_MESSAGES=ja_JP.UTF-8 hg --config hgext.extdiff= --config extdiff.cmd.td=$U help -k xyzzy
abort: no matches
(try 'hg help' for a list of topics)
[255]
$ LC_MESSAGES=ja_JP.UTF-8 hg --config hgext.extdiff= --config extdiff.cmd.td=$U help td \
> | grep "^ '"
'\xa5\xa5'
$ cd $TESTTMP
Test that diffing a single file works, even if that file is new
$ hg init testsinglefile
$ cd testsinglefile
$ echo a > a
$ hg add a
$ hg falabala
diffing nul "*\\a" (glob) (windows !)
diffing /dev/null */a (glob) (no-windows !)
[1]
$ hg ci -qm a
$ hg falabala -c .
diffing nul "*\\a" (glob) (windows !)
diffing /dev/null */a (glob) (no-windows !)
[1]
$ echo a >> a
$ hg falabala
diffing "*\\a" "*\\a" (glob) (windows !)
diffing */a */a (glob) (no-windows !)
[1]
$ hg ci -qm 2a
$ hg falabala -c .
diffing "*\\a" "*\\a" (glob) (windows !)
diffing */a */a (glob) (no-windows !)
[1]
|