Mercurial > public > mercurial-scm > hg-stable
diff tests/test-extdiff @ 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 | 797c6e70092b |
| children | d4fa6bafc43a |
line wrap: on
line diff
--- a/tests/test-extdiff Mon Aug 06 14:42:11 2007 -0700 +++ b/tests/test-extdiff Mon Aug 06 14:50:57 2007 -0700 @@ -6,7 +6,9 @@ hg init a cd a echo a > a +echo b > b hg add +# should diff cloned directories hg extdiff -o -r $opt echo "[extdiff]" >> $HGRCPATH @@ -22,13 +24,17 @@ echo b >> a hg ci -d '1 0' -mtest2 +# should diff cloned files directly hg falabala -r 0:1 # test diff during merge hg update 0 -echo b >> b -hg add b +echo c >> c +hg add c hg ci -m "new branch" -d '1 0' hg update -C 1 hg merge tip -hg falabala || echo "diff-like tools yield a non-zero exit code" +# should diff cloned file against wc file +hg falabala > out || echo "diff-like tools yield a non-zero exit code" +# cleanup the output since the wc is a tmp directory +sed 's:\(.* \).*\(\/test-extdiff\):\1[tmp]\2:' out