Commit Graph

15 Commits

Author SHA1 Message Date
Thomas Arendsen Hein
ea20cdf3f7 Removed unused ui parameter from revpair/revrange and fix its users. 2006-11-22 23:02:28 +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
TK Soh
a1ddb8da93 extdiff: use the default option only if the default program is used 2006-09-18 12:01:32 +02:00
Mathieu Clabaut
3107fb4b9f Update [extdiff] configuration sample for vimdiff,
taking acount cmd.xxx and opts.xxx configurations item.
2006-09-15 22:55:17 +02:00
Brendan Cully
24756bd157 Move revision parsing into cmdutil. 2006-09-14 11:19:35 -07:00
TK Soh
0658d7ce38 extdiff: do not shell-quote options to new commands
revert a change introduced by c64ec6e8ffa2
2006-08-28 16:30:48 -05:00
TK Soh
3f6491c428 extdiff: make new diff commands pick up their options correctly 2006-08-17 15:30:45 -05:00
Giorgos Keramidas
b558cdc911 Tune a bit the extdiff toplevel comments/samples.
* Capitalize the first letter of all sentences

* Add an example for GNU diff(1) 'context diff' mode.

* Explain the requirement for separate cmd.xxx and opts.xxx
  options in .hgrc, which hopefully will guard against users
  trying to add:

      [extdiff]
      # Add a new Mercurial command called `cdiff', which calls
      # GNU diff(1) in 'context diff' mode.
      cmd.cdiff = diff -Nprc5

  which fails for recent crew builds with:

      $ hg cdiff .
      making snapshot of 1 files from rev 07dc4a569f4e
      making snapshot of 1 files from working dir
      diff -Nprc5: not found

  The correct way to do this is by separating the cmd.cdiff and
  opts.cdiff parts like this:

      [extdiff]
      # Add a new Mercurial command called `cdiff', which calls
      # GNU diff(1) in 'context diff' mode.
      cmd.cdiff = diff
      opts.cdiff = -Nprc5

  so add it as a new example and explicitly describe it in the
  extdiff comments.
2006-08-15 18:14:58 +03:00
Vadim Gelfer
ad47ec66c1 extdiff: fix bugs. add test. 2006-08-14 15:51:35 -07:00
Brendan Cully
a8ca75d10f Properly shell-quote arguments in extdiff 2006-08-14 11:10:21 -07:00
Brendan Cully
82df5e8de9 Update extdiff for recent refactoring 2006-08-14 11:07:15 -07:00
Vadim Gelfer
80d6f2f7c7 remove localrepository.changes.
use localrepository.status instead.
2006-08-12 16:40:12 -07:00
Mathieu Clabaut ext:(%22)
5754e8f808 extdiff : add comment on how to use vim for doing directoy diff 2006-07-25 23:10:11 +02:00
Daniel Santa Cruz ext:(%22)
3232a6998e Minor typo change to reflect actual values used. 2006-05-22 12:17:44 -04:00
Vadim Gelfer
38e7119eca new extension: extdiff. allows to use external diff program. 2006-05-21 23:39:07 -07:00