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" |
Nguyễn Thái Ngọc Duy | 64acde9 | 2013-07-14 15:35:25 +0700 | [diff] [blame] | 8 | #include "pathspec.h" |
brian m. carlson | 1ff57c1 | 2015-03-13 23:39:33 +0000 | [diff] [blame] | 9 | #include "object.h" |
Linus Torvalds | 50f9a85 | 2006-01-31 14:10:56 -0800 | [diff] [blame] | 10 | |
Linus Torvalds | 9153983 | 2006-04-17 11:59:32 -0700 | [diff] [blame] | 11 | struct rev_info; |
Linus Torvalds | ac1b3d1 | 2005-10-20 21:05:05 -0700 | [diff] [blame] | 12 | struct diff_options; |
Jeff King | 0424558 | 2006-09-07 02:35:42 -0400 | [diff] [blame] | 13 | struct diff_queue_struct; |
Bo Yang | a3c158d | 2010-05-26 15:08:02 +0800 | [diff] [blame] | 14 | struct strbuf; |
Axel Bonnet | a788d7d | 2010-06-07 17:23:36 +0200 | [diff] [blame] | 15 | struct diff_filespec; |
| 16 | struct userdiff_driver; |
brian m. carlson | 910650d | 2017-03-31 01:40:00 +0000 | [diff] [blame] | 17 | struct oid_array; |
René Scharfe | 8288929 | 2011-12-17 11:20:07 +0100 | [diff] [blame] | 18 | struct commit; |
Kirill Smelkov | 72441af | 2014-04-07 01:46:26 +0400 | [diff] [blame] | 19 | struct combine_diff_path; |
| 20 | |
| 21 | typedef int (*pathchange_fn_t)(struct diff_options *options, |
| 22 | struct combine_diff_path *path); |
Linus Torvalds | ac1b3d1 | 2005-10-20 21:05:05 -0700 | [diff] [blame] | 23 | |
| 24 | typedef void (*change_fn_t)(struct diff_options *options, |
| 25 | unsigned old_mode, unsigned new_mode, |
Brandon Williams | 94a0097 | 2017-05-30 10:30:49 -0700 | [diff] [blame] | 26 | const struct object_id *old_oid, |
| 27 | const struct object_id *new_oid, |
| 28 | int old_oid_valid, int new_oid_valid, |
Jens Lehmann | e3d42c4 | 2010-01-18 21:26:18 +0100 | [diff] [blame] | 29 | const char *fullpath, |
| 30 | unsigned old_dirty_submodule, unsigned new_dirty_submodule); |
Linus Torvalds | ac1b3d1 | 2005-10-20 21:05:05 -0700 | [diff] [blame] | 31 | |
| 32 | typedef void (*add_remove_fn_t)(struct diff_options *options, |
| 33 | int addremove, unsigned mode, |
Brandon Williams | c26022e | 2017-05-30 10:30:47 -0700 | [diff] [blame] | 34 | const struct object_id *oid, |
| 35 | int oid_valid, |
Jens Lehmann | e3d42c4 | 2010-01-18 21:26:18 +0100 | [diff] [blame] | 36 | const char *fullpath, unsigned dirty_submodule); |
Linus Torvalds | ac1b3d1 | 2005-10-20 21:05:05 -0700 | [diff] [blame] | 37 | |
Jeff King | 0424558 | 2006-09-07 02:35:42 -0400 | [diff] [blame] | 38 | typedef void (*diff_format_fn_t)(struct diff_queue_struct *q, |
| 39 | struct diff_options *options, void *data); |
| 40 | |
Bo Yang | a3c158d | 2010-05-26 15:08:02 +0800 | [diff] [blame] | 41 | typedef struct strbuf *(*diff_prefix_fn_t)(struct diff_options *opt, void *data); |
| 42 | |
Timo Hirvonen | c674434 | 2006-06-24 20:21:53 +0300 | [diff] [blame] | 43 | #define DIFF_FORMAT_RAW 0x0001 |
| 44 | #define DIFF_FORMAT_DIFFSTAT 0x0002 |
Junio C Hamano | 74e2abe | 2006-10-12 03:01:00 -0700 | [diff] [blame] | 45 | #define DIFF_FORMAT_NUMSTAT 0x0004 |
| 46 | #define DIFF_FORMAT_SUMMARY 0x0008 |
| 47 | #define DIFF_FORMAT_PATCH 0x0010 |
Nicolas Pitre | ebd124c | 2006-12-14 23:15:44 -0500 | [diff] [blame] | 48 | #define DIFF_FORMAT_SHORTSTAT 0x0020 |
Linus Torvalds | 7df7c01 | 2008-02-12 13:26:31 -0800 | [diff] [blame] | 49 | #define DIFF_FORMAT_DIRSTAT 0x0040 |
Timo Hirvonen | c674434 | 2006-06-24 20:21:53 +0300 | [diff] [blame] | 50 | |
| 51 | /* These override all above */ |
Junio C Hamano | 74e2abe | 2006-10-12 03:01:00 -0700 | [diff] [blame] | 52 | #define DIFF_FORMAT_NAME 0x0100 |
| 53 | #define DIFF_FORMAT_NAME_STATUS 0x0200 |
| 54 | #define DIFF_FORMAT_CHECKDIFF 0x0400 |
Timo Hirvonen | c674434 | 2006-06-24 20:21:53 +0300 | [diff] [blame] | 55 | |
| 56 | /* Same as output_format = 0 but we know that -s flag was given |
| 57 | * and we should not give default value to output_format. |
| 58 | */ |
Junio C Hamano | 74e2abe | 2006-10-12 03:01:00 -0700 | [diff] [blame] | 59 | #define DIFF_FORMAT_NO_OUTPUT 0x0800 |
Timo Hirvonen | c674434 | 2006-06-24 20:21:53 +0300 | [diff] [blame] | 60 | |
Junio C Hamano | 74e2abe | 2006-10-12 03:01:00 -0700 | [diff] [blame] | 61 | #define DIFF_FORMAT_CALLBACK 0x1000 |
Jeff King | 0424558 | 2006-09-07 02:35:42 -0400 | [diff] [blame] | 62 | |
Pierre Habouzit | 8f67f8a | 2007-11-10 20:05:14 +0100 | [diff] [blame] | 63 | #define DIFF_OPT_RECURSIVE (1 << 0) |
| 64 | #define DIFF_OPT_TREE_IN_RECURSIVE (1 << 1) |
| 65 | #define DIFF_OPT_BINARY (1 << 2) |
| 66 | #define DIFF_OPT_TEXT (1 << 3) |
| 67 | #define DIFF_OPT_FULL_INDEX (1 << 4) |
| 68 | #define DIFF_OPT_SILENT_ON_REMOVE (1 << 5) |
| 69 | #define DIFF_OPT_FIND_COPIES_HARDER (1 << 6) |
| 70 | #define DIFF_OPT_FOLLOW_RENAMES (1 << 7) |
Jeff King | 90d43b0 | 2012-03-22 18:52:13 -0400 | [diff] [blame] | 71 | #define DIFF_OPT_RENAME_EMPTY (1 << 8) |
Thomas Rast | 882749a | 2010-04-14 17:59:06 +0200 | [diff] [blame] | 72 | /* (1 << 9) unused */ |
Pierre Habouzit | 8f67f8a | 2007-11-10 20:05:14 +0100 | [diff] [blame] | 73 | #define DIFF_OPT_HAS_CHANGES (1 << 10) |
Junio C Hamano | 90b1994 | 2009-05-23 01:15:35 -0700 | [diff] [blame] | 74 | #define DIFF_OPT_QUICK (1 << 11) |
Pierre Habouzit | 8f67f8a | 2007-11-10 20:05:14 +0100 | [diff] [blame] | 75 | #define DIFF_OPT_NO_INDEX (1 << 12) |
| 76 | #define DIFF_OPT_ALLOW_EXTERNAL (1 << 13) |
| 77 | #define DIFF_OPT_EXIT_WITH_STATUS (1 << 14) |
| 78 | #define DIFF_OPT_REVERSE_DIFF (1 << 15) |
Wincent Colaiuta | 62c6489 | 2007-12-13 21:24:52 +0100 | [diff] [blame] | 79 | #define DIFF_OPT_CHECK_FAILED (1 << 16) |
Junio C Hamano | cd676a5 | 2008-02-12 14:26:02 -0800 | [diff] [blame] | 80 | #define DIFF_OPT_RELATIVE_NAME (1 << 17) |
Johannes Schindelin | 50fd9bd | 2008-05-14 18:03:31 +0100 | [diff] [blame] | 81 | #define DIFF_OPT_IGNORE_SUBMODULES (1 << 18) |
Junio C Hamano | f88d225 | 2008-09-02 17:28:59 -0700 | [diff] [blame] | 82 | #define DIFF_OPT_DIRSTAT_CUMULATIVE (1 << 19) |
Heikki Orsila | fd33777 | 2008-09-05 22:27:35 +0300 | [diff] [blame] | 83 | #define DIFF_OPT_DIRSTAT_BY_FILE (1 << 20) |
Jeff King | c7534ef | 2008-10-26 00:45:55 -0400 | [diff] [blame] | 84 | #define DIFF_OPT_ALLOW_TEXTCONV (1 << 21) |
Junio C Hamano | f245194 | 2009-05-22 12:45:29 -0700 | [diff] [blame] | 85 | #define DIFF_OPT_DIFF_FROM_CONTENTS (1 << 22) |
Jens Lehmann | 9297f77e6 | 2010-03-08 13:53:19 +0100 | [diff] [blame] | 86 | #define DIFF_OPT_DIRTY_SUBMODULES (1 << 24) |
Jens Lehmann | 3bfc450 | 2010-03-13 23:00:27 +0100 | [diff] [blame] | 87 | #define DIFF_OPT_IGNORE_UNTRACKED_IN_SUBMODULES (1 << 25) |
Junio C Hamano | 4af574d | 2010-06-27 12:07:44 -0700 | [diff] [blame] | 88 | #define DIFF_OPT_IGNORE_DIRTY_SUBMODULES (1 << 26) |
Jens Lehmann | aee9c7d | 2010-08-06 00:39:25 +0200 | [diff] [blame] | 89 | #define DIFF_OPT_OVERRIDE_SUBMODULE_CONFIG (1 << 27) |
Johan Herland | 1c57a62 | 2011-04-29 11:36:21 +0200 | [diff] [blame] | 90 | #define DIFF_OPT_DIRSTAT_BY_LINE (1 << 28) |
René Scharfe | 14937c2 | 2011-10-09 13:36:57 +0200 | [diff] [blame] | 91 | #define DIFF_OPT_FUNCCONTEXT (1 << 29) |
Junio C Hamano | accccde | 2012-02-21 01:02:46 -0800 | [diff] [blame] | 92 | #define DIFF_OPT_PICKAXE_IGNORE_CASE (1 << 30) |
Jeff King | 9a93c66 | 2015-12-29 01:35:46 -0500 | [diff] [blame] | 93 | #define DIFF_OPT_DEFAULT_FOLLOW_RENAMES (1U << 31) |
Johannes Schindelin | 752c0c2 | 2009-10-19 14:38:32 +0200 | [diff] [blame] | 94 | |
Pierre Habouzit | 8f67f8a | 2007-11-10 20:05:14 +0100 | [diff] [blame] | 95 | #define DIFF_OPT_TST(opts, flag) ((opts)->flags & DIFF_OPT_##flag) |
Junio C Hamano | 6c37400 | 2013-05-10 17:10:11 +0200 | [diff] [blame] | 96 | #define DIFF_OPT_TOUCHED(opts, flag) ((opts)->touched_flags & DIFF_OPT_##flag) |
| 97 | #define DIFF_OPT_SET(opts, flag) (((opts)->flags |= DIFF_OPT_##flag),((opts)->touched_flags |= DIFF_OPT_##flag)) |
| 98 | #define DIFF_OPT_CLR(opts, flag) (((opts)->flags &= ~DIFF_OPT_##flag),((opts)->touched_flags |= DIFF_OPT_##flag)) |
Keith Cascio | 628d5c2 | 2009-02-16 19:26:49 -0800 | [diff] [blame] | 99 | #define DIFF_XDL_TST(opts, flag) ((opts)->xdl_opts & XDF_##flag) |
| 100 | #define DIFF_XDL_SET(opts, flag) ((opts)->xdl_opts |= XDF_##flag) |
| 101 | #define DIFF_XDL_CLR(opts, flag) ((opts)->xdl_opts &= ~XDF_##flag) |
Pierre Habouzit | 8f67f8a | 2007-11-10 20:05:14 +0100 | [diff] [blame] | 102 | |
Junio C Hamano | 307ab20 | 2012-02-19 15:36:55 -0800 | [diff] [blame] | 103 | #define DIFF_WITH_ALG(opts, flag) (((opts)->xdl_opts & ~XDF_DIFF_ALGORITHM_MASK) | XDF_##flag) |
| 104 | |
Thomas Rast | 882749a | 2010-04-14 17:59:06 +0200 | [diff] [blame] | 105 | enum diff_words_type { |
| 106 | DIFF_WORDS_NONE = 0, |
| 107 | DIFF_WORDS_PORCELAIN, |
| 108 | DIFF_WORDS_PLAIN, |
| 109 | DIFF_WORDS_COLOR |
| 110 | }; |
| 111 | |
Jacob Keller | 61cfbc0 | 2016-08-31 16:27:21 -0700 | [diff] [blame] | 112 | enum diff_submodule_format { |
| 113 | DIFF_SUBMODULE_SHORT = 0, |
Jacob Keller | fd47ae6 | 2016-08-31 16:27:25 -0700 | [diff] [blame] | 114 | DIFF_SUBMODULE_LOG, |
| 115 | DIFF_SUBMODULE_INLINE_DIFF |
Jacob Keller | 61cfbc0 | 2016-08-31 16:27:21 -0700 | [diff] [blame] | 116 | }; |
| 117 | |
Junio C Hamano | 6b5ee13 | 2005-09-21 00:00:47 -0700 | [diff] [blame] | 118 | struct diff_options { |
Junio C Hamano | 6b5ee13 | 2005-09-21 00:00:47 -0700 | [diff] [blame] | 119 | const char *orderfile; |
| 120 | const char *pickaxe; |
Junio C Hamano | 2f3f8b2 | 2006-11-02 00:02:11 -0800 | [diff] [blame] | 121 | const char *single_follow; |
Johannes Schindelin | eab9a40 | 2007-12-18 19:32:14 +0000 | [diff] [blame] | 122 | const char *a_prefix, *b_prefix; |
Jacob Keller | 660e113 | 2016-08-31 16:27:20 -0700 | [diff] [blame] | 123 | const char *line_prefix; |
| 124 | size_t line_prefix_length; |
Pierre Habouzit | 8f67f8a | 2007-11-10 20:05:14 +0100 | [diff] [blame] | 125 | unsigned flags; |
Junio C Hamano | 6c37400 | 2013-05-10 17:10:11 +0200 | [diff] [blame] | 126 | unsigned touched_flags; |
Junio C Hamano | 1ecc1cb | 2013-07-17 15:05:46 -0700 | [diff] [blame] | 127 | |
| 128 | /* diff-filter bits */ |
| 129 | unsigned int filter; |
| 130 | |
Jeff King | f1c9626 | 2011-08-17 22:03:12 -0700 | [diff] [blame] | 131 | int use_color; |
Linus Torvalds | ee1e541 | 2006-05-13 13:23:48 -0700 | [diff] [blame] | 132 | int context; |
René Scharfe | 6d0e674 | 2008-12-28 19:45:32 +0100 | [diff] [blame] | 133 | int interhunkcontext; |
Junio C Hamano | 6b5ee13 | 2005-09-21 00:00:47 -0700 | [diff] [blame] | 134 | int break_opt; |
| 135 | int detect_rename; |
Junio C Hamano | 467ddc1 | 2011-02-28 16:11:55 -0800 | [diff] [blame] | 136 | int irreversible_delete; |
Junio C Hamano | fb13227 | 2007-08-03 13:33:31 -0700 | [diff] [blame] | 137 | int skip_stat_unmatch; |
Junio C Hamano | 6b5ee13 | 2005-09-21 00:00:47 -0700 | [diff] [blame] | 138 | int line_termination; |
| 139 | int output_format; |
| 140 | int pickaxe_opts; |
| 141 | int rename_score; |
Junio C Hamano | 8082d8d | 2005-09-21 00:18:27 -0700 | [diff] [blame] | 142 | int rename_limit; |
Jeff King | bf0ab10 | 2011-02-19 05:20:51 -0500 | [diff] [blame] | 143 | int needed_rename_limit; |
Junio C Hamano | f31027c | 2011-01-06 13:50:06 -0800 | [diff] [blame] | 144 | int degraded_cc_to_c; |
Jeff King | 3ac942d | 2011-02-20 04:51:16 -0500 | [diff] [blame] | 145 | int show_rename_progress; |
Johan Herland | 712d2c7 | 2011-04-29 11:36:20 +0200 | [diff] [blame] | 146 | int dirstat_permille; |
Junio C Hamano | 6b5ee13 | 2005-09-21 00:00:47 -0700 | [diff] [blame] | 147 | int setup; |
Junio C Hamano | 47dd0d5 | 2005-12-13 17:21:41 -0800 | [diff] [blame] | 148 | int abbrev; |
Nguyễn Thái Ngọc Duy | 425a28e | 2016-10-24 17:42:19 +0700 | [diff] [blame] | 149 | int ita_invisible_in_index; |
Junio C Hamano | b8767f7 | 2015-05-26 10:11:28 -0700 | [diff] [blame] | 150 | /* white-space error highlighting */ |
| 151 | #define WSEH_NEW 1 |
| 152 | #define WSEH_CONTEXT 2 |
| 153 | #define WSEH_OLD 4 |
| 154 | unsigned ws_error_highlight; |
Junio C Hamano | cd676a5 | 2008-02-12 14:26:02 -0800 | [diff] [blame] | 155 | const char *prefix; |
| 156 | int prefix_length; |
Johannes Schindelin | 698ce6f | 2006-05-20 15:40:29 +0200 | [diff] [blame] | 157 | const char *stat_sep; |
Johannes Schindelin | 0d21efa | 2006-06-14 17:40:23 +0200 | [diff] [blame] | 158 | long xdl_opts; |
Linus Torvalds | ac1b3d1 | 2005-10-20 21:05:05 -0700 | [diff] [blame] | 159 | |
Junio C Hamano | a254002 | 2006-09-26 18:53:02 -0700 | [diff] [blame] | 160 | int stat_width; |
| 161 | int stat_name_width; |
Zbigniew Jędrzejewski-Szmek | 969fe57 | 2012-03-01 13:26:45 +0100 | [diff] [blame] | 162 | int stat_graph_width; |
Michael J Gruber | 808e1db | 2011-05-27 14:36:41 +0200 | [diff] [blame] | 163 | int stat_count; |
Johannes Schindelin | 2b6a541 | 2009-01-17 17:29:45 +0100 | [diff] [blame] | 164 | const char *word_regex; |
Thomas Rast | 882749a | 2010-04-14 17:59:06 +0200 | [diff] [blame] | 165 | enum diff_words_type word_diff; |
Jacob Keller | 61cfbc0 | 2016-08-31 16:27:21 -0700 | [diff] [blame] | 166 | enum diff_submodule_format submodule_format; |
Junio C Hamano | a254002 | 2006-09-26 18:53:02 -0700 | [diff] [blame] | 167 | |
Johannes Schindelin | 34a5e1a | 2007-02-25 23:34:54 +0100 | [diff] [blame] | 168 | /* this is set by diffcore for DIFF_FORMAT_PATCH */ |
| 169 | int found_changes; |
| 170 | |
Junio C Hamano | 44c48a9 | 2010-08-13 12:17:45 -0700 | [diff] [blame] | 171 | /* to support internal diff recursion by --follow hack*/ |
| 172 | int found_follow; |
| 173 | |
Junio C Hamano | 6c37400 | 2013-05-10 17:10:11 +0200 | [diff] [blame] | 174 | void (*set_default)(struct diff_options *); |
| 175 | |
Daniel Barkalow | c0c7773 | 2008-03-09 22:43:39 -0400 | [diff] [blame] | 176 | FILE *file; |
| 177 | int close_file; |
| 178 | |
Nguyễn Thái Ngọc Duy | 66f1362 | 2010-12-15 22:02:38 +0700 | [diff] [blame] | 179 | struct pathspec pathspec; |
Kirill Smelkov | 72441af | 2014-04-07 01:46:26 +0400 | [diff] [blame] | 180 | pathchange_fn_t pathchange; |
Linus Torvalds | ac1b3d1 | 2005-10-20 21:05:05 -0700 | [diff] [blame] | 181 | change_fn_t change; |
| 182 | add_remove_fn_t add_remove; |
Jeff King | 0424558 | 2006-09-07 02:35:42 -0400 | [diff] [blame] | 183 | diff_format_fn_t format_callback; |
| 184 | void *format_callback_data; |
Bo Yang | a3c158d | 2010-05-26 15:08:02 +0800 | [diff] [blame] | 185 | diff_prefix_fn_t output_prefix; |
| 186 | void *output_prefix_data; |
Zoltan Klinger | ee7fb0b | 2013-12-06 10:38:46 +1100 | [diff] [blame] | 187 | |
| 188 | int diff_path_counter; |
Junio C Hamano | 6b5ee13 | 2005-09-21 00:00:47 -0700 | [diff] [blame] | 189 | }; |
| 190 | |
Jeff King | ce43697 | 2006-07-23 05:24:18 -0400 | [diff] [blame] | 191 | enum color_diff { |
| 192 | DIFF_RESET = 0, |
Jeff King | 8dbf3eb | 2015-05-27 16:48:46 -0400 | [diff] [blame] | 193 | DIFF_CONTEXT = 1, |
Jeff King | ce43697 | 2006-07-23 05:24:18 -0400 | [diff] [blame] | 194 | DIFF_METAINFO = 2, |
| 195 | DIFF_FRAGINFO = 3, |
| 196 | DIFF_FILE_OLD = 4, |
| 197 | DIFF_FILE_NEW = 5, |
| 198 | DIFF_COMMIT = 6, |
Junio C Hamano | 448c3ef | 2006-09-22 22:48:39 -0700 | [diff] [blame] | 199 | DIFF_WHITESPACE = 7, |
Gary V. Vaughan | 4b05548 | 2010-05-14 09:31:35 +0000 | [diff] [blame] | 200 | DIFF_FUNCINFO = 8 |
Jeff King | ce43697 | 2006-07-23 05:24:18 -0400 | [diff] [blame] | 201 | }; |
| 202 | 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] | 203 | #define diff_get_color_opt(o, ix) \ |
Jeff King | f1c9626 | 2011-08-17 22:03:12 -0700 | [diff] [blame] | 204 | diff_get_color((o)->use_color, ix) |
Pierre Habouzit | 8f67f8a | 2007-11-10 20:05:14 +0100 | [diff] [blame] | 205 | |
Jeff King | ce43697 | 2006-07-23 05:24:18 -0400 | [diff] [blame] | 206 | |
John Keeping | f192223 | 2013-02-07 20:15:26 +0000 | [diff] [blame] | 207 | const char *diff_line_prefix(struct diff_options *); |
| 208 | |
| 209 | |
Johannes Schindelin | 698ce6f | 2006-05-20 15:40:29 +0200 | [diff] [blame] | 210 | extern const char mime_boundary_leader[]; |
| 211 | |
Kirill Smelkov | 72441af | 2014-04-07 01:46:26 +0400 | [diff] [blame] | 212 | extern struct combine_diff_path *diff_tree_paths( |
Brandon Williams | fda94b4 | 2017-05-30 10:31:06 -0700 | [diff] [blame] | 213 | struct combine_diff_path *p, const struct object_id *oid, |
| 214 | const struct object_id **parents_oid, int nparent, |
Kirill Smelkov | 72441af | 2014-04-07 01:46:26 +0400 | [diff] [blame] | 215 | struct strbuf *base, struct diff_options *opt); |
Brandon Williams | 66f414f | 2017-05-30 10:31:03 -0700 | [diff] [blame] | 216 | extern int diff_tree_oid(const struct object_id *old_oid, |
| 217 | const struct object_id *new_oid, |
| 218 | const char *base, struct diff_options *opt); |
Brandon Williams | 7b8dea0 | 2017-05-30 10:30:57 -0700 | [diff] [blame] | 219 | extern int diff_root_tree_oid(const struct object_id *new_oid, const char *base, |
| 220 | struct diff_options *opt); |
Linus Torvalds | ac1b3d1 | 2005-10-20 21:05:05 -0700 | [diff] [blame] | 221 | |
Junio C Hamano | ea726d0 | 2006-01-28 00:03:38 -0800 | [diff] [blame] | 222 | struct combine_diff_path { |
| 223 | struct combine_diff_path *next; |
Junio C Hamano | ea726d0 | 2006-01-28 00:03:38 -0800 | [diff] [blame] | 224 | char *path; |
Junio C Hamano | 2454c96 | 2006-02-06 12:53:07 -0800 | [diff] [blame] | 225 | unsigned int mode; |
brian m. carlson | 1ff57c1 | 2015-03-13 23:39:33 +0000 | [diff] [blame] | 226 | struct object_id oid; |
Junio C Hamano | 2454c96 | 2006-02-06 12:53:07 -0800 | [diff] [blame] | 227 | struct combine_diff_parent { |
Junio C Hamano | d416df8 | 2006-02-10 02:30:52 -0800 | [diff] [blame] | 228 | char status; |
Junio C Hamano | 2454c96 | 2006-02-06 12:53:07 -0800 | [diff] [blame] | 229 | unsigned int mode; |
brian m. carlson | 1ff57c1 | 2015-03-13 23:39:33 +0000 | [diff] [blame] | 230 | struct object_id oid; |
Junio C Hamano | 2454c96 | 2006-02-06 12:53:07 -0800 | [diff] [blame] | 231 | } parent[FLEX_ARRAY]; |
Junio C Hamano | ea726d0 | 2006-01-28 00:03:38 -0800 | [diff] [blame] | 232 | }; |
Junio C Hamano | 2454c96 | 2006-02-06 12:53:07 -0800 | [diff] [blame] | 233 | #define combine_diff_path_size(n, l) \ |
Jeff King | 5b442c4 | 2016-02-19 06:21:30 -0500 | [diff] [blame] | 234 | st_add4(sizeof(struct combine_diff_path), (l), 1, \ |
| 235 | st_mult(sizeof(struct combine_diff_parent), (n))) |
Junio C Hamano | ea726d0 | 2006-01-28 00:03:38 -0800 | [diff] [blame] | 236 | |
Linus Torvalds | 9153983 | 2006-04-17 11:59:32 -0700 | [diff] [blame] | 237 | extern void show_combined_diff(struct combine_diff_path *elem, int num_parent, |
| 238 | int dense, struct rev_info *); |
Junio C Hamano | ea726d0 | 2006-01-28 00:03:38 -0800 | [diff] [blame] | 239 | |
Brandon Williams | b9acf54 | 2017-05-30 10:30:55 -0700 | [diff] [blame] | 240 | extern void diff_tree_combined(const struct object_id *oid, const struct oid_array *parents, int dense, struct rev_info *rev); |
Junio C Hamano | 0fe7c1d | 2006-04-29 01:24:49 -0700 | [diff] [blame] | 241 | |
René Scharfe | 8288929 | 2011-12-17 11:20:07 +0100 | [diff] [blame] | 242 | 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] | 243 | |
Junio C Hamano | a5a818e | 2008-08-18 20:08:09 -0700 | [diff] [blame] | 244 | void diff_set_mnemonic_prefix(struct diff_options *options, const char *a, const char *b); |
| 245 | |
Junio C Hamano | 28b9264 | 2011-05-31 09:14:17 -0700 | [diff] [blame] | 246 | extern int diff_can_quit_early(struct diff_options *); |
| 247 | |
Junio C Hamano | 6b5ee13 | 2005-09-21 00:00:47 -0700 | [diff] [blame] | 248 | extern void diff_addremove(struct diff_options *, |
| 249 | int addremove, |
Junio C Hamano | 77eb272 | 2005-04-27 09:21:00 -0700 | [diff] [blame] | 250 | unsigned mode, |
Brandon Williams | c26022e | 2017-05-30 10:30:47 -0700 | [diff] [blame] | 251 | const struct object_id *oid, |
| 252 | int oid_valid, |
Jens Lehmann | e3d42c4 | 2010-01-18 21:26:18 +0100 | [diff] [blame] | 253 | const char *fullpath, unsigned dirty_submodule); |
Junio C Hamano | 77eb272 | 2005-04-27 09:21:00 -0700 | [diff] [blame] | 254 | |
Junio C Hamano | 6b5ee13 | 2005-09-21 00:00:47 -0700 | [diff] [blame] | 255 | extern void diff_change(struct diff_options *, |
| 256 | unsigned mode1, unsigned mode2, |
Brandon Williams | 94a0097 | 2017-05-30 10:30:49 -0700 | [diff] [blame] | 257 | const struct object_id *old_oid, |
| 258 | const struct object_id *new_oid, |
| 259 | int old_oid_valid, int new_oid_valid, |
Jens Lehmann | e3d42c4 | 2010-01-18 21:26:18 +0100 | [diff] [blame] | 260 | const char *fullpath, |
| 261 | unsigned dirty_submodule1, unsigned dirty_submodule2); |
Junio C Hamano | 77eb272 | 2005-04-27 09:21:00 -0700 | [diff] [blame] | 262 | |
Junio C Hamano | fa7b290 | 2011-04-22 16:05:58 -0700 | [diff] [blame] | 263 | 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] | 264 | |
Junio C Hamano | 19feebc | 2005-05-27 15:54:37 -0700 | [diff] [blame] | 265 | #define DIFF_SETUP_REVERSE 1 |
Junio C Hamano | f0c6b2a | 2005-05-27 15:56:38 -0700 | [diff] [blame] | 266 | #define DIFF_SETUP_USE_CACHE 2 |
| 267 | #define DIFF_SETUP_USE_SIZE_CACHE 4 |
Junio C Hamano | ce24067 | 2005-06-03 01:36:43 -0700 | [diff] [blame] | 268 | |
Matthieu Moy | dea007f | 2010-08-05 10:22:52 +0200 | [diff] [blame] | 269 | /* |
Nicolas Vigier | b0d12fc | 2013-10-31 12:08:28 +0100 | [diff] [blame] | 270 | * Poor man's alternative to parse-option, to allow both stuck form |
Matthieu Moy | dea007f | 2010-08-05 10:22:52 +0200 | [diff] [blame] | 271 | * (--option=value) and separate form (--option value). |
| 272 | */ |
| 273 | extern int parse_long_opt(const char *opt, const char **argv, |
| 274 | const char **optarg); |
| 275 | |
Johannes Schindelin | ef90d6d | 2008-05-14 18:46:53 +0100 | [diff] [blame] | 276 | extern int git_diff_basic_config(const char *var, const char *value, void *cb); |
Michael Haggerty | 5b16287 | 2016-09-05 11:44:53 +0200 | [diff] [blame] | 277 | extern int git_diff_heuristic_config(const char *var, const char *value, void *cb); |
Matthieu Moy | 5404c11 | 2016-02-25 09:59:21 +0100 | [diff] [blame] | 278 | extern void init_diff_ui_defaults(void); |
Johannes Schindelin | ef90d6d | 2008-05-14 18:46:53 +0100 | [diff] [blame] | 279 | extern int git_diff_ui_config(const char *var, const char *value, void *cb); |
Junio C Hamano | 6b5ee13 | 2005-09-21 00:00:47 -0700 | [diff] [blame] | 280 | extern void diff_setup(struct diff_options *); |
Duy Nguyen | a97262c | 2016-01-21 18:48:44 +0700 | [diff] [blame] | 281 | extern int diff_opt_parse(struct diff_options *, const char **, int, const char *); |
Thomas Rast | 2845265 | 2012-08-03 14:16:24 +0200 | [diff] [blame] | 282 | extern void diff_setup_done(struct diff_options *); |
Junio C Hamano | 86436c2 | 2005-04-25 18:22:47 -0700 | [diff] [blame] | 283 | |
Junio C Hamano | 6b14d7f | 2005-05-22 10:04:37 -0700 | [diff] [blame] | 284 | #define DIFF_DETECT_RENAME 1 |
| 285 | #define DIFF_DETECT_COPY 2 |
| 286 | |
Junio C Hamano | 367cec1 | 2005-05-27 15:55:28 -0700 | [diff] [blame] | 287 | #define DIFF_PICKAXE_ALL 1 |
Petr Baudis | d01d8c6 | 2006-03-29 02:16:33 +0200 | [diff] [blame] | 288 | #define DIFF_PICKAXE_REGEX 2 |
Junio C Hamano | f345b0a | 2005-05-30 00:08:37 -0700 | [diff] [blame] | 289 | |
Junio C Hamano | f506b8e | 2010-08-23 10:17:03 -0700 | [diff] [blame] | 290 | #define DIFF_PICKAXE_KIND_S 4 /* traditional plumbing counter */ |
| 291 | #define DIFF_PICKAXE_KIND_G 8 /* grep in the patch */ |
| 292 | |
Junio C Hamano | 6b5ee13 | 2005-09-21 00:00:47 -0700 | [diff] [blame] | 293 | extern void diffcore_std(struct diff_options *); |
Junio C Hamano | 730f728 | 2009-09-20 00:03:39 -0700 | [diff] [blame] | 294 | extern void diffcore_fix_diff_index(struct diff_options *); |
Junio C Hamano | f2ce9fd | 2005-06-11 20:57:13 -0700 | [diff] [blame] | 295 | |
Junio C Hamano | dda2d79 | 2005-07-13 12:52:35 -0700 | [diff] [blame] | 296 | #define COMMON_DIFF_OPTIONS_HELP \ |
| 297 | "\ncommon diff options:\n" \ |
Junio C Hamano | 8082d8d | 2005-09-21 00:18:27 -0700 | [diff] [blame] | 298 | " -z output diff-raw with lines terminated with NUL.\n" \ |
| 299 | " -p output patch format.\n" \ |
| 300 | " -u synonym for -p.\n" \ |
Petr Baudis | 5c91da2 | 2006-04-11 13:22:17 +0200 | [diff] [blame] | 301 | " --patch-with-raw\n" \ |
| 302 | " output both a patch and the diff-raw format.\n" \ |
Johannes Schindelin | d75f795 | 2006-04-14 00:15:30 +0200 | [diff] [blame] | 303 | " --stat show diffstat instead of patch.\n" \ |
Junio C Hamano | 74e2abe | 2006-10-12 03:01:00 -0700 | [diff] [blame] | 304 | " --numstat show numeric diffstat instead of patch.\n" \ |
Johannes Schindelin | 2935327 | 2006-04-15 13:41:18 +0200 | [diff] [blame] | 305 | " --patch-with-stat\n" \ |
| 306 | " output a patch and prepend its diffstat.\n" \ |
Junio C Hamano | 8082d8d | 2005-09-21 00:18:27 -0700 | [diff] [blame] | 307 | " --name-only show only names of changed files.\n" \ |
Junio C Hamano | 946f5f7 | 2005-09-21 00:20:06 -0700 | [diff] [blame] | 308 | " --name-status show names and status of changed files.\n" \ |
Junio C Hamano | 47dd0d5 | 2005-12-13 17:21:41 -0800 | [diff] [blame] | 309 | " --full-index show full object name on index lines.\n" \ |
Junio C Hamano | 913419f | 2005-12-18 02:03:15 -0800 | [diff] [blame] | 310 | " --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] | 311 | " -R swap input file pairs.\n" \ |
| 312 | " -B detect complete rewrites.\n" \ |
| 313 | " -M detect renames.\n" \ |
| 314 | " -C detect copies.\n" \ |
Junio C Hamano | dda2d79 | 2005-07-13 12:52:35 -0700 | [diff] [blame] | 315 | " --find-copies-harder\n" \ |
Junio C Hamano | 8082d8d | 2005-09-21 00:18:27 -0700 | [diff] [blame] | 316 | " try unchanged files as candidate for copy detection.\n" \ |
| 317 | " -l<n> limit rename attempts up to <n> paths.\n" \ |
| 318 | " -O<file> reorder diffs according to the <file>.\n" \ |
| 319 | " -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] | 320 | " --pickaxe-all\n" \ |
Stephan Feder | ca49920 | 2006-07-07 15:57:08 +0200 | [diff] [blame] | 321 | " show all files diff when -S is used and hit is found.\n" \ |
| 322 | " -a --text treat all files as text.\n" |
Junio C Hamano | dda2d79 | 2005-07-13 12:52:35 -0700 | [diff] [blame] | 323 | |
Junio C Hamano | 38c6f78 | 2005-05-21 19:40:36 -0700 | [diff] [blame] | 324 | extern int diff_queue_is_empty(void); |
Junio C Hamano | 6b5ee13 | 2005-09-21 00:00:47 -0700 | [diff] [blame] | 325 | extern void diff_flush(struct diff_options*); |
Junio C Hamano | f31027c | 2011-01-06 13:50:06 -0800 | [diff] [blame] | 326 | 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] | 327 | |
Junio C Hamano | e7baa4f | 2005-07-25 13:05:44 -0700 | [diff] [blame] | 328 | /* diff-raw status letters */ |
Junio C Hamano | ca8c915 | 2005-07-25 14:31:19 -0700 | [diff] [blame] | 329 | #define DIFF_STATUS_ADDED 'A' |
Junio C Hamano | e7baa4f | 2005-07-25 13:05:44 -0700 | [diff] [blame] | 330 | #define DIFF_STATUS_COPIED 'C' |
| 331 | #define DIFF_STATUS_DELETED 'D' |
| 332 | #define DIFF_STATUS_MODIFIED 'M' |
| 333 | #define DIFF_STATUS_RENAMED 'R' |
| 334 | #define DIFF_STATUS_TYPE_CHANGED 'T' |
| 335 | #define DIFF_STATUS_UNKNOWN 'X' |
| 336 | #define DIFF_STATUS_UNMERGED 'U' |
| 337 | |
| 338 | /* these are not diff-raw status letters proper, but used by |
| 339 | * diffcore-filter insn to specify additional restrictions. |
| 340 | */ |
Junio C Hamano | 0b34379 | 2005-10-04 17:44:17 -0700 | [diff] [blame] | 341 | #define DIFF_STATUS_FILTER_AON '*' |
Junio C Hamano | e7baa4f | 2005-07-25 13:05:44 -0700 | [diff] [blame] | 342 | #define DIFF_STATUS_FILTER_BROKEN 'B' |
| 343 | |
Jeff King | d5e3b01 | 2016-10-20 02:19:43 -0400 | [diff] [blame] | 344 | /* |
| 345 | * This is different from find_unique_abbrev() in that |
| 346 | * it stuffs the result with dots for alignment. |
| 347 | */ |
Jeff King | d6cece5 | 2016-10-20 02:20:07 -0400 | [diff] [blame] | 348 | extern const char *diff_aligned_abbrev(const struct object_id *sha1, int); |
Junio C Hamano | 47dd0d5 | 2005-12-13 17:21:41 -0800 | [diff] [blame] | 349 | |
Junio C Hamano | 4bd5b7d | 2007-11-10 00:15:03 -0800 | [diff] [blame] | 350 | /* do not report anything on removed paths */ |
| 351 | #define DIFF_SILENT_ON_REMOVED 01 |
Junio C Hamano | fb63d7f | 2007-11-09 18:22:52 -0800 | [diff] [blame] | 352 | /* report racily-clean paths as modified */ |
| 353 | #define DIFF_RACY_IS_MODIFIED 02 |
Junio C Hamano | 4bd5b7d | 2007-11-10 00:15:03 -0800 | [diff] [blame] | 354 | 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] | 355 | extern int run_diff_index(struct rev_info *revs, int cached); |
Junio C Hamano | e09ad6e | 2006-04-22 02:43:00 -0700 | [diff] [blame] | 356 | |
brian m. carlson | 944cffb | 2017-05-06 22:10:35 +0000 | [diff] [blame] | 357 | extern int do_diff_cache(const struct object_id *, struct diff_options *); |
Brandon Williams | bd25f28 | 2017-05-30 10:30:54 -0700 | [diff] [blame] | 358 | extern int diff_flush_patch_id(struct diff_options *, struct object_id *, int); |
Johannes Schindelin | fcb3d0a | 2006-06-25 03:51:08 +0200 | [diff] [blame] | 359 | |
Junio C Hamano | da31b35 | 2007-12-13 23:40:27 -0800 | [diff] [blame] | 360 | extern int diff_result_code(struct diff_options *, int); |
| 361 | |
Nguyễn Thái Ngọc Duy | e5f7a5d | 2016-01-20 18:06:02 +0700 | [diff] [blame] | 362 | extern void diff_no_index(struct rev_info *, int, const char **); |
Junio C Hamano | 0569e9b | 2008-05-23 22:28:56 -0700 | [diff] [blame] | 363 | |
Nguyễn Thái Ngọc Duy | 018ec3c | 2016-10-24 17:42:21 +0700 | [diff] [blame] | 364 | extern int index_differs_from(const char *def, int diff_flags, int ita_invisible_in_index); |
Stephan Beyer | 75f3ff2 | 2009-02-10 15:30:35 +0100 | [diff] [blame] | 365 | |
Jeff King | a64e6a4 | 2016-02-22 13:28:54 -0500 | [diff] [blame] | 366 | /* |
| 367 | * Fill the contents of the filespec "df", respecting any textconv defined by |
| 368 | * its userdiff driver. The "driver" parameter must come from a |
| 369 | * previous call to get_textconv(), and therefore should either be NULL or have |
| 370 | * textconv enabled. |
| 371 | * |
| 372 | * Note that the memory ownership of the resulting buffer depends on whether |
| 373 | * the driver field is NULL. If it is, then the memory belongs to the filespec |
| 374 | * struct. If it is non-NULL, then "outbuf" points to a newly allocated buffer |
| 375 | * that should be freed by the caller. |
| 376 | */ |
Axel Bonnet | a788d7d | 2010-06-07 17:23:36 +0200 | [diff] [blame] | 377 | extern size_t fill_textconv(struct userdiff_driver *driver, |
| 378 | struct diff_filespec *df, |
| 379 | char **outbuf); |
| 380 | |
Jeff King | a64e6a4 | 2016-02-22 13:28:54 -0500 | [diff] [blame] | 381 | /* |
| 382 | * Look up the userdiff driver for the given filespec, and return it if |
| 383 | * and only if it has textconv enabled (otherwise return NULL). The result |
| 384 | * can be passed to fill_textconv(). |
| 385 | */ |
Axel Bonnet | a788d7d | 2010-06-07 17:23:36 +0200 | [diff] [blame] | 386 | extern struct userdiff_driver *get_textconv(struct diff_filespec *one); |
| 387 | |
Jeff Smith | 3a35cb2 | 2017-05-24 00:15:10 -0500 | [diff] [blame] | 388 | /* |
| 389 | * Prepare diff_filespec and convert it using diff textconv API |
| 390 | * if the textconv driver exists. |
| 391 | * Return 1 if the conversion succeeds, 0 otherwise. |
| 392 | */ |
| 393 | extern int textconv_object(const char *path, unsigned mode, const struct object_id *oid, int oid_valid, char **buf, unsigned long *buf_size); |
| 394 | |
Kevin Ballard | 10ae752 | 2010-09-27 16:58:25 -0700 | [diff] [blame] | 395 | extern int parse_rename_score(const char **cp_p); |
| 396 | |
Michal Privoznik | 07924d4 | 2013-01-16 08:51:58 +0100 | [diff] [blame] | 397 | extern long parse_algorithm_value(const char *value); |
| 398 | |
Nguyễn Thái Ngọc Duy | 7f81463 | 2012-02-01 19:55:07 +0700 | [diff] [blame] | 399 | extern int print_stat_summary(FILE *fp, int files, |
| 400 | int insertions, int deletions); |
Nguyễn Thái Ngọc Duy | 4914c96 | 2012-10-26 22:53:52 +0700 | [diff] [blame] | 401 | extern void setup_diff_pager(struct diff_options *); |
Nguyễn Thái Ngọc Duy | 7f81463 | 2012-02-01 19:55:07 +0700 | [diff] [blame] | 402 | |
Junio C Hamano | 86436c2 | 2005-04-25 18:22:47 -0700 | [diff] [blame] | 403 | #endif /* DIFF_H */ |