Mercurial > public > mercurial-scm > hg
diff tests/test-extdiff.out @ 5137:2be225ea5722
extdiff: do single file diffs from the wc with no copy
Extdiff was always making a temporary directory and copying files even when not required. This change makes extdiff avoid the copy when diffing a single file that lives in the wc. This lets external diff tools edit the working copy file directly. It also lets other extensions resuse the functions in extdiff and get in-place diffs.
| author | Brad Schick <schickb@gmail.com> |
|---|---|
| date | Mon, 06 Aug 2007 14:50:57 -0700 |
| parents | 841568ccc09d |
| children | 4b0c9c674707 |
line wrap: on
line diff
--- a/tests/test-extdiff.out Mon Aug 06 14:42:11 2007 -0700 +++ b/tests/test-extdiff.out Mon Aug 06 14:50:57 2007 -0700 @@ -1,5 +1,7 @@ adding a +adding b Only in a: a +Only in a: b diffing a.000000000000 a hg falabala [OPTION]... [FILE]... @@ -22,10 +24,10 @@ -X --exclude exclude names matching the given patterns use "hg -v help falabala" to show global options -diffing a.e27a2475d60a a.5e49ec8d3f05 +diffing a.8a5febb7f867/a a.34eed99112ab/a 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) -diffing a.5e49ec8d3f05 a diff-like tools yield a non-zero exit code +diffing a.34eed99112ab/c [tmp]/test-extdiff/a/c