Commit Graph

9 Commits

Author SHA1 Message Date
Dirkjan Ochtman
3e3b0d62eb warn about new heads on commit (issue842) 2008-03-21 11:06:02 +01: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
Brad Schick
eec22b0f45 extdiff: made it less chatty in non-verbose mode
Made the status info only display in verbose mode since most hg commands aren't so chatty. This also makes it cleaner for other extensions to call extdiff.
2007-08-06 14:42:11 -07:00
Thomas Arendsen Hein
0b7147a667 Updated command tables in commands.py and hgext extensions.
- Marked for translation where extensions already had _()
- Corrected indentation
- fixed a few synopsises
2007-06-26 22:38:57 +02:00
Alexis S. L. Carvalho
8e9491052e Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output
This should make it easier to discover global options.

As a bonus, they are no longer displayed by something like a
hg -v help dates
2007-04-07 04:27:55 -03: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
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