diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-04-27 09:21:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-27 09:21:00 -0700 |
| commit | 77eb2720460a3061ecdf3456d96a7093565fb4e9 (patch) | |
| tree | f3f51f08231d5923749cb91c8c5f4526a9650f1c /diff.h | |
| parent | 520fc2415e83c0adfc1186ee922472c338cb4146 (diff) | |
| download | git-77eb2720460a3061ecdf3456d96a7093565fb4e9.tar.gz | |
[PATCH] Reworked external diff interface.
This introduces three public functions for diff-cache and friends can
use to call out to the GIT_EXTERNAL_DIFF program when they wish to.
A normal "add/remove/change" entry is turned into 7-parameter process
invocation of GIT_EXTERNAL_DIFF program as before. In addition, the
program can now be called with a single parameter when diff-cache and
friends want to report an unmerged path.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'diff.h')
| -rw-r--r-- | diff.h | 19 |
1 files changed, 14 insertions, 5 deletions
@@ -4,11 +4,20 @@ #ifndef DIFF_H #define DIFF_H -/* These two are for backward compatibility with show-diff; - * new users should not use them. - */ -extern void show_differences(const struct cache_entry *ce, int reverse); -extern void show_diff_empty(const struct cache_entry *ce, int reverse); +extern void diff_addremove(int addremove, + unsigned mode, + const unsigned char *sha1, + const char *base, + const char *path); + +extern void diff_change(unsigned mode1, unsigned mode2, + const unsigned char *sha1, + const unsigned char *sha2, + const char *base, const char *path); + +extern void diff_unmerge(const char *path); + +/* These are for diff-tree-helper */ struct diff_spec { union { |