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; |
Bo Yang | a3c158d | 2010-05-26 15:08:02 +0800 | [diff] [blame] | 12 | struct strbuf; |
Axel Bonnet | a788d7d | 2010-06-07 17:23:36 +0200 | [diff] [blame] | 13 | struct diff_filespec; |
| 14 | struct userdiff_driver; |
René Scharfe | 0041f09 | 2011-12-17 11:15:48 +0100 | [diff] [blame] | 15 | struct sha1_array; |
René Scharfe | 8288929 | 2011-12-17 11:20:07 +0100 | [diff] [blame] | 16 | struct commit; |
Linus Torvalds | ac1b3d1 | 2005-10-20 21:05:05 -0700 | [diff] [blame] | 17 | |
| 18 | typedef void (*change_fn_t)(struct diff_options *options, |
| 19 | unsigned old_mode, unsigned new_mode, |
| 20 | const unsigned char *old_sha1, |
| 21 | const unsigned char *new_sha1, |
Jens Lehmann | e3d42c4 | 2010-01-18 21:26:18 +0100 | [diff] [blame] | 22 | const char *fullpath, |
| 23 | unsigned old_dirty_submodule, unsigned new_dirty_submodule); |
Linus Torvalds | ac1b3d1 | 2005-10-20 21:05:05 -0700 | [diff] [blame] | 24 | |
| 25 | typedef void (*add_remove_fn_t)(struct diff_options *options, |
| 26 | int addremove, unsigned mode, |
| 27 | const unsigned char *sha1, |
Jens Lehmann | e3d42c4 | 2010-01-18 21:26:18 +0100 | [diff] [blame] | 28 | const char *fullpath, unsigned dirty_submodule); |
Linus Torvalds | ac1b3d1 | 2005-10-20 21:05:05 -0700 | [diff] [blame] | 29 | |
Jeff King | 0424558 | 2006-09-07 02:35:42 -0400 | [diff] [blame] | 30 | typedef void (*diff_format_fn_t)(struct diff_queue_struct *q, |
| 31 | struct diff_options *options, void *data); |
| 32 | |
Bo Yang | a3c158d | 2010-05-26 15:08:02 +0800 | [diff] [blame] | 33 | typedef struct strbuf *(*diff_prefix_fn_t)(struct diff_options *opt, void *data); |
| 34 | |
Timo Hirvonen | c674434 | 2006-06-24 20:21:53 +0300 | [diff] [blame] | 35 | #define DIFF_FORMAT_RAW 0x0001 |
| 36 | #define DIFF_FORMAT_DIFFSTAT 0x0002 |
Junio C Hamano | 74e2abe | 2006-10-12 03:01:00 -0700 | [diff] [blame] | 37 | #define DIFF_FORMAT_NUMSTAT 0x0004 |
| 38 | #define DIFF_FORMAT_SUMMARY 0x0008 |
| 39 | #define DIFF_FORMAT_PATCH 0x0010 |
Nicolas Pitre | ebd124c | 2006-12-14 23:15:44 -0500 | [diff] [blame] | 40 | #define DIFF_FORMAT_SHORTSTAT 0x0020 |
Linus Torvalds | 7df7c01 | 2008-02-12 13:26:31 -0800 | [diff] [blame] | 41 | #define DIFF_FORMAT_DIRSTAT 0x0040 |
Timo Hirvonen | c674434 | 2006-06-24 20:21:53 +0300 | [diff] [blame] | 42 | |
| 43 | /* These override all above */ |
Junio C Hamano | 74e2abe | 2006-10-12 03:01:00 -0700 | [diff] [blame] | 44 | #define DIFF_FORMAT_NAME 0x0100 |
| 45 | #define DIFF_FORMAT_NAME_STATUS 0x0200 |
| 46 | #define DIFF_FORMAT_CHECKDIFF 0x0400 |
Timo Hirvonen | c674434 | 2006-06-24 20:21:53 +0300 | [diff] [blame] | 47 | |
| 48 | /* Same as output_format = 0 but we know that -s flag was given |
| 49 | * and we should not give default value to output_format. |
| 50 | */ |
Junio C Hamano | 74e2abe | 2006-10-12 03:01:00 -0700 | [diff] [blame] | 51 | #define DIFF_FORMAT_NO_OUTPUT 0x0800 |
Timo Hirvonen | c674434 | 2006-06-24 20:21:53 +0300 | [diff] [blame] | 52 | |
Junio C Hamano | 74e2abe | 2006-10-12 03:01:00 -0700 | [diff] [blame] | 53 | #define DIFF_FORMAT_CALLBACK 0x1000 |
Jeff King | 0424558 | 2006-09-07 02:35:42 -0400 | [diff] [blame] | 54 | |
Pierre Habouzit | 8f67f8a | 2007-11-10 20:05:14 +0100 | [diff] [blame] | 55 | #define DIFF_OPT_RECURSIVE (1 << 0) |
| 56 | #define DIFF_OPT_TREE_IN_RECURSIVE (1 << 1) |
| 57 | #define DIFF_OPT_BINARY (1 << 2) |
| 58 | #define DIFF_OPT_TEXT (1 << 3) |
| 59 | #define DIFF_OPT_FULL_INDEX (1 << 4) |
| 60 | #define DIFF_OPT_SILENT_ON_REMOVE (1 << 5) |
| 61 | #define DIFF_OPT_FIND_COPIES_HARDER (1 << 6) |
| 62 | #define DIFF_OPT_FOLLOW_RENAMES (1 << 7) |
Jeff King | 90d43b0 | 2012-03-22 18:52:13 -0400 | [diff] [blame] | 63 | #define DIFF_OPT_RENAME_EMPTY (1 << 8) |
Thomas Rast | 882749a | 2010-04-14 17:59:06 +0200 | [diff] [blame] | 64 | /* (1 << 9) unused */ |
Pierre Habouzit | 8f67f8a | 2007-11-10 20:05:14 +0100 | [diff] [blame] | 65 | #define DIFF_OPT_HAS_CHANGES (1 << 10) |
Junio C Hamano | 90b1994 | 2009-05-23 01:15:35 -0700 | [diff] [blame] | 66 | #define DIFF_OPT_QUICK (1 << 11) |
Pierre Habouzit | 8f67f8a | 2007-11-10 20:05:14 +0100 | [diff] [blame] | 67 | #define DIFF_OPT_NO_INDEX (1 << 12) |
| 68 | #define DIFF_OPT_ALLOW_EXTERNAL (1 << 13) |
| 69 | #define DIFF_OPT_EXIT_WITH_STATUS (1 << 14) |
| 70 | #define DIFF_OPT_REVERSE_DIFF (1 << 15) |
Wincent Colaiuta | 62c6489 | 2007-12-13 21:24:52 +0100 | [diff] [blame] | 71 | #define DIFF_OPT_CHECK_FAILED (1 << 16) |
Junio C Hamano | cd676a5 | 2008-02-12 14:26:02 -0800 | [diff] [blame] | 72 | #define DIFF_OPT_RELATIVE_NAME (1 << 17) |
Johannes Schindelin | 50fd9bd | 2008-05-14 18:03:31 +0100 | [diff] [blame] | 73 | #define DIFF_OPT_IGNORE_SUBMODULES (1 << 18) |
Junio C Hamano | f88d225 | 2008-09-02 17:28:59 -0700 | [diff] [blame] | 74 | #define DIFF_OPT_DIRSTAT_CUMULATIVE (1 << 19) |
Heikki Orsila | fd33777 | 2008-09-05 22:27:35 +0300 | [diff] [blame] | 75 | #define DIFF_OPT_DIRSTAT_BY_FILE (1 << 20) |
Jeff King | c7534ef | 2008-10-26 00:45:55 -0400 | [diff] [blame] | 76 | #define DIFF_OPT_ALLOW_TEXTCONV (1 << 21) |
Junio C Hamano | f245194 | 2009-05-22 12:45:29 -0700 | [diff] [blame] | 77 | #define DIFF_OPT_DIFF_FROM_CONTENTS (1 << 22) |
Johannes Schindelin | 752c0c2 | 2009-10-19 14:38:32 +0200 | [diff] [blame] | 78 | #define DIFF_OPT_SUBMODULE_LOG (1 << 23) |
Jens Lehmann | 9297f77e6 | 2010-03-08 13:53:19 +0100 | [diff] [blame] | 79 | #define DIFF_OPT_DIRTY_SUBMODULES (1 << 24) |
Jens Lehmann | 3bfc450 | 2010-03-13 23:00:27 +0100 | [diff] [blame] | 80 | #define DIFF_OPT_IGNORE_UNTRACKED_IN_SUBMODULES (1 << 25) |
Junio C Hamano | 4af574d | 2010-06-27 12:07:44 -0700 | [diff] [blame] | 81 | #define DIFF_OPT_IGNORE_DIRTY_SUBMODULES (1 << 26) |
Jens Lehmann | aee9c7d | 2010-08-06 00:39:25 +0200 | [diff] [blame] | 82 | #define DIFF_OPT_OVERRIDE_SUBMODULE_CONFIG (1 << 27) |
Johan Herland | 1c57a62 | 2011-04-29 11:36:21 +0200 | [diff] [blame] | 83 | #define DIFF_OPT_DIRSTAT_BY_LINE (1 << 28) |
René Scharfe | 14937c2 | 2011-10-09 13:36:57 +0200 | [diff] [blame] | 84 | #define DIFF_OPT_FUNCCONTEXT (1 << 29) |
Junio C Hamano | accccde | 2012-02-21 01:02:46 -0800 | [diff] [blame] | 85 | #define DIFF_OPT_PICKAXE_IGNORE_CASE (1 << 30) |
Johannes Schindelin | 752c0c2 | 2009-10-19 14:38:32 +0200 | [diff] [blame] | 86 | |
Pierre Habouzit | 8f67f8a | 2007-11-10 20:05:14 +0100 | [diff] [blame] | 87 | #define DIFF_OPT_TST(opts, flag) ((opts)->flags & DIFF_OPT_##flag) |
| 88 | #define DIFF_OPT_SET(opts, flag) ((opts)->flags |= DIFF_OPT_##flag) |
| 89 | #define DIFF_OPT_CLR(opts, flag) ((opts)->flags &= ~DIFF_OPT_##flag) |
Keith Cascio | 628d5c2 | 2009-02-16 19:26:49 -0800 | [diff] [blame] | 90 | #define DIFF_XDL_TST(opts, flag) ((opts)->xdl_opts & XDF_##flag) |
| 91 | #define DIFF_XDL_SET(opts, flag) ((opts)->xdl_opts |= XDF_##flag) |
| 92 | #define DIFF_XDL_CLR(opts, flag) ((opts)->xdl_opts &= ~XDF_##flag) |
Pierre Habouzit | 8f67f8a | 2007-11-10 20:05:14 +0100 | [diff] [blame] | 93 | |
Junio C Hamano | 307ab20 | 2012-02-19 15:36:55 -0800 | [diff] [blame] | 94 | #define DIFF_WITH_ALG(opts, flag) (((opts)->xdl_opts & ~XDF_DIFF_ALGORITHM_MASK) | XDF_##flag) |
| 95 | |
Thomas Rast | 882749a | 2010-04-14 17:59:06 +0200 | [diff] [blame] | 96 | enum diff_words_type { |
| 97 | DIFF_WORDS_NONE = 0, |
| 98 | DIFF_WORDS_PORCELAIN, |
| 99 | DIFF_WORDS_PLAIN, |
| 100 | DIFF_WORDS_COLOR |
| 101 | }; |
| 102 | |
Junio C Hamano | 6b5ee13 | 2005-09-21 00:00:47 -0700 | [diff] [blame] | 103 | struct diff_options { |
Junio C Hamano | 6b5ee13 | 2005-09-21 00:00:47 -0700 | [diff] [blame] | 104 | const char *filter; |
| 105 | const char *orderfile; |
| 106 | const char *pickaxe; |
Junio C Hamano | 2f3f8b2 | 2006-11-02 00:02:11 -0800 | [diff] [blame] | 107 | const char *single_follow; |
Johannes Schindelin | eab9a40 | 2007-12-18 19:32:14 +0000 | [diff] [blame] | 108 | const char *a_prefix, *b_prefix; |
Pierre Habouzit | 8f67f8a | 2007-11-10 20:05:14 +0100 | [diff] [blame] | 109 | unsigned flags; |
Jeff King | f1c9626 | 2011-08-17 22:03:12 -0700 | [diff] [blame] | 110 | int use_color; |
Linus Torvalds | ee1e541 | 2006-05-13 13:23:48 -0700 | [diff] [blame] | 111 | int context; |
René Scharfe | 6d0e674 | 2008-12-28 19:45:32 +0100 | [diff] [blame] | 112 | int interhunkcontext; |
Junio C Hamano | 6b5ee13 | 2005-09-21 00:00:47 -0700 | [diff] [blame] | 113 | int break_opt; |
| 114 | int detect_rename; |
Junio C Hamano | 467ddc1 | 2011-02-28 16:11:55 -0800 | [diff] [blame] | 115 | int irreversible_delete; |
Junio C Hamano | fb13227 | 2007-08-03 13:33:31 -0700 | [diff] [blame] | 116 | int skip_stat_unmatch; |
Junio C Hamano | 6b5ee13 | 2005-09-21 00:00:47 -0700 | [diff] [blame] | 117 | int line_termination; |
| 118 | int output_format; |
| 119 | int pickaxe_opts; |
| 120 | int rename_score; |
Junio C Hamano | 8082d8d | 2005-09-21 00:18:27 -0700 | [diff] [blame] | 121 | int rename_limit; |
Jeff King | bf0ab10 | 2011-02-19 05:20:51 -0500 | [diff] [blame] | 122 | int needed_rename_limit; |
Junio C Hamano | f31027c | 2011-01-06 13:50:06 -0800 | [diff] [blame] | 123 | int degraded_cc_to_c; |
Jeff King | 3ac942d | 2011-02-20 04:51:16 -0500 | [diff] [blame] | 124 | int show_rename_progress; |
Johan Herland | 712d2c7 | 2011-04-29 11:36:20 +0200 | [diff] [blame] | 125 | int dirstat_permille; |
Junio C Hamano | 6b5ee13 | 2005-09-21 00:00:47 -0700 | [diff] [blame] | 126 | int setup; |
Junio C Hamano | 47dd0d5 | 2005-12-13 17:21:41 -0800 | [diff] [blame] | 127 | int abbrev; |
Junio C Hamano | cd676a5 | 2008-02-12 14:26:02 -0800 | [diff] [blame] | 128 | const char *prefix; |
| 129 | int prefix_length; |
Johannes Schindelin | 698ce6f | 2006-05-20 15:40:29 +0200 | [diff] [blame] | 130 | const char *stat_sep; |
Johannes Schindelin | 0d21efa | 2006-06-14 17:40:23 +0200 | [diff] [blame] | 131 | long xdl_opts; |
Linus Torvalds | ac1b3d1 | 2005-10-20 21:05:05 -0700 | [diff] [blame] | 132 | |
Junio C Hamano | a254002 | 2006-09-26 18:53:02 -0700 | [diff] [blame] | 133 | int stat_width; |
| 134 | int stat_name_width; |
Zbigniew Jędrzejewski-Szmek | 969fe57 | 2012-03-01 13:26:45 +0100 | [diff] [blame] | 135 | int stat_graph_width; |
Michael J Gruber | 808e1db | 2011-05-27 14:36:41 +0200 | [diff] [blame] | 136 | int stat_count; |
Johannes Schindelin | 2b6a541 | 2009-01-17 17:29:45 +0100 | [diff] [blame] | 137 | const char *word_regex; |
Thomas Rast | 882749a | 2010-04-14 17:59:06 +0200 | [diff] [blame] | 138 | enum diff_words_type word_diff; |
Junio C Hamano | a254002 | 2006-09-26 18:53:02 -0700 | [diff] [blame] | 139 | |
Johannes Schindelin | 34a5e1a | 2007-02-25 23:34:54 +0100 | [diff] [blame] | 140 | /* this is set by diffcore for DIFF_FORMAT_PATCH */ |
| 141 | int found_changes; |
| 142 | |
Junio C Hamano | 44c48a9 | 2010-08-13 12:17:45 -0700 | [diff] [blame] | 143 | /* to support internal diff recursion by --follow hack*/ |
| 144 | int found_follow; |
| 145 | |
Daniel Barkalow | c0c7773 | 2008-03-09 22:43:39 -0400 | [diff] [blame] | 146 | FILE *file; |
| 147 | int close_file; |
| 148 | |
Nguyễn Thái Ngọc Duy | 66f1362 | 2010-12-15 22:02:38 +0700 | [diff] [blame] | 149 | struct pathspec pathspec; |
Linus Torvalds | ac1b3d1 | 2005-10-20 21:05:05 -0700 | [diff] [blame] | 150 | change_fn_t change; |
| 151 | add_remove_fn_t add_remove; |
Jeff King | 0424558 | 2006-09-07 02:35:42 -0400 | [diff] [blame] | 152 | diff_format_fn_t format_callback; |
| 153 | void *format_callback_data; |
Bo Yang | a3c158d | 2010-05-26 15:08:02 +0800 | [diff] [blame] | 154 | diff_prefix_fn_t output_prefix; |
Lucian Poston | 5e71a84 | 2012-04-16 03:44:50 -0700 | [diff] [blame] | 155 | int output_prefix_length; |
Bo Yang | a3c158d | 2010-05-26 15:08:02 +0800 | [diff] [blame] | 156 | void *output_prefix_data; |
Junio C Hamano | 6b5ee13 | 2005-09-21 00:00:47 -0700 | [diff] [blame] | 157 | }; |
| 158 | |
Jeff King | ce43697 | 2006-07-23 05:24:18 -0400 | [diff] [blame] | 159 | enum color_diff { |
| 160 | DIFF_RESET = 0, |
| 161 | DIFF_PLAIN = 1, |
| 162 | DIFF_METAINFO = 2, |
| 163 | DIFF_FRAGINFO = 3, |
| 164 | DIFF_FILE_OLD = 4, |
| 165 | DIFF_FILE_NEW = 5, |
| 166 | DIFF_COMMIT = 6, |
Junio C Hamano | 448c3ef | 2006-09-22 22:48:39 -0700 | [diff] [blame] | 167 | DIFF_WHITESPACE = 7, |
Gary V. Vaughan | 4b05548 | 2010-05-14 09:31:35 +0000 | [diff] [blame] | 168 | DIFF_FUNCINFO = 8 |
Jeff King | ce43697 | 2006-07-23 05:24:18 -0400 | [diff] [blame] | 169 | }; |
| 170 | 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] | 171 | #define diff_get_color_opt(o, ix) \ |
Jeff King | f1c9626 | 2011-08-17 22:03:12 -0700 | [diff] [blame] | 172 | diff_get_color((o)->use_color, ix) |
Pierre Habouzit | 8f67f8a | 2007-11-10 20:05:14 +0100 | [diff] [blame] | 173 | |
Jeff King | ce43697 | 2006-07-23 05:24:18 -0400 | [diff] [blame] | 174 | |
Johannes Schindelin | 698ce6f | 2006-05-20 15:40:29 +0200 | [diff] [blame] | 175 | extern const char mime_boundary_leader[]; |
| 176 | |
Junio C Hamano | a8baa7b | 2006-04-10 16:39:11 -0700 | [diff] [blame] | 177 | extern void diff_tree_setup_paths(const char **paths, struct diff_options *); |
| 178 | extern void diff_tree_release_paths(struct diff_options *); |
Linus Torvalds | ac1b3d1 | 2005-10-20 21:05:05 -0700 | [diff] [blame] | 179 | extern int diff_tree(struct tree_desc *t1, struct tree_desc *t2, |
| 180 | const char *base, struct diff_options *opt); |
| 181 | extern int diff_tree_sha1(const unsigned char *old, const unsigned char *new, |
| 182 | const char *base, struct diff_options *opt); |
Rene Scharfe | 2b60356 | 2006-10-26 18:52:39 +0200 | [diff] [blame] | 183 | extern int diff_root_tree_sha1(const unsigned char *new, const char *base, |
| 184 | struct diff_options *opt); |
Linus Torvalds | ac1b3d1 | 2005-10-20 21:05:05 -0700 | [diff] [blame] | 185 | |
Junio C Hamano | ea726d0 | 2006-01-28 00:03:38 -0800 | [diff] [blame] | 186 | struct combine_diff_path { |
| 187 | struct combine_diff_path *next; |
| 188 | int len; |
| 189 | char *path; |
Junio C Hamano | 2454c96 | 2006-02-06 12:53:07 -0800 | [diff] [blame] | 190 | unsigned int mode; |
Junio C Hamano | ea726d0 | 2006-01-28 00:03:38 -0800 | [diff] [blame] | 191 | unsigned char sha1[20]; |
Junio C Hamano | 2454c96 | 2006-02-06 12:53:07 -0800 | [diff] [blame] | 192 | struct combine_diff_parent { |
Junio C Hamano | d416df8 | 2006-02-10 02:30:52 -0800 | [diff] [blame] | 193 | char status; |
Junio C Hamano | 2454c96 | 2006-02-06 12:53:07 -0800 | [diff] [blame] | 194 | unsigned int mode; |
| 195 | unsigned char sha1[20]; |
| 196 | } parent[FLEX_ARRAY]; |
Junio C Hamano | ea726d0 | 2006-01-28 00:03:38 -0800 | [diff] [blame] | 197 | }; |
Junio C Hamano | 2454c96 | 2006-02-06 12:53:07 -0800 | [diff] [blame] | 198 | #define combine_diff_path_size(n, l) \ |
| 199 | (sizeof(struct combine_diff_path) + \ |
| 200 | sizeof(struct combine_diff_parent) * (n) + (l) + 1) |
Junio C Hamano | ea726d0 | 2006-01-28 00:03:38 -0800 | [diff] [blame] | 201 | |
Linus Torvalds | 9153983 | 2006-04-17 11:59:32 -0700 | [diff] [blame] | 202 | extern void show_combined_diff(struct combine_diff_path *elem, int num_parent, |
| 203 | int dense, struct rev_info *); |
Junio C Hamano | ea726d0 | 2006-01-28 00:03:38 -0800 | [diff] [blame] | 204 | |
René Scharfe | 0041f09 | 2011-12-17 11:15:48 +0100 | [diff] [blame] | 205 | extern void diff_tree_combined(const unsigned char *sha1, const struct sha1_array *parents, int dense, struct rev_info *rev); |
Junio C Hamano | 0fe7c1d | 2006-04-29 01:24:49 -0700 | [diff] [blame] | 206 | |
René Scharfe | 8288929 | 2011-12-17 11:20:07 +0100 | [diff] [blame] | 207 | extern void diff_tree_combined_merge(const struct commit *commit, int dense, struct rev_info *rev); |
Junio C Hamano | af3feef | 2006-01-24 01:22:04 -0800 | [diff] [blame] | 208 | |
Junio C Hamano | a5a818e | 2008-08-18 20:08:09 -0700 | [diff] [blame] | 209 | void diff_set_mnemonic_prefix(struct diff_options *options, const char *a, const char *b); |
| 210 | |
Junio C Hamano | 28b9264 | 2011-05-31 09:14:17 -0700 | [diff] [blame] | 211 | extern int diff_can_quit_early(struct diff_options *); |
| 212 | |
Junio C Hamano | 6b5ee13 | 2005-09-21 00:00:47 -0700 | [diff] [blame] | 213 | extern void diff_addremove(struct diff_options *, |
| 214 | int addremove, |
Junio C Hamano | 77eb272 | 2005-04-27 09:21:00 -0700 | [diff] [blame] | 215 | unsigned mode, |
| 216 | const unsigned char *sha1, |
Jens Lehmann | e3d42c4 | 2010-01-18 21:26:18 +0100 | [diff] [blame] | 217 | const char *fullpath, unsigned dirty_submodule); |
Junio C Hamano | 77eb272 | 2005-04-27 09:21:00 -0700 | [diff] [blame] | 218 | |
Junio C Hamano | 6b5ee13 | 2005-09-21 00:00:47 -0700 | [diff] [blame] | 219 | extern void diff_change(struct diff_options *, |
| 220 | unsigned mode1, unsigned mode2, |
| 221 | const unsigned char *sha1, |
| 222 | const unsigned char *sha2, |
Jens Lehmann | e3d42c4 | 2010-01-18 21:26:18 +0100 | [diff] [blame] | 223 | const char *fullpath, |
| 224 | unsigned dirty_submodule1, unsigned dirty_submodule2); |
Junio C Hamano | 77eb272 | 2005-04-27 09:21:00 -0700 | [diff] [blame] | 225 | |
Junio C Hamano | fa7b290 | 2011-04-22 16:05:58 -0700 | [diff] [blame] | 226 | extern struct diff_filepair *diff_unmerge(struct diff_options *, const char *path); |
Junio C Hamano | 77eb272 | 2005-04-27 09:21:00 -0700 | [diff] [blame] | 227 | |
Junio C Hamano | 19feebc | 2005-05-27 15:54:37 -0700 | [diff] [blame] | 228 | #define DIFF_SETUP_REVERSE 1 |
Junio C Hamano | f0c6b2a | 2005-05-27 15:56:38 -0700 | [diff] [blame] | 229 | #define DIFF_SETUP_USE_CACHE 2 |
| 230 | #define DIFF_SETUP_USE_SIZE_CACHE 4 |
Junio C Hamano | ce24067 | 2005-06-03 01:36:43 -0700 | [diff] [blame] | 231 | |
Matthieu Moy | dea007f | 2010-08-05 10:22:52 +0200 | [diff] [blame] | 232 | /* |
| 233 | * Poor man's alternative to parse-option, to allow both sticked form |
| 234 | * (--option=value) and separate form (--option value). |
| 235 | */ |
| 236 | extern int parse_long_opt(const char *opt, const char **argv, |
| 237 | const char **optarg); |
| 238 | |
Johannes Schindelin | ef90d6d | 2008-05-14 18:46:53 +0100 | [diff] [blame] | 239 | extern int git_diff_basic_config(const char *var, const char *value, void *cb); |
| 240 | 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] | 241 | extern int diff_use_color_default; |
Junio C Hamano | 6b5ee13 | 2005-09-21 00:00:47 -0700 | [diff] [blame] | 242 | extern void diff_setup(struct diff_options *); |
| 243 | extern int diff_opt_parse(struct diff_options *, const char **, int); |
| 244 | extern int diff_setup_done(struct diff_options *); |
Junio C Hamano | 86436c2 | 2005-04-25 18:22:47 -0700 | [diff] [blame] | 245 | |
Junio C Hamano | 6b14d7f | 2005-05-22 10:04:37 -0700 | [diff] [blame] | 246 | #define DIFF_DETECT_RENAME 1 |
| 247 | #define DIFF_DETECT_COPY 2 |
| 248 | |
Junio C Hamano | 367cec1 | 2005-05-27 15:55:28 -0700 | [diff] [blame] | 249 | #define DIFF_PICKAXE_ALL 1 |
Petr Baudis | d01d8c6 | 2006-03-29 02:16:33 +0200 | [diff] [blame] | 250 | #define DIFF_PICKAXE_REGEX 2 |
Junio C Hamano | f345b0a | 2005-05-30 00:08:37 -0700 | [diff] [blame] | 251 | |
Junio C Hamano | f506b8e | 2010-08-23 10:17:03 -0700 | [diff] [blame] | 252 | #define DIFF_PICKAXE_KIND_S 4 /* traditional plumbing counter */ |
| 253 | #define DIFF_PICKAXE_KIND_G 8 /* grep in the patch */ |
| 254 | |
Junio C Hamano | 6b5ee13 | 2005-09-21 00:00:47 -0700 | [diff] [blame] | 255 | extern void diffcore_std(struct diff_options *); |
Junio C Hamano | 730f728 | 2009-09-20 00:03:39 -0700 | [diff] [blame] | 256 | extern void diffcore_fix_diff_index(struct diff_options *); |
Junio C Hamano | f2ce9fd | 2005-06-11 20:57:13 -0700 | [diff] [blame] | 257 | |
Junio C Hamano | dda2d79 | 2005-07-13 12:52:35 -0700 | [diff] [blame] | 258 | #define COMMON_DIFF_OPTIONS_HELP \ |
| 259 | "\ncommon diff options:\n" \ |
Junio C Hamano | 8082d8d | 2005-09-21 00:18:27 -0700 | [diff] [blame] | 260 | " -z output diff-raw with lines terminated with NUL.\n" \ |
| 261 | " -p output patch format.\n" \ |
| 262 | " -u synonym for -p.\n" \ |
Petr Baudis | 5c91da2 | 2006-04-11 13:22:17 +0200 | [diff] [blame] | 263 | " --patch-with-raw\n" \ |
| 264 | " output both a patch and the diff-raw format.\n" \ |
Johannes Schindelin | d75f795 | 2006-04-14 00:15:30 +0200 | [diff] [blame] | 265 | " --stat show diffstat instead of patch.\n" \ |
Junio C Hamano | 74e2abe | 2006-10-12 03:01:00 -0700 | [diff] [blame] | 266 | " --numstat show numeric diffstat instead of patch.\n" \ |
Johannes Schindelin | 2935327 | 2006-04-15 13:41:18 +0200 | [diff] [blame] | 267 | " --patch-with-stat\n" \ |
| 268 | " output a patch and prepend its diffstat.\n" \ |
Junio C Hamano | 8082d8d | 2005-09-21 00:18:27 -0700 | [diff] [blame] | 269 | " --name-only show only names of changed files.\n" \ |
Junio C Hamano | 946f5f7 | 2005-09-21 00:20:06 -0700 | [diff] [blame] | 270 | " --name-status show names and status of changed files.\n" \ |
Junio C Hamano | 47dd0d5 | 2005-12-13 17:21:41 -0800 | [diff] [blame] | 271 | " --full-index show full object name on index lines.\n" \ |
Junio C Hamano | 913419f | 2005-12-18 02:03:15 -0800 | [diff] [blame] | 272 | " --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] | 273 | " -R swap input file pairs.\n" \ |
| 274 | " -B detect complete rewrites.\n" \ |
| 275 | " -M detect renames.\n" \ |
| 276 | " -C detect copies.\n" \ |
Junio C Hamano | dda2d79 | 2005-07-13 12:52:35 -0700 | [diff] [blame] | 277 | " --find-copies-harder\n" \ |
Junio C Hamano | 8082d8d | 2005-09-21 00:18:27 -0700 | [diff] [blame] | 278 | " try unchanged files as candidate for copy detection.\n" \ |
| 279 | " -l<n> limit rename attempts up to <n> paths.\n" \ |
| 280 | " -O<file> reorder diffs according to the <file>.\n" \ |
| 281 | " -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] | 282 | " --pickaxe-all\n" \ |
Stephan Feder | ca49920 | 2006-07-07 15:57:08 +0200 | [diff] [blame] | 283 | " show all files diff when -S is used and hit is found.\n" \ |
| 284 | " -a --text treat all files as text.\n" |
Junio C Hamano | dda2d79 | 2005-07-13 12:52:35 -0700 | [diff] [blame] | 285 | |
Junio C Hamano | 38c6f78 | 2005-05-21 19:40:36 -0700 | [diff] [blame] | 286 | extern int diff_queue_is_empty(void); |
Junio C Hamano | 6b5ee13 | 2005-09-21 00:00:47 -0700 | [diff] [blame] | 287 | extern void diff_flush(struct diff_options*); |
Junio C Hamano | f31027c | 2011-01-06 13:50:06 -0800 | [diff] [blame] | 288 | extern void diff_warn_rename_limit(const char *varname, int needed, int degraded_cc); |
Junio C Hamano | 86436c2 | 2005-04-25 18:22:47 -0700 | [diff] [blame] | 289 | |
Junio C Hamano | e7baa4f | 2005-07-25 13:05:44 -0700 | [diff] [blame] | 290 | /* diff-raw status letters */ |
Junio C Hamano | ca8c915 | 2005-07-25 14:31:19 -0700 | [diff] [blame] | 291 | #define DIFF_STATUS_ADDED 'A' |
Junio C Hamano | e7baa4f | 2005-07-25 13:05:44 -0700 | [diff] [blame] | 292 | #define DIFF_STATUS_COPIED 'C' |
| 293 | #define DIFF_STATUS_DELETED 'D' |
| 294 | #define DIFF_STATUS_MODIFIED 'M' |
| 295 | #define DIFF_STATUS_RENAMED 'R' |
| 296 | #define DIFF_STATUS_TYPE_CHANGED 'T' |
| 297 | #define DIFF_STATUS_UNKNOWN 'X' |
| 298 | #define DIFF_STATUS_UNMERGED 'U' |
| 299 | |
| 300 | /* these are not diff-raw status letters proper, but used by |
| 301 | * diffcore-filter insn to specify additional restrictions. |
| 302 | */ |
Junio C Hamano | 0b34379 | 2005-10-04 17:44:17 -0700 | [diff] [blame] | 303 | #define DIFF_STATUS_FILTER_AON '*' |
Junio C Hamano | e7baa4f | 2005-07-25 13:05:44 -0700 | [diff] [blame] | 304 | #define DIFF_STATUS_FILTER_BROKEN 'B' |
| 305 | |
Junio C Hamano | 47dd0d5 | 2005-12-13 17:21:41 -0800 | [diff] [blame] | 306 | extern const char *diff_unique_abbrev(const unsigned char *, int); |
| 307 | |
Junio C Hamano | 4bd5b7d | 2007-11-10 00:15:03 -0800 | [diff] [blame] | 308 | /* do not report anything on removed paths */ |
| 309 | #define DIFF_SILENT_ON_REMOVED 01 |
Junio C Hamano | fb63d7f | 2007-11-09 18:22:52 -0800 | [diff] [blame] | 310 | /* report racily-clean paths as modified */ |
| 311 | #define DIFF_RACY_IS_MODIFIED 02 |
Junio C Hamano | 4bd5b7d | 2007-11-10 00:15:03 -0800 | [diff] [blame] | 312 | 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] | 313 | extern int run_diff_index(struct rev_info *revs, int cached); |
Junio C Hamano | e09ad6e | 2006-04-22 02:43:00 -0700 | [diff] [blame] | 314 | |
Junio C Hamano | 1cfe773 | 2007-01-30 01:11:08 -0800 | [diff] [blame] | 315 | extern int do_diff_cache(const unsigned char *, struct diff_options *); |
Johannes Schindelin | fcb3d0a | 2006-06-25 03:51:08 +0200 | [diff] [blame] | 316 | extern int diff_flush_patch_id(struct diff_options *, unsigned char *); |
| 317 | |
Junio C Hamano | da31b35 | 2007-12-13 23:40:27 -0800 | [diff] [blame] | 318 | extern int diff_result_code(struct diff_options *, int); |
| 319 | |
Junio C Hamano | 0569e9b | 2008-05-23 22:28:56 -0700 | [diff] [blame] | 320 | extern void diff_no_index(struct rev_info *, int, const char **, int, const char *); |
| 321 | |
Stephan Beyer | 75f3ff2 | 2009-02-10 15:30:35 +0100 | [diff] [blame] | 322 | extern int index_differs_from(const char *def, int diff_flags); |
| 323 | |
Axel Bonnet | a788d7d | 2010-06-07 17:23:36 +0200 | [diff] [blame] | 324 | extern size_t fill_textconv(struct userdiff_driver *driver, |
| 325 | struct diff_filespec *df, |
| 326 | char **outbuf); |
| 327 | |
| 328 | extern struct userdiff_driver *get_textconv(struct diff_filespec *one); |
| 329 | |
Kevin Ballard | 10ae752 | 2010-09-27 16:58:25 -0700 | [diff] [blame] | 330 | extern int parse_rename_score(const char **cp_p); |
| 331 | |
Nguyễn Thái Ngọc Duy | 7f81463 | 2012-02-01 19:55:07 +0700 | [diff] [blame] | 332 | extern int print_stat_summary(FILE *fp, int files, |
| 333 | int insertions, int deletions); |
| 334 | |
Junio C Hamano | 86436c2 | 2005-04-25 18:22:47 -0700 | [diff] [blame] | 335 | #endif /* DIFF_H */ |