🌐 AI搜索 & 代理 主页
Google Git
Sign in
chromium / external / github.com / git / git / refs/tags/v2.20.5 / . / diff.h
blob: ce5e8a8183e848b2e36d50bea271f687a450e3af [file] [log] [blame]
Junio C Hamanobe3cfa82005-04-26 16:25:05[diff] [blame]1/*
2 * Copyright (C) 2005 Junio C Hamano
3 */
Junio C Hamano86436c22005-04-26 01:22:47[diff] [blame]4#ifndef DIFF_H
5#define DIFF_H
6
Junio C Hamano1b0c7172006-03-30 06:55:43[diff] [blame]7#include "tree-walk.h"
Nguyễn Thái Ngọc Duy64acde92013-07-14 08:35:25[diff] [blame]8#include "pathspec.h"
brian m. carlson1ff57c12015-03-13 23:39:33[diff] [blame]9#include "object.h"
Stefan Beller15af58c2018-01-04 22:50:42[diff] [blame]10#include "oidset.h"
Linus Torvalds50f9a852006-01-31 22:10:56[diff] [blame]11
Linus Torvalds91539832006-04-17 18:59:32[diff] [blame]12struct rev_info;
Linus Torvaldsac1b3d12005-10-21 04:05:05[diff] [blame]13struct diff_options;
Jeff King04245582006-09-07 06:35:42[diff] [blame]14struct diff_queue_struct;
Bo Yanga3c158d2010-05-26 07:08:02[diff] [blame]15struct strbuf;
Axel Bonneta788d7d2010-06-07 15:23:36[diff] [blame]16struct diff_filespec;
17struct userdiff_driver;
brian m. carlson910650d2017-03-31 01:40:00[diff] [blame]18struct oid_array;
René Scharfe82889292011-12-17 10:20:07[diff] [blame]19struct commit;
Kirill Smelkov72441af2014-04-06 21:46:26[diff] [blame]20struct combine_diff_path;
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 15:57:19[diff] [blame]21struct repository;
Kirill Smelkov72441af2014-04-06 21:46:26[diff] [blame]22
23typedef int (*pathchange_fn_t)(struct diff_options *options,
24 struct combine_diff_path *path);
Linus Torvaldsac1b3d12005-10-21 04:05:05[diff] [blame]25
26typedef void (*change_fn_t)(struct diff_options *options,
27 unsigned old_mode, unsigned new_mode,
Brandon Williams94a00972017-05-30 17:30:49[diff] [blame]28 const struct object_id *old_oid,
29 const struct object_id *new_oid,
30 int old_oid_valid, int new_oid_valid,
Jens Lehmanne3d42c42010-01-18 20:26:18[diff] [blame]31 const char *fullpath,
32 unsigned old_dirty_submodule, unsigned new_dirty_submodule);
Linus Torvaldsac1b3d12005-10-21 04:05:05[diff] [blame]33
34typedef void (*add_remove_fn_t)(struct diff_options *options,
35 int addremove, unsigned mode,
Brandon Williamsc26022e2017-05-30 17:30:47[diff] [blame]36 const struct object_id *oid,
37 int oid_valid,
Jens Lehmanne3d42c42010-01-18 20:26:18[diff] [blame]38 const char *fullpath, unsigned dirty_submodule);
Linus Torvaldsac1b3d12005-10-21 04:05:05[diff] [blame]39
Jeff King04245582006-09-07 06:35:42[diff] [blame]40typedef void (*diff_format_fn_t)(struct diff_queue_struct *q,
41 struct diff_options *options, void *data);
42
Bo Yanga3c158d2010-05-26 07:08:02[diff] [blame]43typedef struct strbuf *(*diff_prefix_fn_t)(struct diff_options *opt, void *data);
44
Timo Hirvonenc6744342006-06-24 17:21:53[diff] [blame]45#define DIFF_FORMAT_RAW 0x0001
46#define DIFF_FORMAT_DIFFSTAT 0x0002
Junio C Hamano74e2abe2006-10-12 10:01:00[diff] [blame]47#define DIFF_FORMAT_NUMSTAT 0x0004
48#define DIFF_FORMAT_SUMMARY 0x0008
49#define DIFF_FORMAT_PATCH 0x0010
Nicolas Pitreebd124c2006-12-15 04:15:44[diff] [blame]50#define DIFF_FORMAT_SHORTSTAT 0x0020
Linus Torvalds7df7c012008-02-12 21:26:31[diff] [blame]51#define DIFF_FORMAT_DIRSTAT 0x0040
Timo Hirvonenc6744342006-06-24 17:21:53[diff] [blame]52
53/* These override all above */
Junio C Hamano74e2abe2006-10-12 10:01:00[diff] [blame]54#define DIFF_FORMAT_NAME 0x0100
55#define DIFF_FORMAT_NAME_STATUS 0x0200
56#define DIFF_FORMAT_CHECKDIFF 0x0400
Timo Hirvonenc6744342006-06-24 17:21:53[diff] [blame]57
58/* Same as output_format = 0 but we know that -s flag was given
59 * and we should not give default value to output_format.
60 */
Junio C Hamano74e2abe2006-10-12 10:01:00[diff] [blame]61#define DIFF_FORMAT_NO_OUTPUT 0x0800
Timo Hirvonenc6744342006-06-24 17:21:53[diff] [blame]62
Junio C Hamano74e2abe2006-10-12 10:01:00[diff] [blame]63#define DIFF_FORMAT_CALLBACK 0x1000
Jeff King04245582006-09-07 06:35:42[diff] [blame]64
Brandon Williams02f2f562017-10-31 18:19:05[diff] [blame]65#define DIFF_FLAGS_INIT { 0 }
66struct diff_flags {
Brandon Williams0d1e0e72017-10-31 18:19:11[diff] [blame]67 unsigned recursive:1;
68 unsigned tree_in_recursive:1;
69 unsigned binary:1;
70 unsigned text:1;
71 unsigned full_index:1;
72 unsigned silent_on_remove:1;
73 unsigned find_copies_harder:1;
74 unsigned follow_renames:1;
75 unsigned rename_empty:1;
76 unsigned has_changes:1;
77 unsigned quick:1;
78 unsigned no_index:1;
79 unsigned allow_external:1;
80 unsigned exit_with_status:1;
81 unsigned reverse_diff:1;
82 unsigned check_failed:1;
83 unsigned relative_name:1;
84 unsigned ignore_submodules:1;
85 unsigned dirstat_cumulative:1;
86 unsigned dirstat_by_file:1;
87 unsigned allow_textconv:1;
88 unsigned textconv_set_via_cmdline:1;
89 unsigned diff_from_contents:1;
90 unsigned dirty_submodules:1;
91 unsigned ignore_untracked_in_submodules:1;
92 unsigned ignore_dirty_submodules:1;
93 unsigned override_submodule_config:1;
94 unsigned dirstat_by_line:1;
95 unsigned funccontext:1;
Brandon Williams0d1e0e72017-10-31 18:19:11[diff] [blame]96 unsigned default_follow_renames:1;
Nguyễn Thái Ngọc Duyddf88fa2018-02-24 14:09:59[diff] [blame]97 unsigned stat_with_summary:1;
Johannes Schindelin1cdde292018-08-13 11:33:11[diff] [blame]98 unsigned suppress_diff_headers:1;
Johannes Schindelinf7c3b4e2018-08-13 11:33:20[diff] [blame]99 unsigned dual_color_diffed_diffs:1;
Brandon Williams02f2f562017-10-31 18:19:05[diff] [blame]100};
Johannes Schindelin752c0c22009-10-19 12:38:32[diff] [blame]101
Brandon Williams02f2f562017-10-31 18:19:05[diff] [blame]102static inline void diff_flags_or(struct diff_flags *a,
103 const struct diff_flags *b)
104{
105 char *tmp_a = (char *)a;
106 const char *tmp_b = (const char *)b;
107 int i;
108
109 for (i = 0; i < sizeof(struct diff_flags); i++)
110 tmp_a[i] |= tmp_b[i];
111}
112
Keith Cascio628d5c22009-02-17 03:26:49[diff] [blame]113#define DIFF_XDL_TST(opts, flag) ((opts)->xdl_opts & XDF_##flag)
114#define DIFF_XDL_SET(opts, flag) ((opts)->xdl_opts |= XDF_##flag)
115#define DIFF_XDL_CLR(opts, flag) ((opts)->xdl_opts &= ~XDF_##flag)
Pierre Habouzit8f67f8a2007-11-10 19:05:14[diff] [blame]116
Junio C Hamano307ab202012-02-19 23:36:55[diff] [blame]117#define DIFF_WITH_ALG(opts, flag) (((opts)->xdl_opts & ~XDF_DIFF_ALGORITHM_MASK) | XDF_##flag)
118
Thomas Rast882749a2010-04-14 15:59:06[diff] [blame]119enum diff_words_type {
120 DIFF_WORDS_NONE = 0,
121 DIFF_WORDS_PORCELAIN,
122 DIFF_WORDS_PLAIN,
123 DIFF_WORDS_COLOR
124};
125
Jacob Keller61cfbc02016-08-31 23:27:21[diff] [blame]126enum diff_submodule_format {
127 DIFF_SUBMODULE_SHORT = 0,
Jacob Kellerfd47ae62016-08-31 23:27:25[diff] [blame]128 DIFF_SUBMODULE_LOG,
129 DIFF_SUBMODULE_INLINE_DIFF
Jacob Keller61cfbc02016-08-31 23:27:21[diff] [blame]130};
131
Junio C Hamano6b5ee132005-09-21 07:00:47[diff] [blame]132struct diff_options {
Junio C Hamano6b5ee132005-09-21 07:00:47[diff] [blame]133 const char *orderfile;
134 const char *pickaxe;
Junio C Hamano2f3f8b22006-11-02 08:02:11[diff] [blame]135 const char *single_follow;
Johannes Schindelineab9a402007-12-18 19:32:14[diff] [blame]136 const char *a_prefix, *b_prefix;
Jacob Keller660e1132016-08-31 23:27:20[diff] [blame]137 const char *line_prefix;
138 size_t line_prefix_length;
Brandon Williams02f2f562017-10-31 18:19:05[diff] [blame]139 struct diff_flags flags;
Junio C Hamano1ecc1cb2013-07-17 22:05:46[diff] [blame]140
141 /* diff-filter bits */
142 unsigned int filter;
143
Jeff Kingf1c96262011-08-18 05:03:12[diff] [blame]144 int use_color;
Linus Torvaldsee1e5412006-05-13 20:23:48[diff] [blame]145 int context;
René Scharfe6d0e6742008-12-28 18:45:32[diff] [blame]146 int interhunkcontext;
Junio C Hamano6b5ee132005-09-21 07:00:47[diff] [blame]147 int break_opt;
148 int detect_rename;
Junio C Hamano467ddc12011-03-01 00:11:55[diff] [blame]149 int irreversible_delete;
Junio C Hamanofb132272007-08-03 20:33:31[diff] [blame]150 int skip_stat_unmatch;
Junio C Hamano6b5ee132005-09-21 07:00:47[diff] [blame]151 int line_termination;
152 int output_format;
Stefan Beller929ed702018-01-04 22:50:39[diff] [blame]153 unsigned pickaxe_opts;
Junio C Hamano6b5ee132005-09-21 07:00:47[diff] [blame]154 int rename_score;
Junio C Hamano8082d8d2005-09-21 07:18:27[diff] [blame]155 int rename_limit;
Jeff Kingbf0ab102011-02-19 10:20:51[diff] [blame]156 int needed_rename_limit;
Junio C Hamanof31027c2011-01-06 21:50:06[diff] [blame]157 int degraded_cc_to_c;
Jeff King3ac942d2011-02-20 09:51:16[diff] [blame]158 int show_rename_progress;
Johan Herland712d2c72011-04-29 09:36:20[diff] [blame]159 int dirstat_permille;
Junio C Hamano6b5ee132005-09-21 07:00:47[diff] [blame]160 int setup;
Junio C Hamano47dd0d52005-12-14 01:21:41[diff] [blame]161 int abbrev;
Nguyễn Thái Ngọc Duy425a28e2016-10-24 10:42:19[diff] [blame]162 int ita_invisible_in_index;
Junio C Hamanob8767f72015-05-26 17:11:28[diff] [blame]163/* white-space error highlighting */
Stefan Beller091f8e22017-06-30 00:06:53[diff] [blame]164#define WSEH_NEW (1<<12)
165#define WSEH_CONTEXT (1<<13)
166#define WSEH_OLD (1<<14)
Junio C Hamanob8767f72015-05-26 17:11:28[diff] [blame]167 unsigned ws_error_highlight;
Junio C Hamanocd676a52008-02-12 22:26:02[diff] [blame]168 const char *prefix;
169 int prefix_length;
Johannes Schindelin698ce6f2006-05-20 13:40:29[diff] [blame]170 const char *stat_sep;
Johannes Schindelin0d21efa2006-06-14 15:40:23[diff] [blame]171 long xdl_opts;
Linus Torvaldsac1b3d12005-10-21 04:05:05[diff] [blame]172
Jonathan Tan2477ab22017-11-27 19:47:47[diff] [blame]173 /* see Documentation/diff-options.txt */
174 char **anchors;
175 size_t anchors_nr, anchors_alloc;
176
Junio C Hamanoa2540022006-09-27 01:53:02[diff] [blame]177 int stat_width;
178 int stat_name_width;
Zbigniew Jędrzejewski-Szmek969fe572012-03-01 12:26:45[diff] [blame]179 int stat_graph_width;
Michael J Gruber808e1db2011-05-27 12:36:41[diff] [blame]180 int stat_count;
Johannes Schindelin2b6a5412009-01-17 16:29:45[diff] [blame]181 const char *word_regex;
Thomas Rast882749a2010-04-14 15:59:06[diff] [blame]182 enum diff_words_type word_diff;
Jacob Keller61cfbc02016-08-31 23:27:21[diff] [blame]183 enum diff_submodule_format submodule_format;
Junio C Hamanoa2540022006-09-27 01:53:02[diff] [blame]184
Stefan Beller15af58c2018-01-04 22:50:42[diff] [blame]185 struct oidset *objfind;
186
Johannes Schindelin34a5e1a2007-02-25 22:34:54[diff] [blame]187 /* this is set by diffcore for DIFF_FORMAT_PATCH */
188 int found_changes;
189
Junio C Hamano44c48a92010-08-13 19:17:45[diff] [blame]190 /* to support internal diff recursion by --follow hack*/
191 int found_follow;
192
Junio C Hamano6c374002013-05-10 15:10:11[diff] [blame]193 void (*set_default)(struct diff_options *);
194
Daniel Barkalowc0c77732008-03-10 02:43:39[diff] [blame]195 FILE *file;
196 int close_file;
197
Stefan Beller7648b792018-08-17 20:43:52[diff] [blame]198#define OUTPUT_INDICATOR_NEW 0
199#define OUTPUT_INDICATOR_OLD 1
200#define OUTPUT_INDICATOR_CONTEXT 2
201 char output_indicators[3];
202
Nguyễn Thái Ngọc Duy66f13622010-12-15 15:02:38[diff] [blame]203 struct pathspec pathspec;
Kirill Smelkov72441af2014-04-06 21:46:26[diff] [blame]204 pathchange_fn_t pathchange;
Linus Torvaldsac1b3d12005-10-21 04:05:05[diff] [blame]205 change_fn_t change;
206 add_remove_fn_t add_remove;
Jeff Kinga937b372017-10-13 15:27:45[diff] [blame]207 void *change_fn_data;
Jeff King04245582006-09-07 06:35:42[diff] [blame]208 diff_format_fn_t format_callback;
209 void *format_callback_data;
Bo Yanga3c158d2010-05-26 07:08:02[diff] [blame]210 diff_prefix_fn_t output_prefix;
211 void *output_prefix_data;
Zoltan Klingeree7fb0b2013-12-05 23:38:46[diff] [blame]212
213 int diff_path_counter;
Stefan Bellere6e045f2017-06-30 00:07:06[diff] [blame]214
215 struct emitted_diff_symbols *emitted_symbols;
Stefan Beller2e2d5ac2017-06-30 20:53:07[diff] [blame]216 enum {
217 COLOR_MOVED_NO = 0,
Stefan Beller176841f2017-06-30 20:53:08[diff] [blame]218 COLOR_MOVED_PLAIN = 1,
Stefan Beller51da15e2018-07-16 23:05:39[diff] [blame]219 COLOR_MOVED_BLOCKS = 2,
220 COLOR_MOVED_ZEBRA = 3,
221 COLOR_MOVED_ZEBRA_DIM = 4,
Stefan Beller2e2d5ac2017-06-30 20:53:07[diff] [blame]222 } color_moved;
223 #define COLOR_MOVED_DEFAULT COLOR_MOVED_ZEBRA
Jonathan Tanf0b8fb62017-08-16 01:27:39[diff] [blame]224 #define COLOR_MOVED_MIN_ALNUM_COUNT 20
Stefan Bellerca1f4ae2018-07-18 19:31:55[diff] [blame]225
226 /* XDF_WHITESPACE_FLAGS regarding block detection are set at 2, 3, 4 */
227 #define COLOR_MOVED_WS_ALLOW_INDENTATION_CHANGE (1<<5)
Stefan Bellerb3095712018-07-16 23:05:40[diff] [blame]228 int color_moved_ws_handling;
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 15:57:19[diff] [blame]229
230 struct repository *repo;
Junio C Hamano6b5ee132005-09-21 07:00:47[diff] [blame]231};
232
Stefan Bellerf3597132017-06-30 00:07:00[diff] [blame]233void diff_emit_submodule_del(struct diff_options *o, const char *line);
234void diff_emit_submodule_add(struct diff_options *o, const char *line);
235void diff_emit_submodule_untracked(struct diff_options *o, const char *path);
236void diff_emit_submodule_modified(struct diff_options *o, const char *path);
237void diff_emit_submodule_header(struct diff_options *o, const char *header);
238void diff_emit_submodule_error(struct diff_options *o, const char *err);
239void diff_emit_submodule_pipethrough(struct diff_options *o,
240 const char *line, int len);
241
Jeff Kingce436972006-07-23 09:24:18[diff] [blame]242enum color_diff {
243 DIFF_RESET = 0,
Jeff King8dbf3eb2015-05-27 20:48:46[diff] [blame]244 DIFF_CONTEXT = 1,
Jeff Kingce436972006-07-23 09:24:18[diff] [blame]245 DIFF_METAINFO = 2,
246 DIFF_FRAGINFO = 3,
247 DIFF_FILE_OLD = 4,
248 DIFF_FILE_NEW = 5,
249 DIFF_COMMIT = 6,
Junio C Hamano448c3ef2006-09-23 05:48:39[diff] [blame]250 DIFF_WHITESPACE = 7,
Stefan Beller2e2d5ac2017-06-30 20:53:07[diff] [blame]251 DIFF_FUNCINFO = 8,
252 DIFF_FILE_OLD_MOVED = 9,
253 DIFF_FILE_OLD_MOVED_ALT = 10,
Stefan Beller86b452e2017-06-30 20:53:09[diff] [blame]254 DIFF_FILE_OLD_MOVED_DIM = 11,
255 DIFF_FILE_OLD_MOVED_ALT_DIM = 12,
256 DIFF_FILE_NEW_MOVED = 13,
257 DIFF_FILE_NEW_MOVED_ALT = 14,
258 DIFF_FILE_NEW_MOVED_DIM = 15,
Johannes Schindelina7be92a2018-08-13 11:33:32[diff] [blame]259 DIFF_FILE_NEW_MOVED_ALT_DIM = 16,
260 DIFF_CONTEXT_DIM = 17,
261 DIFF_FILE_OLD_DIM = 18,
262 DIFF_FILE_NEW_DIM = 19,
263 DIFF_CONTEXT_BOLD = 20,
264 DIFF_FILE_OLD_BOLD = 21,
265 DIFF_FILE_NEW_BOLD = 22,
Jeff Kingce436972006-07-23 09:24:18[diff] [blame]266};
267const char *diff_get_color(int diff_use_color, enum color_diff ix);
Pierre Habouzit8f67f8a2007-11-10 19:05:14[diff] [blame]268#define diff_get_color_opt(o, ix) \
Jeff Kingf1c96262011-08-18 05:03:12[diff] [blame]269 diff_get_color((o)->use_color, ix)
Pierre Habouzit8f67f8a2007-11-10 19:05:14[diff] [blame]270
Jeff Kingce436972006-07-23 09:24:18[diff] [blame]271
John Keepingf1922232013-02-07 20:15:26[diff] [blame]272const char *diff_line_prefix(struct diff_options *);
273
274
Johannes Schindelin698ce6f2006-05-20 13:40:29[diff] [blame]275extern const char mime_boundary_leader[];
276
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 09:20:26[diff] [blame]277struct combine_diff_path *diff_tree_paths(
Brandon Williamsfda94b42017-05-30 17:31:06[diff] [blame]278 struct combine_diff_path *p, const struct object_id *oid,
279 const struct object_id **parents_oid, int nparent,
Kirill Smelkov72441af2014-04-06 21:46:26[diff] [blame]280 struct strbuf *base, struct diff_options *opt);
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 09:20:26[diff] [blame]281int diff_tree_oid(const struct object_id *old_oid,
282 const struct object_id *new_oid,
283 const char *base, struct diff_options *opt);
284int diff_root_tree_oid(const struct object_id *new_oid, const char *base,
285 struct diff_options *opt);
Linus Torvaldsac1b3d12005-10-21 04:05:05[diff] [blame]286
Junio C Hamanoea726d02006-01-28 08:03:38[diff] [blame]287struct combine_diff_path {
288 struct combine_diff_path *next;
Junio C Hamanoea726d02006-01-28 08:03:38[diff] [blame]289 char *path;
Junio C Hamano2454c962006-02-06 20:53:07[diff] [blame]290 unsigned int mode;
brian m. carlson1ff57c12015-03-13 23:39:33[diff] [blame]291 struct object_id oid;
Junio C Hamano2454c962006-02-06 20:53:07[diff] [blame]292 struct combine_diff_parent {
Junio C Hamanod416df82006-02-10 10:30:52[diff] [blame]293 char status;
Junio C Hamano2454c962006-02-06 20:53:07[diff] [blame]294 unsigned int mode;
brian m. carlson1ff57c12015-03-13 23:39:33[diff] [blame]295 struct object_id oid;
Junio C Hamano2454c962006-02-06 20:53:07[diff] [blame]296 } parent[FLEX_ARRAY];
Junio C Hamanoea726d02006-01-28 08:03:38[diff] [blame]297};
Junio C Hamano2454c962006-02-06 20:53:07[diff] [blame]298#define combine_diff_path_size(n, l) \
Jeff King5b442c42016-02-19 11:21:30[diff] [blame]299 st_add4(sizeof(struct combine_diff_path), (l), 1, \
300 st_mult(sizeof(struct combine_diff_parent), (n)))
Junio C Hamanoea726d02006-01-28 08:03:38[diff] [blame]301
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 09:20:26[diff] [blame]302void show_combined_diff(struct combine_diff_path *elem, int num_parent,
303 int dense, struct rev_info *);
Junio C Hamanoea726d02006-01-28 08:03:38[diff] [blame]304
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 09:20:26[diff] [blame]305void diff_tree_combined(const struct object_id *oid, const struct oid_array *parents, int dense, struct rev_info *rev);
Junio C Hamano0fe7c1d2006-04-29 08:24:49[diff] [blame]306
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 09:20:26[diff] [blame]307void diff_tree_combined_merge(const struct commit *commit, int dense, struct rev_info *rev);
Junio C Hamanoaf3feef2006-01-24 09:22:04[diff] [blame]308
Junio C Hamanoa5a818e2008-08-19 03:08:09[diff] [blame]309void diff_set_mnemonic_prefix(struct diff_options *options, const char *a, const char *b);
310
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 09:20:26[diff] [blame]311int diff_can_quit_early(struct diff_options *);
Junio C Hamano28b92642011-05-31 16:14:17[diff] [blame]312
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 09:20:26[diff] [blame]313void diff_addremove(struct diff_options *,
314 int addremove,
315 unsigned mode,
316 const struct object_id *oid,
317 int oid_valid,
318 const char *fullpath, unsigned dirty_submodule);
Junio C Hamano77eb2722005-04-27 16:21:00[diff] [blame]319
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 09:20:26[diff] [blame]320void diff_change(struct diff_options *,
321 unsigned mode1, unsigned mode2,
322 const struct object_id *old_oid,
323 const struct object_id *new_oid,
324 int old_oid_valid, int new_oid_valid,
325 const char *fullpath,
326 unsigned dirty_submodule1, unsigned dirty_submodule2);
Junio C Hamano77eb2722005-04-27 16:21:00[diff] [blame]327
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 09:20:26[diff] [blame]328struct diff_filepair *diff_unmerge(struct diff_options *, const char *path);
Junio C Hamano77eb2722005-04-27 16:21:00[diff] [blame]329
Junio C Hamano19feebc2005-05-27 22:54:37[diff] [blame]330#define DIFF_SETUP_REVERSE 1
Junio C Hamanof0c6b2a2005-05-27 22:56:38[diff] [blame]331#define DIFF_SETUP_USE_SIZE_CACHE 4
Junio C Hamanoce240672005-06-03 08:36:43[diff] [blame]332
Matthieu Moydea007f2010-08-05 08:22:52[diff] [blame]333/*
Nicolas Vigierb0d12fc2013-10-31 11:08:28[diff] [blame]334 * Poor man's alternative to parse-option, to allow both stuck form
Matthieu Moydea007f2010-08-05 08:22:52[diff] [blame]335 * (--option=value) and separate form (--option value).
336 */
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 09:20:26[diff] [blame]337int parse_long_opt(const char *opt, const char **argv,
338 const char **optarg);
Matthieu Moydea007f2010-08-05 08:22:52[diff] [blame]339
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 09:20:26[diff] [blame]340int git_diff_basic_config(const char *var, const char *value, void *cb);
341int git_diff_heuristic_config(const char *var, const char *value, void *cb);
342void init_diff_ui_defaults(void);
343int git_diff_ui_config(const char *var, const char *value, void *cb);
Nguyễn Thái Ngọc Duye6757652018-09-21 15:57:24[diff] [blame]344#ifndef NO_THE_REPOSITORY_COMPATIBILITY_MACROS
345#define diff_setup(diffopts) repo_diff_setup(the_repository, diffopts)
346#endif
347void repo_diff_setup(struct repository *, struct diff_options *);
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 09:20:26[diff] [blame]348int diff_opt_parse(struct diff_options *, const char **, int, const char *);
349void diff_setup_done(struct diff_options *);
350int git_config_rename(const char *var, const char *value);
Junio C Hamano86436c22005-04-26 01:22:47[diff] [blame]351
Junio C Hamano6b14d7f2005-05-22 17:04:37[diff] [blame]352#define DIFF_DETECT_RENAME 1
353#define DIFF_DETECT_COPY 2
354
Junio C Hamano367cec12005-05-27 22:55:28[diff] [blame]355#define DIFF_PICKAXE_ALL 1
Petr Baudisd01d8c62006-03-29 00:16:33[diff] [blame]356#define DIFF_PICKAXE_REGEX 2
Junio C Hamanof345b0a2005-05-30 07:08:37[diff] [blame]357
Junio C Hamanof506b8e2010-08-23 17:17:03[diff] [blame]358#define DIFF_PICKAXE_KIND_S 4 /* traditional plumbing counter */
359#define DIFF_PICKAXE_KIND_G 8 /* grep in the patch */
Stefan Beller15af58c2018-01-04 22:50:42[diff] [blame]360#define DIFF_PICKAXE_KIND_OBJFIND 16 /* specific object IDs */
Junio C Hamanof506b8e2010-08-23 17:17:03[diff] [blame]361
Stefan Beller15af58c2018-01-04 22:50:42[diff] [blame]362#define DIFF_PICKAXE_KINDS_MASK (DIFF_PICKAXE_KIND_S | \
363 DIFF_PICKAXE_KIND_G | \
364 DIFF_PICKAXE_KIND_OBJFIND)
Stefan Bellercf630512018-01-04 22:50:41[diff] [blame]365
Stefan Bellerc1ddc462018-01-04 22:50:40[diff] [blame]366#define DIFF_PICKAXE_IGNORE_CASE 32
Junio C Hamanof2ce9fd2005-06-12 03:57:13[diff] [blame]367
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 09:20:26[diff] [blame]368void diffcore_std(struct diff_options *);
369void diffcore_fix_diff_index(struct diff_options *);
Junio C Hamano8082d8d2005-09-21 07:18:27[diff] [blame]370
371#define COMMON_DIFF_OPTIONS_HELP \
372"\ncommon diff options:\n" \
Petr Baudis5c91da22006-04-11 11:22:17[diff] [blame]373" -z output diff-raw with lines terminated with NUL.\n" \
374" -p output patch format.\n" \
Johannes Schindelind75f7952006-04-13 22:15:30[diff] [blame]375" -u synonym for -p.\n" \
Junio C Hamano74e2abe2006-10-12 10:01:00[diff] [blame]376" --patch-with-raw\n" \
Johannes Schindelin29353272006-04-15 11:41:18[diff] [blame]377" output both a patch and the diff-raw format.\n" \
378" --stat show diffstat instead of patch.\n" \
Junio C Hamano8082d8d2005-09-21 07:18:27[diff] [blame]379" --numstat show numeric diffstat instead of patch.\n" \
Junio C Hamano946f5f72005-09-21 07:20:06[diff] [blame]380" --patch-with-stat\n" \
Junio C Hamano47dd0d52005-12-14 01:21:41[diff] [blame]381" output a patch and prepend its diffstat.\n" \
Junio C Hamano913419f2005-12-18 10:03:15[diff] [blame]382" --name-only show only names of changed files.\n" \
Junio C Hamano8082d8d2005-09-21 07:18:27[diff] [blame]383" --name-status show names and status of changed files.\n" \
384" --full-index show full object name on index lines.\n" \
385" --abbrev=<n> abbreviate object names in diff-tree header and diff-raw.\n" \
386" -R swap input file pairs.\n" \
Junio C Hamanodda2d792005-07-13 19:52:35[diff] [blame]387" -B detect complete rewrites.\n" \
Junio C Hamano8082d8d2005-09-21 07:18:27[diff] [blame]388" -M detect renames.\n" \
389" -C detect copies.\n" \
390" --find-copies-harder\n" \
391" try unchanged files as candidate for copy detection.\n" \
Junio C Hamanodda2d792005-07-13 19:52:35[diff] [blame]392" -l<n> limit rename attempts up to <n> paths.\n" \
Stephan Federca499202006-07-07 13:57:08[diff] [blame]393" -O<file> reorder diffs according to the <file>.\n" \
394" -S<string> find filepair whose only one side contains the string.\n" \
Junio C Hamanodda2d792005-07-13 19:52:35[diff] [blame]395" --pickaxe-all\n" \
Junio C Hamano38c6f782005-05-22 02:40:36[diff] [blame]396" show all files diff when -S is used and hit is found.\n" \
Junio C Hamano6b5ee132005-09-21 07:00:47[diff] [blame]397" -a --text treat all files as text.\n"
Junio C Hamano86436c22005-04-26 01:22:47[diff] [blame]398
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 09:20:26[diff] [blame]399int diff_queue_is_empty(void);
400void diff_flush(struct diff_options*);
401void diff_warn_rename_limit(const char *varname, int needed, int degraded_cc);
Junio C Hamano86436c22005-04-26 01:22:47[diff] [blame]402
Junio C Hamanoe7baa4f2005-07-25 20:05:44[diff] [blame]403/* diff-raw status letters */
Junio C Hamanoca8c9152005-07-25 21:31:19[diff] [blame]404#define DIFF_STATUS_ADDED 'A'
Junio C Hamanoe7baa4f2005-07-25 20:05:44[diff] [blame]405#define DIFF_STATUS_COPIED 'C'
406#define DIFF_STATUS_DELETED 'D'
407#define DIFF_STATUS_MODIFIED 'M'
408#define DIFF_STATUS_RENAMED 'R'
409#define DIFF_STATUS_TYPE_CHANGED 'T'
410#define DIFF_STATUS_UNKNOWN 'X'
411#define DIFF_STATUS_UNMERGED 'U'
412
413/* these are not diff-raw status letters proper, but used by
414 * diffcore-filter insn to specify additional restrictions.
415 */
Junio C Hamano0b343792005-10-05 00:44:17[diff] [blame]416#define DIFF_STATUS_FILTER_AON '*'
Junio C Hamanoe7baa4f2005-07-25 20:05:44[diff] [blame]417#define DIFF_STATUS_FILTER_BROKEN 'B'
418
Jeff Kingd5e3b012016-10-20 06:19:43[diff] [blame]419/*
420 * This is different from find_unique_abbrev() in that
421 * it stuffs the result with dots for alignment.
422 */
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 09:20:26[diff] [blame]423const char *diff_aligned_abbrev(const struct object_id *sha1, int);
Junio C Hamano47dd0d52005-12-14 01:21:41[diff] [blame]424
Junio C Hamano4bd5b7d2007-11-10 08:15:03[diff] [blame]425/* do not report anything on removed paths */
426#define DIFF_SILENT_ON_REMOVED 01
Junio C Hamanofb63d7f2007-11-10 02:22:52[diff] [blame]427/* report racily-clean paths as modified */
428#define DIFF_RACY_IS_MODIFIED 02
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 09:20:26[diff] [blame]429int run_diff_files(struct rev_info *revs, unsigned int option);
430int run_diff_index(struct rev_info *revs, int cached);
Junio C Hamanoe09ad6e2006-04-22 09:43:00[diff] [blame]431
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 09:20:26[diff] [blame]432int do_diff_cache(const struct object_id *, struct diff_options *);
433int diff_flush_patch_id(struct diff_options *, struct object_id *, int);
Johannes Schindelinfcb3d0a2006-06-25 01:51:08[diff] [blame]434
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 09:20:26[diff] [blame]435int diff_result_code(struct diff_options *, int);
Junio C Hamanoda31b352007-12-14 07:40:27[diff] [blame]436
Nguyễn Thái Ngọc Duye6757652018-09-21 15:57:24[diff] [blame]437void diff_no_index(struct repository *, struct rev_info *, int, const char **);
Junio C Hamano0569e9b2008-05-24 05:28:56[diff] [blame]438
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 09:20:26[diff] [blame]439int index_differs_from(const char *def, const struct diff_flags *flags,
440 int ita_invisible_in_index);
Stephan Beyer75f3ff22009-02-10 14:30:35[diff] [blame]441
Jeff Kinga64e6a42016-02-22 18:28:54[diff] [blame]442/*
443 * Fill the contents of the filespec "df", respecting any textconv defined by
444 * its userdiff driver. The "driver" parameter must come from a
445 * previous call to get_textconv(), and therefore should either be NULL or have
446 * textconv enabled.
447 *
448 * Note that the memory ownership of the resulting buffer depends on whether
449 * the driver field is NULL. If it is, then the memory belongs to the filespec
450 * struct. If it is non-NULL, then "outbuf" points to a newly allocated buffer
451 * that should be freed by the caller.
452 */
Nguyễn Thái Ngọc Duy6afaf802018-09-21 15:57:22[diff] [blame]453size_t fill_textconv(struct repository *r,
454 struct userdiff_driver *driver,
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 09:20:26[diff] [blame]455 struct diff_filespec *df,
456 char **outbuf);
Axel Bonneta788d7d2010-06-07 15:23:36[diff] [blame]457
Jeff Kinga64e6a42016-02-22 18:28:54[diff] [blame]458/*
459 * Look up the userdiff driver for the given filespec, and return it if
460 * and only if it has textconv enabled (otherwise return NULL). The result
461 * can be passed to fill_textconv().
462 */
Nguyễn Thái Ngọc Duyacd00ea2018-09-21 15:57:33[diff] [blame]463struct userdiff_driver *get_textconv(struct index_state *istate,
464 struct diff_filespec *one);
Axel Bonneta788d7d2010-06-07 15:23:36[diff] [blame]465
Jeff Smith3a35cb22017-05-24 05:15:10[diff] [blame]466/*
467 * Prepare diff_filespec and convert it using diff textconv API
468 * if the textconv driver exists.
469 * Return 1 if the conversion succeeds, 0 otherwise.
470 */
Nguyễn Thái Ngọc Duy6afaf802018-09-21 15:57:22[diff] [blame]471int textconv_object(struct repository *repo,
472 const char *path,
473 unsigned mode,
474 const struct object_id *oid, int oid_valid,
475 char **buf, unsigned long *buf_size);
Jeff Smith3a35cb22017-05-24 05:15:10[diff] [blame]476
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 09:20:26[diff] [blame]477int parse_rename_score(const char **cp_p);
Kevin Ballard10ae7522010-09-27 23:58:25[diff] [blame]478
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 09:20:26[diff] [blame]479long parse_algorithm_value(const char *value);
Michal Privoznik07924d42013-01-16 07:51:58[diff] [blame]480
Nguyễn Thái Ngọc Duyf758a7f2018-06-30 09:20:26[diff] [blame]481void print_stat_summary(FILE *fp, int files,
482 int insertions, int deletions);
483void setup_diff_pager(struct diff_options *);
Nguyễn Thái Ngọc Duy7f814632012-02-01 12:55:07[diff] [blame]484
Junio C Hamano86436c22005-04-26 01:22:47[diff] [blame]485#endif /* DIFF_H */