Junio C Hamano | be3cfa8 | 2005-04-26 09:25:05 -0700 | [diff] [blame] | 1 | /* |
| 2 | * Copyright (C) 2005 Junio C Hamano |
| 3 | */ |
Junio C Hamano | 86436c2 | 2005-04-25 18:22:47 -0700 | [diff] [blame] | 4 | #ifndef DIFF_H |
| 5 | #define DIFF_H |
| 6 | |
Junio C Hamano | 1b0c717 | 2006-03-29 22:55:43 -0800 | [diff] [blame] | 7 | #include "tree-walk.h" |
Linus Torvalds | 50f9a85 | 2006-01-31 14:10:56 -0800 | [diff] [blame] | 8 | |
Linus Torvalds | 9153983 | 2006-04-17 11:59:32 -0700 | [diff] [blame] | 9 | struct rev_info; |
Linus Torvalds | ac1b3d1 | 2005-10-20 21:05:05 -0700 | [diff] [blame] | 10 | struct diff_options; |
Jeff King | 0424558 | 2006-09-07 02:35:42 -0400 | [diff] [blame] | 11 | struct diff_queue_struct; |
Linus Torvalds | ac1b3d1 | 2005-10-20 21:05:05 -0700 | [diff] [blame] | 12 | |
| 13 | typedef void (*change_fn_t)(struct diff_options *options, |
| 14 | unsigned old_mode, unsigned new_mode, |
| 15 | const unsigned char *old_sha1, |
| 16 | const unsigned char *new_sha1, |
Dmitry Potapov | fd55a19 | 2008-07-16 18:54:02 +0400 | [diff] [blame] | 17 | const char *fullpath); |
Linus Torvalds | ac1b3d1 | 2005-10-20 21:05:05 -0700 | [diff] [blame] | 18 | |
| 19 | typedef void (*add_remove_fn_t)(struct diff_options *options, |
| 20 | int addremove, unsigned mode, |
| 21 | const unsigned char *sha1, |
Dmitry Potapov | fd55a19 | 2008-07-16 18:54:02 +0400 | [diff] [blame] | 22 | const char *fullpath); |
Linus Torvalds | ac1b3d1 | 2005-10-20 21:05:05 -0700 | [diff] [blame] | 23 | |
Jeff King | 0424558 | 2006-09-07 02:35:42 -0400 | [diff] [blame] | 24 | typedef void (*diff_format_fn_t)(struct diff_queue_struct *q, |
| 25 | struct diff_options *options, void *data); |
| 26 | |
Timo Hirvonen | c674434 | 2006-06-24 20:21:53 +0300 | [diff] [blame] | 27 | #define DIFF_FORMAT_RAW 0x0001 |
| 28 | #define DIFF_FORMAT_DIFFSTAT 0x0002 |
Junio C Hamano | 74e2abe | 2006-10-12 03:01:00 -0700 | [diff] [blame] | 29 | #define DIFF_FORMAT_NUMSTAT 0x0004 |
| 30 | #define DIFF_FORMAT_SUMMARY 0x0008 |
| 31 | #define DIFF_FORMAT_PATCH 0x0010 |
Nicolas Pitre | ebd124c | 2006-12-14 23:15:44 -0500 | [diff] [blame] | 32 | #define DIFF_FORMAT_SHORTSTAT 0x0020 |
Linus Torvalds | 7df7c01 | 2008-02-12 13:26:31 -0800 | [diff] [blame] | 33 | #define DIFF_FORMAT_DIRSTAT 0x0040 |
Timo Hirvonen | c674434 | 2006-06-24 20:21:53 +0300 | [diff] [blame] | 34 | |
| 35 | /* These override all above */ |
Junio C Hamano | 74e2abe | 2006-10-12 03:01:00 -0700 | [diff] [blame] | 36 | #define DIFF_FORMAT_NAME 0x0100 |
| 37 | #define DIFF_FORMAT_NAME_STATUS 0x0200 |
| 38 | #define DIFF_FORMAT_CHECKDIFF 0x0400 |
Timo Hirvonen | c674434 | 2006-06-24 20:21:53 +0300 | [diff] [blame] | 39 | |
| 40 | /* Same as output_format = 0 but we know that -s flag was given |
| 41 | * and we should not give default value to output_format. |
| 42 | */ |
Junio C Hamano | 74e2abe | 2006-10-12 03:01:00 -0700 | [diff] [blame] | 43 | #define DIFF_FORMAT_NO_OUTPUT 0x0800 |
Timo Hirvonen | c674434 | 2006-06-24 20:21:53 +0300 | [diff] [blame] | 44 | |
Junio C Hamano | 74e2abe | 2006-10-12 03:01:00 -0700 | [diff] [blame] | 45 | #define DIFF_FORMAT_CALLBACK 0x1000 |
Jeff King | 0424558 | 2006-09-07 02:35:42 -0400 | [diff] [blame] | 46 | |
Pierre Habouzit | 8f67f8a | 2007-11-10 20:05:14 +0100 | [diff] [blame] | 47 | #define DIFF_OPT_RECURSIVE (1 << 0) |
| 48 | #define DIFF_OPT_TREE_IN_RECURSIVE (1 << 1) |
| 49 | #define DIFF_OPT_BINARY (1 << 2) |
| 50 | #define DIFF_OPT_TEXT (1 << 3) |
| 51 | #define DIFF_OPT_FULL_INDEX (1 << 4) |
| 52 | #define DIFF_OPT_SILENT_ON_REMOVE (1 << 5) |
| 53 | #define DIFF_OPT_FIND_COPIES_HARDER (1 << 6) |
| 54 | #define DIFF_OPT_FOLLOW_RENAMES (1 << 7) |
| 55 | #define DIFF_OPT_COLOR_DIFF (1 << 8) |
| 56 | #define DIFF_OPT_COLOR_DIFF_WORDS (1 << 9) |
| 57 | #define DIFF_OPT_HAS_CHANGES (1 << 10) |
| 58 | #define DIFF_OPT_QUIET (1 << 11) |
| 59 | #define DIFF_OPT_NO_INDEX (1 << 12) |
| 60 | #define DIFF_OPT_ALLOW_EXTERNAL (1 << 13) |
| 61 | #define DIFF_OPT_EXIT_WITH_STATUS (1 << 14) |
| 62 | #define DIFF_OPT_REVERSE_DIFF (1 << 15) |
Wincent Colaiuta | 62c6489 | 2007-12-13 21:24:52 +0100 | [diff] [blame] | 63 | #define DIFF_OPT_CHECK_FAILED (1 << 16) |
Junio C Hamano | cd676a5 | 2008-02-12 14:26:02 -0800 | [diff] [blame] | 64 | #define DIFF_OPT_RELATIVE_NAME (1 << 17) |
Johannes Schindelin | 50fd9bd | 2008-05-14 18:03:31 +0100 | [diff] [blame] | 65 | #define DIFF_OPT_IGNORE_SUBMODULES (1 << 18) |
Junio C Hamano | f88d225 | 2008-09-02 17:28:59 -0700 | [diff] [blame] | 66 | #define DIFF_OPT_DIRSTAT_CUMULATIVE (1 << 19) |
Heikki Orsila | fd33777 | 2008-09-05 22:27:35 +0300 | [diff] [blame] | 67 | #define DIFF_OPT_DIRSTAT_BY_FILE (1 << 20) |
Jeff King | c7534ef | 2008-10-26 00:45:55 -0400 | [diff] [blame] | 68 | #define DIFF_OPT_ALLOW_TEXTCONV (1 << 21) |
Pierre Habouzit | 8f67f8a | 2007-11-10 20:05:14 +0100 | [diff] [blame] | 69 | #define DIFF_OPT_TST(opts, flag) ((opts)->flags & DIFF_OPT_##flag) |
| 70 | #define DIFF_OPT_SET(opts, flag) ((opts)->flags |= DIFF_OPT_##flag) |
| 71 | #define DIFF_OPT_CLR(opts, flag) ((opts)->flags &= ~DIFF_OPT_##flag) |
Keith Cascio | 628d5c2 | 2009-02-16 19:26:49 -0800 | [diff] [blame] | 72 | #define DIFF_XDL_TST(opts, flag) ((opts)->xdl_opts & XDF_##flag) |
| 73 | #define DIFF_XDL_SET(opts, flag) ((opts)->xdl_opts |= XDF_##flag) |
| 74 | #define DIFF_XDL_CLR(opts, flag) ((opts)->xdl_opts &= ~XDF_##flag) |
Pierre Habouzit | 8f67f8a | 2007-11-10 20:05:14 +0100 | [diff] [blame] | 75 | |
Junio C Hamano | 6b5ee13 | 2005-09-21 00:00:47 -0700 | [diff] [blame] | 76 | struct diff_options { |
Junio C Hamano | 6b5ee13 | 2005-09-21 00:00:47 -0700 | [diff] [blame] | 77 | const char *filter; |
| 78 | const char *orderfile; |
| 79 | const char *pickaxe; |
Junio C Hamano | 2f3f8b2 | 2006-11-02 00:02:11 -0800 | [diff] [blame] | 80 | const char *single_follow; |
Johannes Schindelin | eab9a40 | 2007-12-18 19:32:14 +0000 | [diff] [blame] | 81 | const char *a_prefix, *b_prefix; |
Pierre Habouzit | 8f67f8a | 2007-11-10 20:05:14 +0100 | [diff] [blame] | 82 | unsigned flags; |
Linus Torvalds | ee1e541 | 2006-05-13 13:23:48 -0700 | [diff] [blame] | 83 | int context; |
René Scharfe | 6d0e674 | 2008-12-28 19:45:32 +0100 | [diff] [blame] | 84 | int interhunkcontext; |
Junio C Hamano | 6b5ee13 | 2005-09-21 00:00:47 -0700 | [diff] [blame] | 85 | int break_opt; |
| 86 | int detect_rename; |
Junio C Hamano | fb13227 | 2007-08-03 13:33:31 -0700 | [diff] [blame] | 87 | int skip_stat_unmatch; |
Junio C Hamano | 6b5ee13 | 2005-09-21 00:00:47 -0700 | [diff] [blame] | 88 | int line_termination; |
| 89 | int output_format; |
| 90 | int pickaxe_opts; |
| 91 | int rename_score; |
Junio C Hamano | 8082d8d | 2005-09-21 00:18:27 -0700 | [diff] [blame] | 92 | int rename_limit; |
Jeff King | b8960bb | 2008-04-30 13:25:53 -0400 | [diff] [blame] | 93 | int warn_on_too_large_rename; |
Linus Torvalds | 7df7c01 | 2008-02-12 13:26:31 -0800 | [diff] [blame] | 94 | int dirstat_percent; |
Junio C Hamano | 6b5ee13 | 2005-09-21 00:00:47 -0700 | [diff] [blame] | 95 | int setup; |
Junio C Hamano | 47dd0d5 | 2005-12-13 17:21:41 -0800 | [diff] [blame] | 96 | int abbrev; |
Junio C Hamano | cd676a5 | 2008-02-12 14:26:02 -0800 | [diff] [blame] | 97 | const char *prefix; |
| 98 | int prefix_length; |
Johannes Schindelin | 698ce6f | 2006-05-20 15:40:29 +0200 | [diff] [blame] | 99 | const char *stat_sep; |
Johannes Schindelin | 0d21efa | 2006-06-14 17:40:23 +0200 | [diff] [blame] | 100 | long xdl_opts; |
Linus Torvalds | ac1b3d1 | 2005-10-20 21:05:05 -0700 | [diff] [blame] | 101 | |
Junio C Hamano | a254002 | 2006-09-26 18:53:02 -0700 | [diff] [blame] | 102 | int stat_width; |
| 103 | int stat_name_width; |
Johannes Schindelin | 2b6a541 | 2009-01-17 17:29:45 +0100 | [diff] [blame] | 104 | const char *word_regex; |
Junio C Hamano | a254002 | 2006-09-26 18:53:02 -0700 | [diff] [blame] | 105 | |
Johannes Schindelin | 34a5e1a | 2007-02-25 23:34:54 +0100 | [diff] [blame] | 106 | /* this is set by diffcore for DIFF_FORMAT_PATCH */ |
| 107 | int found_changes; |
| 108 | |
Daniel Barkalow | c0c7773 | 2008-03-09 22:43:39 -0400 | [diff] [blame] | 109 | FILE *file; |
| 110 | int close_file; |
| 111 | |
Junio C Hamano | a8baa7b | 2006-04-10 16:39:11 -0700 | [diff] [blame] | 112 | int nr_paths; |
| 113 | const char **paths; |
| 114 | int *pathlens; |
Linus Torvalds | ac1b3d1 | 2005-10-20 21:05:05 -0700 | [diff] [blame] | 115 | change_fn_t change; |
| 116 | add_remove_fn_t add_remove; |
Jeff King | 0424558 | 2006-09-07 02:35:42 -0400 | [diff] [blame] | 117 | diff_format_fn_t format_callback; |
| 118 | void *format_callback_data; |
Junio C Hamano | 6b5ee13 | 2005-09-21 00:00:47 -0700 | [diff] [blame] | 119 | }; |
| 120 | |
Jeff King | ce43697 | 2006-07-23 05:24:18 -0400 | [diff] [blame] | 121 | enum color_diff { |
| 122 | DIFF_RESET = 0, |
| 123 | DIFF_PLAIN = 1, |
| 124 | DIFF_METAINFO = 2, |
| 125 | DIFF_FRAGINFO = 3, |
| 126 | DIFF_FILE_OLD = 4, |
| 127 | DIFF_FILE_NEW = 5, |
| 128 | DIFF_COMMIT = 6, |
Junio C Hamano | 448c3ef | 2006-09-22 22:48:39 -0700 | [diff] [blame] | 129 | DIFF_WHITESPACE = 7, |
Jeff King | ce43697 | 2006-07-23 05:24:18 -0400 | [diff] [blame] | 130 | }; |
| 131 | const char *diff_get_color(int diff_use_color, enum color_diff ix); |
Pierre Habouzit | 8f67f8a | 2007-11-10 20:05:14 +0100 | [diff] [blame] | 132 | #define diff_get_color_opt(o, ix) \ |
| 133 | diff_get_color(DIFF_OPT_TST((o), COLOR_DIFF), ix) |
| 134 | |
Jeff King | ce43697 | 2006-07-23 05:24:18 -0400 | [diff] [blame] | 135 | |
Johannes Schindelin | 698ce6f | 2006-05-20 15:40:29 +0200 | [diff] [blame] | 136 | extern const char mime_boundary_leader[]; |
| 137 | |
Junio C Hamano | a8baa7b | 2006-04-10 16:39:11 -0700 | [diff] [blame] | 138 | extern void diff_tree_setup_paths(const char **paths, struct diff_options *); |
| 139 | extern void diff_tree_release_paths(struct diff_options *); |
Linus Torvalds | ac1b3d1 | 2005-10-20 21:05:05 -0700 | [diff] [blame] | 140 | extern int diff_tree(struct tree_desc *t1, struct tree_desc *t2, |
| 141 | const char *base, struct diff_options *opt); |
| 142 | extern int diff_tree_sha1(const unsigned char *old, const unsigned char *new, |
| 143 | const char *base, struct diff_options *opt); |
Rene Scharfe | 2b60356 | 2006-10-26 18:52:39 +0200 | [diff] [blame] | 144 | extern int diff_root_tree_sha1(const unsigned char *new, const char *base, |
| 145 | struct diff_options *opt); |
Linus Torvalds | ac1b3d1 | 2005-10-20 21:05:05 -0700 | [diff] [blame] | 146 | |
Junio C Hamano | ea726d0 | 2006-01-28 00:03:38 -0800 | [diff] [blame] | 147 | struct combine_diff_path { |
| 148 | struct combine_diff_path *next; |
| 149 | int len; |
| 150 | char *path; |
Junio C Hamano | 2454c96 | 2006-02-06 12:53:07 -0800 | [diff] [blame] | 151 | unsigned int mode; |
Junio C Hamano | ea726d0 | 2006-01-28 00:03:38 -0800 | [diff] [blame] | 152 | unsigned char sha1[20]; |
Junio C Hamano | 2454c96 | 2006-02-06 12:53:07 -0800 | [diff] [blame] | 153 | struct combine_diff_parent { |
Junio C Hamano | d416df8 | 2006-02-10 02:30:52 -0800 | [diff] [blame] | 154 | char status; |
Junio C Hamano | 2454c96 | 2006-02-06 12:53:07 -0800 | [diff] [blame] | 155 | unsigned int mode; |
| 156 | unsigned char sha1[20]; |
| 157 | } parent[FLEX_ARRAY]; |
Junio C Hamano | ea726d0 | 2006-01-28 00:03:38 -0800 | [diff] [blame] | 158 | }; |
Junio C Hamano | 2454c96 | 2006-02-06 12:53:07 -0800 | [diff] [blame] | 159 | #define combine_diff_path_size(n, l) \ |
| 160 | (sizeof(struct combine_diff_path) + \ |
| 161 | sizeof(struct combine_diff_parent) * (n) + (l) + 1) |
Junio C Hamano | ea726d0 | 2006-01-28 00:03:38 -0800 | [diff] [blame] | 162 | |
Linus Torvalds | 9153983 | 2006-04-17 11:59:32 -0700 | [diff] [blame] | 163 | extern void show_combined_diff(struct combine_diff_path *elem, int num_parent, |
| 164 | int dense, struct rev_info *); |
Junio C Hamano | ea726d0 | 2006-01-28 00:03:38 -0800 | [diff] [blame] | 165 | |
Junio C Hamano | 0fe7c1d | 2006-04-29 01:24:49 -0700 | [diff] [blame] | 166 | extern void diff_tree_combined(const unsigned char *sha1, const unsigned char parent[][20], int num_parent, int dense, struct rev_info *rev); |
| 167 | |
Linus Torvalds | 9153983 | 2006-04-17 11:59:32 -0700 | [diff] [blame] | 168 | extern void diff_tree_combined_merge(const unsigned char *sha1, int, struct rev_info *); |
Junio C Hamano | af3feef | 2006-01-24 01:22:04 -0800 | [diff] [blame] | 169 | |
Junio C Hamano | a5a818e | 2008-08-18 20:08:09 -0700 | [diff] [blame] | 170 | void diff_set_mnemonic_prefix(struct diff_options *options, const char *a, const char *b); |
| 171 | |
Junio C Hamano | 6b5ee13 | 2005-09-21 00:00:47 -0700 | [diff] [blame] | 172 | extern void diff_addremove(struct diff_options *, |
| 173 | int addremove, |
Junio C Hamano | 77eb272 | 2005-04-27 09:21:00 -0700 | [diff] [blame] | 174 | unsigned mode, |
| 175 | const unsigned char *sha1, |
Dmitry Potapov | fd55a19 | 2008-07-16 18:54:02 +0400 | [diff] [blame] | 176 | const char *fullpath); |
Junio C Hamano | 77eb272 | 2005-04-27 09:21:00 -0700 | [diff] [blame] | 177 | |
Junio C Hamano | 6b5ee13 | 2005-09-21 00:00:47 -0700 | [diff] [blame] | 178 | extern void diff_change(struct diff_options *, |
| 179 | unsigned mode1, unsigned mode2, |
| 180 | const unsigned char *sha1, |
| 181 | const unsigned char *sha2, |
Dmitry Potapov | fd55a19 | 2008-07-16 18:54:02 +0400 | [diff] [blame] | 182 | const char *fullpath); |
Junio C Hamano | 77eb272 | 2005-04-27 09:21:00 -0700 | [diff] [blame] | 183 | |
Junio C Hamano | 6b5ee13 | 2005-09-21 00:00:47 -0700 | [diff] [blame] | 184 | extern void diff_unmerge(struct diff_options *, |
Junio C Hamano | e9c8409 | 2007-01-05 01:25:18 -0800 | [diff] [blame] | 185 | const char *path, |
| 186 | unsigned mode, |
| 187 | const unsigned char *sha1); |
Junio C Hamano | 77eb272 | 2005-04-27 09:21:00 -0700 | [diff] [blame] | 188 | |
Junio C Hamano | 19feebc | 2005-05-27 15:54:37 -0700 | [diff] [blame] | 189 | #define DIFF_SETUP_REVERSE 1 |
Junio C Hamano | f0c6b2a | 2005-05-27 15:56:38 -0700 | [diff] [blame] | 190 | #define DIFF_SETUP_USE_CACHE 2 |
| 191 | #define DIFF_SETUP_USE_SIZE_CACHE 4 |
Junio C Hamano | ce24067 | 2005-06-03 01:36:43 -0700 | [diff] [blame] | 192 | |
Johannes Schindelin | ef90d6d | 2008-05-14 18:46:53 +0100 | [diff] [blame] | 193 | extern int git_diff_basic_config(const char *var, const char *value, void *cb); |
| 194 | extern int git_diff_ui_config(const char *var, const char *value, void *cb); |
Matthias Kestenholz | 6b2f2d9 | 2008-02-18 08:26:03 +0100 | [diff] [blame] | 195 | extern int diff_use_color_default; |
Junio C Hamano | 6b5ee13 | 2005-09-21 00:00:47 -0700 | [diff] [blame] | 196 | extern void diff_setup(struct diff_options *); |
| 197 | extern int diff_opt_parse(struct diff_options *, const char **, int); |
| 198 | extern int diff_setup_done(struct diff_options *); |
Junio C Hamano | 86436c2 | 2005-04-25 18:22:47 -0700 | [diff] [blame] | 199 | |
Junio C Hamano | 6b14d7f | 2005-05-22 10:04:37 -0700 | [diff] [blame] | 200 | #define DIFF_DETECT_RENAME 1 |
| 201 | #define DIFF_DETECT_COPY 2 |
| 202 | |
Junio C Hamano | 367cec1 | 2005-05-27 15:55:28 -0700 | [diff] [blame] | 203 | #define DIFF_PICKAXE_ALL 1 |
Petr Baudis | d01d8c6 | 2006-03-29 02:16:33 +0200 | [diff] [blame] | 204 | #define DIFF_PICKAXE_REGEX 2 |
Junio C Hamano | f345b0a | 2005-05-30 00:08:37 -0700 | [diff] [blame] | 205 | |
Junio C Hamano | 6b5ee13 | 2005-09-21 00:00:47 -0700 | [diff] [blame] | 206 | extern void diffcore_std(struct diff_options *); |
Junio C Hamano | f2ce9fd | 2005-06-11 20:57:13 -0700 | [diff] [blame] | 207 | |
Junio C Hamano | dda2d79 | 2005-07-13 12:52:35 -0700 | [diff] [blame] | 208 | #define COMMON_DIFF_OPTIONS_HELP \ |
| 209 | "\ncommon diff options:\n" \ |
Junio C Hamano | 8082d8d | 2005-09-21 00:18:27 -0700 | [diff] [blame] | 210 | " -z output diff-raw with lines terminated with NUL.\n" \ |
| 211 | " -p output patch format.\n" \ |
| 212 | " -u synonym for -p.\n" \ |
Petr Baudis | 5c91da2 | 2006-04-11 13:22:17 +0200 | [diff] [blame] | 213 | " --patch-with-raw\n" \ |
| 214 | " output both a patch and the diff-raw format.\n" \ |
Johannes Schindelin | d75f795 | 2006-04-14 00:15:30 +0200 | [diff] [blame] | 215 | " --stat show diffstat instead of patch.\n" \ |
Junio C Hamano | 74e2abe | 2006-10-12 03:01:00 -0700 | [diff] [blame] | 216 | " --numstat show numeric diffstat instead of patch.\n" \ |
Johannes Schindelin | 2935327 | 2006-04-15 13:41:18 +0200 | [diff] [blame] | 217 | " --patch-with-stat\n" \ |
| 218 | " output a patch and prepend its diffstat.\n" \ |
Junio C Hamano | 8082d8d | 2005-09-21 00:18:27 -0700 | [diff] [blame] | 219 | " --name-only show only names of changed files.\n" \ |
Junio C Hamano | 946f5f7 | 2005-09-21 00:20:06 -0700 | [diff] [blame] | 220 | " --name-status show names and status of changed files.\n" \ |
Junio C Hamano | 47dd0d5 | 2005-12-13 17:21:41 -0800 | [diff] [blame] | 221 | " --full-index show full object name on index lines.\n" \ |
Junio C Hamano | 913419f | 2005-12-18 02:03:15 -0800 | [diff] [blame] | 222 | " --abbrev=<n> abbreviate object names in diff-tree header and diff-raw.\n" \ |
Junio C Hamano | 8082d8d | 2005-09-21 00:18:27 -0700 | [diff] [blame] | 223 | " -R swap input file pairs.\n" \ |
| 224 | " -B detect complete rewrites.\n" \ |
| 225 | " -M detect renames.\n" \ |
| 226 | " -C detect copies.\n" \ |
Junio C Hamano | dda2d79 | 2005-07-13 12:52:35 -0700 | [diff] [blame] | 227 | " --find-copies-harder\n" \ |
Junio C Hamano | 8082d8d | 2005-09-21 00:18:27 -0700 | [diff] [blame] | 228 | " try unchanged files as candidate for copy detection.\n" \ |
| 229 | " -l<n> limit rename attempts up to <n> paths.\n" \ |
| 230 | " -O<file> reorder diffs according to the <file>.\n" \ |
| 231 | " -S<string> find filepair whose only one side contains the string.\n" \ |
Junio C Hamano | dda2d79 | 2005-07-13 12:52:35 -0700 | [diff] [blame] | 232 | " --pickaxe-all\n" \ |
Stephan Feder | ca49920 | 2006-07-07 15:57:08 +0200 | [diff] [blame] | 233 | " show all files diff when -S is used and hit is found.\n" \ |
| 234 | " -a --text treat all files as text.\n" |
Junio C Hamano | dda2d79 | 2005-07-13 12:52:35 -0700 | [diff] [blame] | 235 | |
Junio C Hamano | 38c6f78 | 2005-05-21 19:40:36 -0700 | [diff] [blame] | 236 | extern int diff_queue_is_empty(void); |
Junio C Hamano | 6b5ee13 | 2005-09-21 00:00:47 -0700 | [diff] [blame] | 237 | extern void diff_flush(struct diff_options*); |
Junio C Hamano | 86436c2 | 2005-04-25 18:22:47 -0700 | [diff] [blame] | 238 | |
Junio C Hamano | e7baa4f | 2005-07-25 13:05:44 -0700 | [diff] [blame] | 239 | /* diff-raw status letters */ |
Junio C Hamano | ca8c915 | 2005-07-25 14:31:19 -0700 | [diff] [blame] | 240 | #define DIFF_STATUS_ADDED 'A' |
Junio C Hamano | e7baa4f | 2005-07-25 13:05:44 -0700 | [diff] [blame] | 241 | #define DIFF_STATUS_COPIED 'C' |
| 242 | #define DIFF_STATUS_DELETED 'D' |
| 243 | #define DIFF_STATUS_MODIFIED 'M' |
| 244 | #define DIFF_STATUS_RENAMED 'R' |
| 245 | #define DIFF_STATUS_TYPE_CHANGED 'T' |
| 246 | #define DIFF_STATUS_UNKNOWN 'X' |
| 247 | #define DIFF_STATUS_UNMERGED 'U' |
| 248 | |
| 249 | /* these are not diff-raw status letters proper, but used by |
| 250 | * diffcore-filter insn to specify additional restrictions. |
| 251 | */ |
Junio C Hamano | 0b34379 | 2005-10-04 17:44:17 -0700 | [diff] [blame] | 252 | #define DIFF_STATUS_FILTER_AON '*' |
Junio C Hamano | e7baa4f | 2005-07-25 13:05:44 -0700 | [diff] [blame] | 253 | #define DIFF_STATUS_FILTER_BROKEN 'B' |
| 254 | |
Junio C Hamano | 47dd0d5 | 2005-12-13 17:21:41 -0800 | [diff] [blame] | 255 | extern const char *diff_unique_abbrev(const unsigned char *, int); |
| 256 | |
Junio C Hamano | 4bd5b7d | 2007-11-10 00:15:03 -0800 | [diff] [blame] | 257 | /* do not report anything on removed paths */ |
| 258 | #define DIFF_SILENT_ON_REMOVED 01 |
Junio C Hamano | fb63d7f | 2007-11-09 18:22:52 -0800 | [diff] [blame] | 259 | /* report racily-clean paths as modified */ |
| 260 | #define DIFF_RACY_IS_MODIFIED 02 |
Junio C Hamano | 4bd5b7d | 2007-11-10 00:15:03 -0800 | [diff] [blame] | 261 | extern int run_diff_files(struct rev_info *revs, unsigned int option); |
Junio C Hamano | 5c21ac0 | 2006-04-22 03:58:04 -0700 | [diff] [blame] | 262 | extern int run_diff_index(struct rev_info *revs, int cached); |
Junio C Hamano | e09ad6e | 2006-04-22 02:43:00 -0700 | [diff] [blame] | 263 | |
Junio C Hamano | 1cfe773 | 2007-01-30 01:11:08 -0800 | [diff] [blame] | 264 | extern int do_diff_cache(const unsigned char *, struct diff_options *); |
Johannes Schindelin | fcb3d0a | 2006-06-25 03:51:08 +0200 | [diff] [blame] | 265 | extern int diff_flush_patch_id(struct diff_options *, unsigned char *); |
| 266 | |
Junio C Hamano | da31b35 | 2007-12-13 23:40:27 -0800 | [diff] [blame] | 267 | extern int diff_result_code(struct diff_options *, int); |
| 268 | |
Junio C Hamano | 0569e9b | 2008-05-23 22:28:56 -0700 | [diff] [blame] | 269 | extern void diff_no_index(struct rev_info *, int, const char **, int, const char *); |
| 270 | |
Stephan Beyer | 75f3ff2 | 2009-02-10 15:30:35 +0100 | [diff] [blame] | 271 | extern int index_differs_from(const char *def, int diff_flags); |
| 272 | |
Junio C Hamano | 86436c2 | 2005-04-25 18:22:47 -0700 | [diff] [blame] | 273 | #endif /* DIFF_H */ |