Commit Graph

8 Commits

Author SHA1 Message Date
Thomas Arendsen Hein
e34927453f Remove trailing spaces, fix indentation 2007-08-07 10:28:43 +02:00
Brad Schick
18eb282ff7 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.
2007-08-06 14:50:57 -07:00
Thomas Arendsen Hein
9e4b3b8023 Don't require a diff which accepts the -N option. 2006-12-01 22:29:47 +01:00
Benoit Boissinot
cec92b2bd7 fix traceback of extdiff after a merge
- files that comes from a different branch are marked as modified
  but aren't present in the original manifest
- add a testcase for extdiff and for regular diff
2006-10-11 16:35:09 +02:00
Thomas Arendsen Hein
a1f1b33ecb Make tests append settings to $HGRCPATH instead of $HGTMP/.hgrc
and add documentation for this.
2006-08-22 10:08:42 +02:00
Danek Duvall
c6b9a108d2 Solaris portability fixes 2006-08-18 10:24:04 -07:00
Thomas Arendsen Hein
d4d1d2313a Fixed test-extdiff.
diff-like tools usually return 1 if differences are found.
Currently the extdiff returns 256, but that's a different topic
(consolidating return code handling in hg).
2006-08-15 16:04:47 +02:00
Vadim Gelfer
ad47ec66c1 extdiff: fix bugs. add test. 2006-08-14 15:51:35 -07:00