From 77eb2720460a3061ecdf3456d96a7093565fb4e9 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 27 Apr 2005 09:21:00 -0700 Subject: [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 Signed-off-by: Linus Torvalds --- diff.h | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) (limited to 'diff.h') diff --git a/diff.h b/diff.h index 24df9089c..8f269b277 100644 --- a/diff.h +++ b/diff.h @@ -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 { -- cgit v1.2.1