diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-05-22 10:04:37 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-22 10:17:50 -0700 |
| commit | 6b14d7faf0bad026a81a27bac07b47691f621b8f (patch) | |
| tree | b9d1923aaaea706179e9b27e07a843d277ad1bee /diff.h | |
| parent | 26dee0adfcfa6fc15a522d32765eabbe4f295237 (diff) | |
| download | git-6b14d7faf0bad026a81a27bac07b47691f621b8f.tar.gz | |
[PATCH] Diffcore updates.
This moves the path selection logic from individual programs to a new
diffcore transformer (diff-tree still needs to have its own for
performance reasons). Also the header printing code in diff-tree was
tweaked not to produce anything when pickaxe is in effect and there is
nothing interesting to report. An interesting example is the following
in the GIT archive itself:
$ git-whatchanged -p -C -S'or something in a real script'
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 | 22 |
1 files changed, 15 insertions, 7 deletions
@@ -26,16 +26,24 @@ extern void diff_unmerge(const char *path); extern int diff_scoreopt_parse(const char *opt); -#define DIFF_FORMAT_HUMAN 0 -#define DIFF_FORMAT_MACHINE 1 -#define DIFF_FORMAT_PATCH 2 -extern void diff_setup(int reverse, int diff_output_style); +#define DIFF_FORMAT_HUMAN 0 +#define DIFF_FORMAT_MACHINE 1 +#define DIFF_FORMAT_PATCH 2 +#define DIFF_FORMAT_NO_OUTPUT 3 +extern void diff_setup(int reverse); -extern void diff_detect_rename(int, int); -extern void diff_pickaxe(const char *); +#define DIFF_DETECT_RENAME 1 +#define DIFF_DETECT_COPY 2 + +extern void diffcore_rename(int rename_copy, int minimum_score); + +extern void diffcore_prune(void); + +extern void diffcore_pickaxe(const char *needle); +extern void diffcore_pathspec(const char **pathspec); extern int diff_queue_is_empty(void); -extern void diff_flush(const char **, int); +extern void diff_flush(int output_style); #endif /* DIFF_H */ |