blob: 4d3cf83a27e5785f5fd50dd2ce6155c94eb50840 [file] [log] [blame]
Junio C Hamano6973dca2006-04-21 23:57:45 -07001/*
2 * Copyright (C) 2005 Junio C Hamano
3 */
Junio C Hamano6973dca2006-04-21 23:57:45 -07004#include "cache.h"
Brandon Williamsb2141fc2017-06-14 11:07:36 -07005#include "config.h"
Michael Haggerty284098f2015-08-12 19:12:01 +02006#include "tempfile.h"
Junio C Hamano6973dca2006-04-21 23:57:45 -07007#include "quote.h"
8#include "diff.h"
9#include "diffcore.h"
Junio C Hamano051308f2006-05-04 16:51:44 -070010#include "delta.h"
Junio C Hamano6973dca2006-04-21 23:57:45 -070011#include "xdiff-interface.h"
Jeff King7c92fe02006-09-08 04:03:18 -040012#include "color.h"
Junio C Hamano8c701242007-04-12 23:05:29 -070013#include "attr.h"
Johannes Sixtd5535ec2007-10-19 21:47:56 +020014#include "run-command.h"
Junio C Hamano23707812008-01-02 01:50:11 -080015#include "utf8.h"
Stefan Bellercbd53a22018-05-15 16:42:15 -070016#include "object-store.h"
Jeff Kingbe58e702008-10-05 17:43:21 -040017#include "userdiff.h"
Heiko Voigt851e18c2015-08-17 17:21:59 -070018#include "submodule-config.h"
Johannes Schindelin752c0c22009-10-19 14:38:32 +020019#include "submodule.h"
Stefan Beller2e2d5ac2017-06-30 13:53:07 -070020#include "hashmap.h"
Junio C Hamanoa757c642010-03-24 19:21:32 -070021#include "ll-merge.h"
Michael Haggerty02e8ca02012-10-28 17:50:54 +010022#include "string-list.h"
Jeff King82fbf262014-04-19 15:17:06 -040023#include "argv-array.h"
Jacob Keller660e1132016-08-31 16:27:20 -070024#include "graph.h"
Jonathan Tan150e3002017-08-18 15:20:36 -070025#include "packfile.h"
Nguyễn Thái Ngọc Duy4a288472019-01-27 07:35:31 +070026#include "parse-options.h"
Nguyễn Thái Ngọc Duy3ac68a92018-05-26 15:55:24 +020027#include "help.h"
Jonathan Tan7fbbcb22019-04-05 10:09:34 -070028#include "fetch-object.h"
Junio C Hamano6973dca2006-04-21 23:57:45 -070029
Shawn O. Pearce1510fea2006-12-14 06:15:57 -050030#ifdef NO_FAST_WORKING_DIRECTORY
31#define FAST_WORKING_DIRECTORY 0
32#else
33#define FAST_WORKING_DIRECTORY 1
34#endif
35
David Rientjes96f1e582006-08-15 10:23:48 -070036static int diff_detect_rename_default;
Stefan Beller33de7162017-05-08 12:03:38 -040037static int diff_indent_heuristic = 1;
Jeff King92c57e52011-02-19 05:21:28 -050038static int diff_rename_limit_default = 400;
Jim Meyeringa624eaa2008-08-15 13:39:26 +020039static int diff_suppress_blank_empty;
Junio C Hamanod2aea132012-09-15 13:59:59 -070040static int diff_use_color_default = -1;
Stefan Beller2e2d5ac2017-06-30 13:53:07 -070041static int diff_color_moved_default;
Stefan Beller626c0b52018-07-18 12:31:56 -070042static int diff_color_moved_ws_default;
Jeff Muizelaar6468a4e2012-09-27 15:12:52 -040043static int diff_context_default = 3;
Vegard Nossumc4888672017-01-12 13:21:11 +010044static int diff_interhunk_context_default;
Boyd Stephen Smith Jr98a4d872009-01-20 21:46:57 -060045static const char *diff_word_regex_cfg;
Johannes Schindelincbe02102007-12-17 13:42:20 +000046static const char *external_diff_cmd_cfg;
Samuel Bronson6d8940b2013-12-18 19:08:12 -050047static const char *diff_order_file_cfg;
Junio C Hamanoaecbf912007-08-31 13:13:42 -070048int diff_auto_refresh_index = 1;
Junio C Hamanoa5a818e2008-08-18 20:08:09 -070049static int diff_mnemonic_prefix;
Eli Collinsf89504d2010-05-02 19:03:41 -070050static int diff_no_prefix;
Zbigniew Jędrzejewski-Szmekdf444832012-03-01 13:26:46 +010051static int diff_stat_graph_width;
Johan Herland712d2c72011-04-29 11:36:20 +020052static int diff_dirstat_permille_default = 30;
Johannes Schindelinbe4f2b42010-08-05 10:49:55 +020053static struct diff_options default_diff_options;
Michal Privoznik07ab4de2013-01-16 08:51:57 +010054static long diff_algorithm;
Junio C Hamanoa17505f2016-10-04 15:26:27 -070055static unsigned ws_error_highlight_default = WSEH_NEW;
Junio C Hamano6973dca2006-04-21 23:57:45 -070056
Jeff King7c92fe02006-09-08 04:03:18 -040057static char diff_colors[][COLOR_MAXLEN] = {
Arjen Laarhovendc6ebd42009-02-13 22:53:40 +010058 GIT_COLOR_RESET,
Jeff King8dbf3eb2015-05-27 16:48:46 -040059 GIT_COLOR_NORMAL, /* CONTEXT */
Arjen Laarhovendc6ebd42009-02-13 22:53:40 +010060 GIT_COLOR_BOLD, /* METAINFO */
61 GIT_COLOR_CYAN, /* FRAGINFO */
62 GIT_COLOR_RED, /* OLD */
63 GIT_COLOR_GREEN, /* NEW */
64 GIT_COLOR_YELLOW, /* COMMIT */
65 GIT_COLOR_BG_RED, /* WHITESPACE */
Bert Wesarg89cb73a2009-11-27 07:55:18 +010066 GIT_COLOR_NORMAL, /* FUNCINFO */
Stefan Beller86b452e2017-06-30 13:53:09 -070067 GIT_COLOR_BOLD_MAGENTA, /* OLD_MOVED */
68 GIT_COLOR_BOLD_BLUE, /* OLD_MOVED ALTERNATIVE */
69 GIT_COLOR_FAINT, /* OLD_MOVED_DIM */
70 GIT_COLOR_FAINT_ITALIC, /* OLD_MOVED_ALTERNATIVE_DIM */
71 GIT_COLOR_BOLD_CYAN, /* NEW_MOVED */
72 GIT_COLOR_BOLD_YELLOW, /* NEW_MOVED ALTERNATIVE */
73 GIT_COLOR_FAINT, /* NEW_MOVED_DIM */
74 GIT_COLOR_FAINT_ITALIC, /* NEW_MOVED_ALTERNATIVE_DIM */
Johannes Schindelina7be92a2018-08-13 04:33:32 -070075 GIT_COLOR_FAINT, /* CONTEXT_DIM */
76 GIT_COLOR_FAINT_RED, /* OLD_DIM */
77 GIT_COLOR_FAINT_GREEN, /* NEW_DIM */
78 GIT_COLOR_BOLD, /* CONTEXT_BOLD */
79 GIT_COLOR_BOLD_RED, /* OLD_BOLD */
80 GIT_COLOR_BOLD_GREEN, /* NEW_BOLD */
Johannes Schindelincd112ce2006-06-13 18:45:44 +020081};
82
Nguyễn Thái Ngọc Duya73b3682018-05-26 15:55:21 +020083static const char *color_diff_slots[] = {
84 [DIFF_CONTEXT] = "context",
85 [DIFF_METAINFO] = "meta",
86 [DIFF_FRAGINFO] = "frag",
87 [DIFF_FILE_OLD] = "old",
88 [DIFF_FILE_NEW] = "new",
89 [DIFF_COMMIT] = "commit",
90 [DIFF_WHITESPACE] = "whitespace",
91 [DIFF_FUNCINFO] = "func",
92 [DIFF_FILE_OLD_MOVED] = "oldMoved",
93 [DIFF_FILE_OLD_MOVED_ALT] = "oldMovedAlternative",
94 [DIFF_FILE_OLD_MOVED_DIM] = "oldMovedDimmed",
95 [DIFF_FILE_OLD_MOVED_ALT_DIM] = "oldMovedAlternativeDimmed",
96 [DIFF_FILE_NEW_MOVED] = "newMoved",
97 [DIFF_FILE_NEW_MOVED_ALT] = "newMovedAlternative",
98 [DIFF_FILE_NEW_MOVED_DIM] = "newMovedDimmed",
99 [DIFF_FILE_NEW_MOVED_ALT_DIM] = "newMovedAlternativeDimmed",
Johannes Schindelina7be92a2018-08-13 04:33:32 -0700100 [DIFF_CONTEXT_DIM] = "contextDimmed",
101 [DIFF_FILE_OLD_DIM] = "oldDimmed",
102 [DIFF_FILE_NEW_DIM] = "newDimmed",
103 [DIFF_CONTEXT_BOLD] = "contextBold",
104 [DIFF_FILE_OLD_BOLD] = "oldBold",
105 [DIFF_FILE_NEW_BOLD] = "newBold",
Nguyễn Thái Ngọc Duya73b3682018-05-26 15:55:21 +0200106};
107
Nguyễn Thái Ngọc Duy3ac68a92018-05-26 15:55:24 +0200108define_list_config_array_extra(color_diff_slots, {"plain"});
109
Jeff King9e1a5eb2014-06-18 15:41:50 -0400110static int parse_diff_color_slot(const char *var)
Junio C Hamano801235c2006-06-24 04:06:23 -0700111{
Nguyễn Thái Ngọc Duya73b3682018-05-26 15:55:21 +0200112 if (!strcasecmp(var, "plain"))
Jeff King8dbf3eb2015-05-27 16:48:46 -0400113 return DIFF_CONTEXT;
Nguyễn Thái Ngọc Duya73b3682018-05-26 15:55:21 +0200114 return LOOKUP_CONFIG(color_diff_slots, var);
Junio C Hamano801235c2006-06-24 04:06:23 -0700115}
116
Michael Haggerty02e8ca02012-10-28 17:50:54 +0100117static int parse_dirstat_params(struct diff_options *options, const char *params_string,
Johan Herland51670fc2011-04-29 11:36:22 +0200118 struct strbuf *errmsg)
Johan Herland333f3fb2011-04-29 11:36:18 +0200119{
Michael Haggerty02e8ca02012-10-28 17:50:54 +0100120 char *params_copy = xstrdup(params_string);
121 struct string_list params = STRING_LIST_INIT_NODUP;
122 int ret = 0;
123 int i;
Johan Herland51670fc2011-04-29 11:36:22 +0200124
Michael Haggerty02e8ca02012-10-28 17:50:54 +0100125 if (*params_copy)
126 string_list_split_in_place(&params, params_copy, ',', -1);
127 for (i = 0; i < params.nr; i++) {
128 const char *p = params.items[i].string;
129 if (!strcmp(p, "changes")) {
Brandon Williams0d1e0e72017-10-31 11:19:11 -0700130 options->flags.dirstat_by_line = 0;
131 options->flags.dirstat_by_file = 0;
Michael Haggerty02e8ca02012-10-28 17:50:54 +0100132 } else if (!strcmp(p, "lines")) {
Brandon Williams0d1e0e72017-10-31 11:19:11 -0700133 options->flags.dirstat_by_line = 1;
134 options->flags.dirstat_by_file = 0;
Michael Haggerty02e8ca02012-10-28 17:50:54 +0100135 } else if (!strcmp(p, "files")) {
Brandon Williams0d1e0e72017-10-31 11:19:11 -0700136 options->flags.dirstat_by_line = 0;
137 options->flags.dirstat_by_file = 1;
Michael Haggerty02e8ca02012-10-28 17:50:54 +0100138 } else if (!strcmp(p, "noncumulative")) {
Brandon Williams0d1e0e72017-10-31 11:19:11 -0700139 options->flags.dirstat_cumulative = 0;
Michael Haggerty02e8ca02012-10-28 17:50:54 +0100140 } else if (!strcmp(p, "cumulative")) {
Brandon Williams0d1e0e72017-10-31 11:19:11 -0700141 options->flags.dirstat_cumulative = 1;
Johan Herland333f3fb2011-04-29 11:36:18 +0200142 } else if (isdigit(*p)) {
143 char *end;
Johan Herland51670fc2011-04-29 11:36:22 +0200144 int permille = strtoul(p, &end, 10) * 10;
145 if (*end == '.' && isdigit(*++end)) {
Johan Herland712d2c72011-04-29 11:36:20 +0200146 /* only use first digit */
Johan Herland51670fc2011-04-29 11:36:22 +0200147 permille += *end - '0';
Johan Herland712d2c72011-04-29 11:36:20 +0200148 /* .. and ignore any further digits */
Johan Herland51670fc2011-04-29 11:36:22 +0200149 while (isdigit(*++end))
Johan Herland712d2c72011-04-29 11:36:20 +0200150 ; /* nothing */
151 }
Michael Haggerty02e8ca02012-10-28 17:50:54 +0100152 if (!*end)
Johan Herland51670fc2011-04-29 11:36:22 +0200153 options->dirstat_permille = permille;
154 else {
Michael Haggerty02e8ca02012-10-28 17:50:54 +0100155 strbuf_addf(errmsg, _(" Failed to parse dirstat cut-off percentage '%s'\n"),
156 p);
Johan Herland51670fc2011-04-29 11:36:22 +0200157 ret++;
158 }
159 } else {
Michael Haggerty02e8ca02012-10-28 17:50:54 +0100160 strbuf_addf(errmsg, _(" Unknown dirstat parameter '%s'\n"), p);
Johan Herland51670fc2011-04-29 11:36:22 +0200161 ret++;
Johan Herland333f3fb2011-04-29 11:36:18 +0200162 }
Johan Herland51670fc2011-04-29 11:36:22 +0200163
Johan Herland333f3fb2011-04-29 11:36:18 +0200164 }
Michael Haggerty02e8ca02012-10-28 17:50:54 +0100165 string_list_clear(&params, 0);
166 free(params_copy);
Johan Herland51670fc2011-04-29 11:36:22 +0200167 return ret;
Johan Herland333f3fb2011-04-29 11:36:18 +0200168}
169
Ramkumar Ramachandrac47ef572012-11-13 21:12:45 +0530170static int parse_submodule_params(struct diff_options *options, const char *value)
171{
172 if (!strcmp(value, "log"))
Jacob Keller61cfbc02016-08-31 16:27:21 -0700173 options->submodule_format = DIFF_SUBMODULE_LOG;
Ramkumar Ramachandrac47ef572012-11-13 21:12:45 +0530174 else if (!strcmp(value, "short"))
Jacob Keller61cfbc02016-08-31 16:27:21 -0700175 options->submodule_format = DIFF_SUBMODULE_SHORT;
Jacob Kellerfd47ae62016-08-31 16:27:25 -0700176 else if (!strcmp(value, "diff"))
177 options->submodule_format = DIFF_SUBMODULE_INLINE_DIFF;
Nguyễn Thái Ngọc Duy5a59a232019-02-16 18:24:41 +0700178 /*
179 * Please update $__git_diff_submodule_formats in
180 * git-completion.bash when you add new formats.
181 */
Ramkumar Ramachandrac47ef572012-11-13 21:12:45 +0530182 else
183 return -1;
184 return 0;
185}
186
Ben Peart85b46032018-05-02 16:01:14 +0000187int git_config_rename(const char *var, const char *value)
Linus Torvaldscced5fb2009-04-09 11:46:15 -0700188{
189 if (!value)
190 return DIFF_DETECT_RENAME;
191 if (!strcasecmp(value, "copies") || !strcasecmp(value, "copy"))
192 return DIFF_DETECT_COPY;
193 return git_config_bool(var,value) ? DIFF_DETECT_RENAME : 0;
194}
195
Michal Privoznik07924d42013-01-16 08:51:58 +0100196long parse_algorithm_value(const char *value)
Michal Privoznik07ab4de2013-01-16 08:51:57 +0100197{
198 if (!value)
199 return -1;
200 else if (!strcasecmp(value, "myers") || !strcasecmp(value, "default"))
201 return 0;
202 else if (!strcasecmp(value, "minimal"))
203 return XDF_NEED_MINIMAL;
204 else if (!strcasecmp(value, "patience"))
205 return XDF_PATIENCE_DIFF;
206 else if (!strcasecmp(value, "histogram"))
207 return XDF_HISTOGRAM_DIFF;
Nguyễn Thái Ngọc Duy5a59a232019-02-16 18:24:41 +0700208 /*
209 * Please update $__git_diff_algorithms in git-completion.bash
210 * when you add new algorithms.
211 */
Michal Privoznik07ab4de2013-01-16 08:51:57 +0100212 return -1;
213}
214
Junio C Hamano0b4b42e2016-10-04 15:09:18 -0700215static int parse_one_token(const char **arg, const char *token)
216{
217 const char *rest;
218 if (skip_prefix(*arg, token, &rest) && (!*rest || *rest == ',')) {
219 *arg = rest;
220 return 1;
221 }
222 return 0;
223}
224
225static int parse_ws_error_highlight(const char *arg)
226{
227 const char *orig_arg = arg;
228 unsigned val = 0;
229
230 while (*arg) {
231 if (parse_one_token(&arg, "none"))
232 val = 0;
233 else if (parse_one_token(&arg, "default"))
234 val = WSEH_NEW;
235 else if (parse_one_token(&arg, "all"))
236 val = WSEH_NEW | WSEH_OLD | WSEH_CONTEXT;
237 else if (parse_one_token(&arg, "new"))
238 val |= WSEH_NEW;
239 else if (parse_one_token(&arg, "old"))
240 val |= WSEH_OLD;
241 else if (parse_one_token(&arg, "context"))
242 val |= WSEH_CONTEXT;
243 else {
244 return -1 - (int)(arg - orig_arg);
245 }
246 if (*arg)
247 arg++;
248 }
249 return val;
250}
251
Junio C Hamanoe0e324a2007-07-07 01:49:58 -0700252/*
Junio C Hamano83ad63c2006-07-08 01:05:16 -0700253 * These are to give UI layer defaults.
254 * The core-level commands such as git-diff-files should
255 * never be affected by the setting of diff.renames
256 * the user happens to have in the configuration file.
257 */
Matthieu Moy5404c112016-02-25 09:59:21 +0100258void init_diff_ui_defaults(void)
259{
Nguyễn Thái Ngọc Duy06dba2b2017-12-27 17:18:35 +0700260 diff_detect_rename_default = DIFF_DETECT_RENAME;
Matthieu Moy5404c112016-02-25 09:59:21 +0100261}
262
Michael Haggerty5b162872016-09-05 11:44:53 +0200263int git_diff_heuristic_config(const char *var, const char *value, void *cb)
264{
Junio C Hamano3cde4e02016-12-23 12:32:22 -0800265 if (!strcmp(var, "diff.indentheuristic"))
Michael Haggerty5b162872016-09-05 11:44:53 +0200266 diff_indent_heuristic = git_config_bool(var, value);
Michael Haggerty5b162872016-09-05 11:44:53 +0200267 return 0;
268}
269
Stefan Beller2e2d5ac2017-06-30 13:53:07 -0700270static int parse_color_moved(const char *arg)
271{
272 switch (git_parse_maybe_bool(arg)) {
273 case 0:
274 return COLOR_MOVED_NO;
275 case 1:
276 return COLOR_MOVED_DEFAULT;
277 default:
278 break;
279 }
280
281 if (!strcmp(arg, "no"))
282 return COLOR_MOVED_NO;
Stefan Beller176841f2017-06-30 13:53:08 -0700283 else if (!strcmp(arg, "plain"))
284 return COLOR_MOVED_PLAIN;
Stefan Beller51da15e2018-07-16 16:05:39 -0700285 else if (!strcmp(arg, "blocks"))
286 return COLOR_MOVED_BLOCKS;
Stefan Beller2e2d5ac2017-06-30 13:53:07 -0700287 else if (!strcmp(arg, "zebra"))
288 return COLOR_MOVED_ZEBRA;
289 else if (!strcmp(arg, "default"))
290 return COLOR_MOVED_DEFAULT;
Eric Sunshinee3f2f5f2018-07-24 17:58:45 -0400291 else if (!strcmp(arg, "dimmed-zebra"))
292 return COLOR_MOVED_ZEBRA_DIM;
Stefan Beller86b452e2017-06-30 13:53:09 -0700293 else if (!strcmp(arg, "dimmed_zebra"))
294 return COLOR_MOVED_ZEBRA_DIM;
Stefan Beller2e2d5ac2017-06-30 13:53:07 -0700295 else
Junio C Hamano706b0b52018-08-15 15:08:22 -0700296 return error(_("color moved setting must be one of 'no', 'default', 'blocks', 'zebra', 'dimmed-zebra', 'plain'"));
Stefan Beller2e2d5ac2017-06-30 13:53:07 -0700297}
298
Stefan Bellerd173e792018-11-13 13:33:57 -0800299static unsigned parse_color_moved_ws(const char *arg)
Stefan Bellerb3095712018-07-16 16:05:40 -0700300{
301 int ret = 0;
302 struct string_list l = STRING_LIST_INIT_DUP;
303 struct string_list_item *i;
304
305 string_list_split(&l, arg, ',', -1);
306
307 for_each_string_list_item(i, &l) {
308 struct strbuf sb = STRBUF_INIT;
309 strbuf_addstr(&sb, i->string);
310 strbuf_trim(&sb);
311
Phillip Woodb73bcba2018-11-23 11:16:52 +0000312 if (!strcmp(sb.buf, "no"))
313 ret = 0;
314 else if (!strcmp(sb.buf, "ignore-space-change"))
Stefan Bellerb3095712018-07-16 16:05:40 -0700315 ret |= XDF_IGNORE_WHITESPACE_CHANGE;
316 else if (!strcmp(sb.buf, "ignore-space-at-eol"))
317 ret |= XDF_IGNORE_WHITESPACE_AT_EOL;
318 else if (!strcmp(sb.buf, "ignore-all-space"))
319 ret |= XDF_IGNORE_WHITESPACE;
Stefan Bellerca1f4ae2018-07-18 12:31:55 -0700320 else if (!strcmp(sb.buf, "allow-indentation-change"))
321 ret |= COLOR_MOVED_WS_ALLOW_INDENTATION_CHANGE;
Stefan Bellerd173e792018-11-13 13:33:57 -0800322 else {
323 ret |= COLOR_MOVED_WS_ERROR;
324 error(_("unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', 'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'"), sb.buf);
325 }
Stefan Bellerb3095712018-07-16 16:05:40 -0700326
327 strbuf_release(&sb);
328 }
329
Stefan Bellerca1f4ae2018-07-18 12:31:55 -0700330 if ((ret & COLOR_MOVED_WS_ALLOW_INDENTATION_CHANGE) &&
Stefan Bellerd173e792018-11-13 13:33:57 -0800331 (ret & XDF_WHITESPACE_FLAGS)) {
Junio C Hamano15b07cb2019-01-29 12:47:53 -0800332 error(_("color-moved-ws: allow-indentation-change cannot be combined with other whitespace modes"));
Stefan Bellerd173e792018-11-13 13:33:57 -0800333 ret |= COLOR_MOVED_WS_ERROR;
334 }
Stefan Bellerca1f4ae2018-07-18 12:31:55 -0700335
Stefan Bellerb3095712018-07-16 16:05:40 -0700336 string_list_clear(&l, 0);
337
338 return ret;
Jeff Kinge269eb72011-08-17 22:03:48 -0700339}
Junio C Hamano801235c2006-06-24 04:06:23 -0700340
341int git_diff_ui_config(const char *var, const char *value, void *cb)
Jeff Muizelaar6468a4e2012-09-27 15:12:52 -0400342{
343 if (!strcmp(var, "diff.color") || !strcmp(var, "color.diff")) {
344 diff_use_color_default = git_config_colorbool(var, value);
345 return 0;
346 }
Stefan Beller2e2d5ac2017-06-30 13:53:07 -0700347 if (!strcmp(var, "diff.colormoved")) {
348 int cm = parse_color_moved(value);
349 if (cm < 0)
350 return -1;
351 diff_color_moved_default = cm;
352 return 0;
353 }
Stefan Beller626c0b52018-07-18 12:31:56 -0700354 if (!strcmp(var, "diff.colormovedws")) {
Stefan Bellerd173e792018-11-13 13:33:57 -0800355 unsigned cm = parse_color_moved_ws(value);
356 if (cm & COLOR_MOVED_WS_ERROR)
Stefan Beller626c0b52018-07-18 12:31:56 -0700357 return -1;
358 diff_color_moved_ws_default = cm;
359 return 0;
360 }
Jeff Muizelaar6468a4e2012-09-27 15:12:52 -0400361 if (!strcmp(var, "diff.context")) {
362 diff_context_default = git_config_int(var, value);
363 if (diff_context_default < 0)
364 return -1;
365 return 0;
366 }
Vegard Nossumc4888672017-01-12 13:21:11 +0100367 if (!strcmp(var, "diff.interhunkcontext")) {
368 diff_interhunk_context_default = git_config_int(var, value);
369 if (diff_interhunk_context_default < 0)
370 return -1;
371 return 0;
372 }
Eric Wongb68ea122006-07-07 04:01:23 -0700373 if (!strcmp(var, "diff.renames")) {
Linus Torvaldscced5fb2009-04-09 11:46:15 -0700374 diff_detect_rename_default = git_config_rename(var, value);
Eric Wongb68ea122006-07-07 04:01:23 -0700375 return 0;
376 }
Junio C Hamanoaecbf912007-08-31 13:13:42 -0700377 if (!strcmp(var, "diff.autorefreshindex")) {
378 diff_auto_refresh_index = git_config_bool(var, value);
379 return 0;
380 }
Junio C Hamanoa5a818e2008-08-18 20:08:09 -0700381 if (!strcmp(var, "diff.mnemonicprefix")) {
382 diff_mnemonic_prefix = git_config_bool(var, value);
383 return 0;
384 }
Eli Collinsf89504d2010-05-02 19:03:41 -0700385 if (!strcmp(var, "diff.noprefix")) {
386 diff_no_prefix = git_config_bool(var, value);
387 return 0;
388 }
Zbigniew Jędrzejewski-Szmekdf444832012-03-01 13:26:46 +0100389 if (!strcmp(var, "diff.statgraphwidth")) {
390 diff_stat_graph_width = git_config_int(var, value);
391 return 0;
392 }
Brian Hetrodaec8082008-07-05 01:24:43 -0400393 if (!strcmp(var, "diff.external"))
394 return git_config_string(&external_diff_cmd_cfg, var, value);
Boyd Stephen Smith Jr98a4d872009-01-20 21:46:57 -0600395 if (!strcmp(var, "diff.wordregex"))
396 return git_config_string(&diff_word_regex_cfg, var, value);
Samuel Bronson6d8940b2013-12-18 19:08:12 -0500397 if (!strcmp(var, "diff.orderfile"))
398 return git_config_pathname(&diff_order_file_cfg, var, value);
Junio C Hamanof1af60b2007-04-22 17:52:55 -0700399
Johannes Schindelinbe4f2b42010-08-05 10:49:55 +0200400 if (!strcmp(var, "diff.ignoresubmodules"))
401 handle_ignore_submodules_arg(&default_diff_options, value);
402
Ramkumar Ramachandrac47ef572012-11-13 21:12:45 +0530403 if (!strcmp(var, "diff.submodule")) {
404 if (parse_submodule_params(&default_diff_options, value))
405 warning(_("Unknown value for 'diff.submodule' config variable: '%s'"),
406 value);
407 return 0;
408 }
409
Michal Privoznik07ab4de2013-01-16 08:51:57 +0100410 if (!strcmp(var, "diff.algorithm")) {
411 diff_algorithm = parse_algorithm_value(value);
412 if (diff_algorithm < 0)
413 return -1;
414 return 0;
415 }
416
Junio C Hamanoa17505f2016-10-04 15:26:27 -0700417 if (!strcmp(var, "diff.wserrorhighlight")) {
418 int val = parse_ws_error_highlight(value);
419 if (val < 0)
420 return -1;
421 ws_error_highlight_default = val;
422 return 0;
423 }
424
Jeff King33c643b2017-10-13 13:24:31 -0400425 if (git_color_config(var, value, cb) < 0)
426 return -1;
427
Johannes Schindelinef90d6d2008-05-14 18:46:53 +0100428 return git_diff_basic_config(var, value, cb);
Jeff King9a1805a2008-01-04 03:59:34 -0500429}
430
Johannes Schindelinef90d6d2008-05-14 18:46:53 +0100431int git_diff_basic_config(const char *var, const char *value, void *cb)
Jeff King9a1805a2008-01-04 03:59:34 -0500432{
Jeff Kingae021d82014-06-18 15:47:50 -0400433 const char *name;
434
Linus Torvalds2b6ca6d2008-08-05 11:27:30 -0700435 if (!strcmp(var, "diff.renamelimit")) {
436 diff_rename_limit_default = git_config_int(var, value);
437 return 0;
438 }
439
Jeff King6680a082012-02-07 13:23:02 -0500440 if (userdiff_config(var, value) < 0)
441 return -1;
Jeff Kingc7534ef2008-10-26 00:45:55 -0400442
Jeff Kingae021d82014-06-18 15:47:50 -0400443 if (skip_prefix(var, "diff.color.", &name) ||
444 skip_prefix(var, "color.diff.", &name)) {
445 int slot = parse_diff_color_slot(name);
Jeff King8b8e8622009-12-12 07:25:24 -0500446 if (slot < 0)
447 return 0;
Junio C Hamano64f30e92008-02-11 10:53:56 -0800448 if (!value)
449 return config_error_nonbool(var);
Jeff Kingf6c5a292014-10-07 15:33:09 -0400450 return color_parse(value, diff_colors[slot]);
Junio C Hamano801235c2006-06-24 04:06:23 -0700451 }
Junio C Hamanof1af60b2007-04-22 17:52:55 -0700452
Jim Meyeringa624eaa2008-08-15 13:39:26 +0200453 /* like GNU diff's --suppress-blank-empty option */
Johannes Schindelin950db872009-01-20 22:08:33 +0100454 if (!strcmp(var, "diff.suppressblankempty") ||
455 /* for backwards compatibility */
456 !strcmp(var, "diff.suppress-blank-empty")) {
Jim Meyeringa624eaa2008-08-15 13:39:26 +0200457 diff_suppress_blank_empty = git_config_bool(var, value);
458 return 0;
459 }
460
Johan Herland2d174952011-04-29 11:36:19 +0200461 if (!strcmp(var, "diff.dirstat")) {
Johan Herland51670fc2011-04-29 11:36:22 +0200462 struct strbuf errmsg = STRBUF_INIT;
Johan Herland712d2c72011-04-29 11:36:20 +0200463 default_diff_options.dirstat_permille = diff_dirstat_permille_default;
Johan Herland51670fc2011-04-29 11:36:22 +0200464 if (parse_dirstat_params(&default_diff_options, value, &errmsg))
Johan Herland7478ac52011-04-29 11:36:23 +0200465 warning(_("Found errors in 'diff.dirstat' config variable:\n%s"),
Johan Herland51670fc2011-04-29 11:36:22 +0200466 errmsg.buf);
467 strbuf_release(&errmsg);
Johan Herland712d2c72011-04-29 11:36:20 +0200468 diff_dirstat_permille_default = default_diff_options.dirstat_permille;
Johan Herland2d174952011-04-29 11:36:19 +0200469 return 0;
470 }
471
Marc Branchaudcf5e7722017-05-08 12:03:36 -0400472 if (git_diff_heuristic_config(var, value, cb) < 0)
473 return -1;
474
Jeff King3e1dd172011-08-17 22:05:08 -0700475 return git_default_config(var, value, cb);
Junio C Hamano801235c2006-06-24 04:06:23 -0700476}
477
Junio C Hamano6973dca2006-04-21 23:57:45 -0700478static char *quote_two(const char *one, const char *two)
479{
480 int need_one = quote_c_style(one, NULL, NULL, 1);
481 int need_two = quote_c_style(two, NULL, NULL, 1);
Brandon Caseyf285a2d2008-10-09 14:12:12 -0500482 struct strbuf res = STRBUF_INIT;
Junio C Hamano6973dca2006-04-21 23:57:45 -0700483
484 if (need_one + need_two) {
Pierre Habouzit663af342007-09-20 00:42:15 +0200485 strbuf_addch(&res, '"');
486 quote_c_style(one, &res, NULL, 1);
487 quote_c_style(two, &res, NULL, 1);
488 strbuf_addch(&res, '"');
489 } else {
490 strbuf_addstr(&res, one);
491 strbuf_addstr(&res, two);
Junio C Hamano6973dca2006-04-21 23:57:45 -0700492 }
Pierre Habouzitb315c5c2007-09-27 12:58:23 +0200493 return strbuf_detach(&res, NULL);
Junio C Hamano6973dca2006-04-21 23:57:45 -0700494}
495
496static const char *external_diff(void)
497{
498 static const char *external_diff_cmd = NULL;
499 static int done_preparing = 0;
500
501 if (done_preparing)
502 return external_diff_cmd;
Kim Gybels6776a842019-01-11 21:26:08 +0100503 external_diff_cmd = xstrdup_or_null(getenv("GIT_EXTERNAL_DIFF"));
Johannes Schindelincbe02102007-12-17 13:42:20 +0000504 if (!external_diff_cmd)
505 external_diff_cmd = external_diff_cmd_cfg;
Junio C Hamano6973dca2006-04-21 23:57:45 -0700506 done_preparing = 1;
507 return external_diff_cmd;
508}
509
Michael Haggerty284098f2015-08-12 19:12:01 +0200510/*
511 * Keep track of files used for diffing. Sometimes such an entry
512 * refers to a temporary file, sometimes to an existing file, and
513 * sometimes to "/dev/null".
514 */
Junio C Hamano6973dca2006-04-21 23:57:45 -0700515static struct diff_tempfile {
Michael Haggerty284098f2015-08-12 19:12:01 +0200516 /*
517 * filename external diff should read from, or NULL if this
518 * entry is currently not in use:
519 */
520 const char *name;
521
brian m. carlsondc015052017-03-26 16:01:24 +0000522 char hex[GIT_MAX_HEXSZ + 1];
Junio C Hamano6973dca2006-04-21 23:57:45 -0700523 char mode[10];
Michael Haggerty284098f2015-08-12 19:12:01 +0200524
525 /*
526 * If this diff_tempfile instance refers to a temporary file,
527 * this tempfile object is used to manage its lifetime.
528 */
Jeff King076aa2c2017-09-05 08:15:08 -0400529 struct tempfile *tempfile;
Junio C Hamano6973dca2006-04-21 23:57:45 -0700530} diff_temp[2];
531
Junio C Hamano6957eb92009-09-14 18:44:01 -0700532struct emit_callback {
Junio C Hamano6957eb92009-09-14 18:44:01 -0700533 int color_diff;
534 unsigned ws_rule;
535 int blank_at_eof_in_preimage;
536 int blank_at_eof_in_postimage;
537 int lno_in_preimage;
538 int lno_in_postimage;
Junio C Hamano6957eb92009-09-14 18:44:01 -0700539 const char **label_path;
540 struct diff_words_data *diff_words;
Bo Yanga3c158d2010-05-26 15:08:02 +0800541 struct diff_options *opt;
Greg Bacon3e97c7c2009-11-19 15:12:24 -0600542 struct strbuf *header;
Junio C Hamano6957eb92009-09-14 18:44:01 -0700543};
544
Junio C Hamano6973dca2006-04-21 23:57:45 -0700545static int count_lines(const char *data, int size)
546{
547 int count, ch, completely_empty = 1, nl_just_seen = 0;
548 count = 0;
549 while (0 < size--) {
550 ch = *data++;
551 if (ch == '\n') {
552 count++;
553 nl_just_seen = 1;
554 completely_empty = 0;
555 }
556 else {
557 nl_just_seen = 0;
558 completely_empty = 0;
559 }
560 }
561 if (completely_empty)
562 return 0;
563 if (!nl_just_seen)
564 count++; /* no trailing newline */
565 return count;
566}
567
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +0200568static int fill_mmfile(struct repository *r, mmfile_t *mf,
569 struct diff_filespec *one)
Junio C Hamano6957eb92009-09-14 18:44:01 -0700570{
571 if (!DIFF_FILE_VALID(one)) {
572 mf->ptr = (char *)""; /* does not matter */
573 mf->size = 0;
574 return 0;
575 }
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +0200576 else if (diff_populate_filespec(r, one, 0))
Junio C Hamano6957eb92009-09-14 18:44:01 -0700577 return -1;
Junio C Hamanobb35fef2009-09-15 03:38:30 -0700578
Junio C Hamano6957eb92009-09-14 18:44:01 -0700579 mf->ptr = one->data;
580 mf->size = one->size;
581 return 0;
582}
583
Jeff Kingabb371a2011-02-19 03:16:32 -0500584/* like fill_mmfile, but only for size, so we can avoid retrieving blob */
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +0200585static unsigned long diff_filespec_size(struct repository *r,
586 struct diff_filespec *one)
Jeff Kingabb371a2011-02-19 03:16:32 -0500587{
588 if (!DIFF_FILE_VALID(one))
589 return 0;
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +0200590 diff_populate_filespec(r, one, CHECK_SIZE_ONLY);
Jeff Kingabb371a2011-02-19 03:16:32 -0500591 return one->size;
592}
593
Junio C Hamano6957eb92009-09-14 18:44:01 -0700594static int count_trailing_blank(mmfile_t *mf, unsigned ws_rule)
595{
596 char *ptr = mf->ptr;
597 long size = mf->size;
598 int cnt = 0;
599
600 if (!size)
601 return cnt;
602 ptr += size - 1; /* pointing at the very end */
603 if (*ptr != '\n')
604 ; /* incomplete line */
605 else
606 ptr--; /* skip the last LF */
607 while (mf->ptr < ptr) {
608 char *prev_eol;
609 for (prev_eol = ptr; mf->ptr <= prev_eol; prev_eol--)
610 if (*prev_eol == '\n')
611 break;
612 if (!ws_blank_line(prev_eol + 1, ptr - prev_eol, ws_rule))
613 break;
614 cnt++;
615 ptr = prev_eol - 1;
616 }
617 return cnt;
618}
619
620static void check_blank_at_eof(mmfile_t *mf1, mmfile_t *mf2,
621 struct emit_callback *ecbdata)
622{
623 int l1, l2, at;
624 unsigned ws_rule = ecbdata->ws_rule;
625 l1 = count_trailing_blank(mf1, ws_rule);
626 l2 = count_trailing_blank(mf2, ws_rule);
627 if (l2 <= l1) {
628 ecbdata->blank_at_eof_in_preimage = 0;
629 ecbdata->blank_at_eof_in_postimage = 0;
630 return;
631 }
632 at = count_lines(mf1->ptr, mf1->size);
633 ecbdata->blank_at_eof_in_preimage = (at - l1) + 1;
634
635 at = count_lines(mf2->ptr, mf2->size);
636 ecbdata->blank_at_eof_in_postimage = (at - l2) + 1;
637}
638
Johannes Schindelinf7c3b4e2018-08-13 04:33:20 -0700639static void emit_line_0(struct diff_options *o,
Stefan Beller017ac452018-08-13 18:41:19 -0700640 const char *set_sign, const char *set, unsigned reverse, const char *reset,
Junio C Hamano250f7992009-09-14 18:44:01 -0700641 int first, const char *line, int len)
Junio C Hamano6957eb92009-09-14 18:44:01 -0700642{
643 int has_trailing_newline, has_trailing_carriage_return;
Stefan Beller44410672018-08-13 18:41:22 -0700644 int needs_reset = 0; /* at the end of the line */
Bo Yanga3c158d2010-05-26 15:08:02 +0800645 FILE *file = o->file;
646
Stefan Bellerf103a6f2018-08-13 18:41:21 -0700647 fputs(diff_line_prefix(o), file);
Junio C Hamano6957eb92009-09-14 18:44:01 -0700648
Stefan Beller44410672018-08-13 18:41:22 -0700649 has_trailing_newline = (len > 0 && line[len-1] == '\n');
650 if (has_trailing_newline)
651 len--;
652
653 has_trailing_carriage_return = (len > 0 && line[len-1] == '\r');
654 if (has_trailing_carriage_return)
655 len--;
656
657 if (!len && !first)
658 goto end_of_line;
659
660 if (reverse && want_color(o->use_color)) {
661 fputs(GIT_COLOR_REVERSE, file);
662 needs_reset = 1;
Junio C Hamano250f7992009-09-14 18:44:01 -0700663 }
Junio C Hamano6957eb92009-09-14 18:44:01 -0700664
Stefan Beller44410672018-08-13 18:41:22 -0700665 if (set_sign) {
666 fputs(set_sign, file);
667 needs_reset = 1;
Junio C Hamano06a47552009-11-27 22:04:10 -0800668 }
Stefan Beller44410672018-08-13 18:41:22 -0700669
Junio C Hamano6957eb92009-09-14 18:44:01 -0700670 if (first)
Stefan Beller44410672018-08-13 18:41:22 -0700671 fputc(first, file);
Junio C Hamano6957eb92009-09-14 18:44:01 -0700672
Stefan Beller44410672018-08-13 18:41:22 -0700673 if (!len)
674 goto end_of_line;
Junio C Hamano6957eb92009-09-14 18:44:01 -0700675
Stefan Beller44410672018-08-13 18:41:22 -0700676 if (set) {
677 if (set_sign && set != set_sign)
678 fputs(reset, file);
Junio C Hamano250f7992009-09-14 18:44:01 -0700679 fputs(set, file);
Stefan Beller44410672018-08-13 18:41:22 -0700680 needs_reset = 1;
Junio C Hamano6957eb92009-09-14 18:44:01 -0700681 }
Stefan Beller44410672018-08-13 18:41:22 -0700682 fwrite(line, len, 1, file);
683 needs_reset = 1; /* 'line' may contain color codes. */
684
685end_of_line:
686 if (needs_reset)
687 fputs(reset, file);
Junio C Hamano6957eb92009-09-14 18:44:01 -0700688 if (has_trailing_carriage_return)
689 fputc('\r', file);
690 if (has_trailing_newline)
691 fputc('\n', file);
692}
693
Bo Yanga3c158d2010-05-26 15:08:02 +0800694static void emit_line(struct diff_options *o, const char *set, const char *reset,
Junio C Hamano250f7992009-09-14 18:44:01 -0700695 const char *line, int len)
696{
Stefan Beller44410672018-08-13 18:41:22 -0700697 emit_line_0(o, set, NULL, 0, reset, 0, line, len);
Junio C Hamano250f7992009-09-14 18:44:01 -0700698}
699
Stefan Beller36a4cef2017-06-29 17:06:49 -0700700enum diff_symbol {
Stefan Beller4eed0eb2017-06-29 17:07:01 -0700701 DIFF_SYMBOL_BINARY_DIFF_HEADER,
702 DIFF_SYMBOL_BINARY_DIFF_HEADER_DELTA,
703 DIFF_SYMBOL_BINARY_DIFF_HEADER_LITERAL,
704 DIFF_SYMBOL_BINARY_DIFF_BODY,
705 DIFF_SYMBOL_BINARY_DIFF_FOOTER,
Stefan Beller0911c472017-06-29 17:07:02 -0700706 DIFF_SYMBOL_STATS_SUMMARY_NO_FILES,
707 DIFF_SYMBOL_STATS_SUMMARY_ABBREV,
708 DIFF_SYMBOL_STATS_SUMMARY_INSERTS_DELETES,
709 DIFF_SYMBOL_STATS_LINE,
Stefan Bellerbd033292017-06-29 17:07:03 -0700710 DIFF_SYMBOL_WORD_DIFF,
Stefan Beller30b7e1e2017-06-29 17:07:04 -0700711 DIFF_SYMBOL_STAT_SEP,
Stefan Beller146fdb02017-06-29 17:07:05 -0700712 DIFF_SYMBOL_SUMMARY,
Stefan Bellerf3597132017-06-29 17:07:00 -0700713 DIFF_SYMBOL_SUBMODULE_ADD,
714 DIFF_SYMBOL_SUBMODULE_DEL,
715 DIFF_SYMBOL_SUBMODULE_UNTRACKED,
716 DIFF_SYMBOL_SUBMODULE_MODIFIED,
717 DIFF_SYMBOL_SUBMODULE_HEADER,
718 DIFF_SYMBOL_SUBMODULE_ERROR,
719 DIFF_SYMBOL_SUBMODULE_PIPETHROUGH,
Stefan Beller5af6ea92017-06-29 17:06:59 -0700720 DIFF_SYMBOL_REWRITE_DIFF,
Stefan Beller4acaaa72017-06-29 17:06:58 -0700721 DIFF_SYMBOL_BINARY_FILES,
Stefan Bellera29b0a12017-06-29 17:06:57 -0700722 DIFF_SYMBOL_HEADER,
Stefan Beller3ee8b7b2017-06-29 17:06:56 -0700723 DIFF_SYMBOL_FILEPAIR_PLUS,
724 DIFF_SYMBOL_FILEPAIR_MINUS,
Stefan Bellerff958672017-06-29 17:06:54 -0700725 DIFF_SYMBOL_WORDS_PORCELAIN,
726 DIFF_SYMBOL_WORDS,
Stefan Beller091f8e22017-06-29 17:06:53 -0700727 DIFF_SYMBOL_CONTEXT,
Stefan Bellerf2bb1212017-06-29 17:06:55 -0700728 DIFF_SYMBOL_CONTEXT_INCOMPLETE,
Stefan Beller091f8e22017-06-29 17:06:53 -0700729 DIFF_SYMBOL_PLUS,
730 DIFF_SYMBOL_MINUS,
Stefan Bellerb9cbfde2017-06-29 17:06:52 -0700731 DIFF_SYMBOL_NO_LF_EOF,
Stefan Beller68abc6f2017-06-29 17:06:51 -0700732 DIFF_SYMBOL_CONTEXT_FRAGINFO,
Stefan Bellerc64b4202017-06-29 17:06:50 -0700733 DIFF_SYMBOL_CONTEXT_MARKER,
Stefan Beller36a4cef2017-06-29 17:06:49 -0700734 DIFF_SYMBOL_SEPARATOR
735};
Stefan Beller091f8e22017-06-29 17:06:53 -0700736/*
737 * Flags for content lines:
738 * 0..12 are whitespace rules
739 * 13-15 are WSEH_NEW | WSEH_OLD | WSEH_CONTEXT
740 * 16 is marking if the line is blank at EOF
741 */
Stefan Beller2e2d5ac2017-06-30 13:53:07 -0700742#define DIFF_SYMBOL_CONTENT_BLANK_LINE_EOF (1<<16)
743#define DIFF_SYMBOL_MOVED_LINE (1<<17)
744#define DIFF_SYMBOL_MOVED_LINE_ALT (1<<18)
Stefan Beller86b452e2017-06-30 13:53:09 -0700745#define DIFF_SYMBOL_MOVED_LINE_UNINTERESTING (1<<19)
Stefan Beller091f8e22017-06-29 17:06:53 -0700746#define DIFF_SYMBOL_CONTENT_WS_MASK (WSEH_NEW | WSEH_OLD | WSEH_CONTEXT | WS_RULE_MASK)
747
Stefan Bellere6e045f2017-06-29 17:07:06 -0700748/*
749 * This struct is used when we need to buffer the output of the diff output.
750 *
751 * NEEDSWORK: Instead of storing a copy of the line, add an offset pointer
752 * into the pre/post image file. This pointer could be a union with the
753 * line pointer. By storing an offset into the file instead of the literal line,
754 * we can decrease the memory footprint for the buffered output. At first we
755 * may want to only have indirection for the content lines, but we could also
756 * enhance the state for emitting prefabricated lines, e.g. the similarity
757 * score line or hunk/file headers would only need to store a number or path
758 * and then the output can be constructed later on depending on state.
759 */
760struct emitted_diff_symbol {
761 const char *line;
762 int len;
763 int flags;
Phillip Wood21536d02018-11-23 11:16:57 +0000764 int indent_off; /* Offset to first non-whitespace character */
765 int indent_width; /* The visual width of the indentation */
Stefan Bellere6e045f2017-06-29 17:07:06 -0700766 enum diff_symbol s;
767};
768#define EMITTED_DIFF_SYMBOL_INIT {NULL}
769
770struct emitted_diff_symbols {
771 struct emitted_diff_symbol *buf;
772 int nr, alloc;
773};
774#define EMITTED_DIFF_SYMBOLS_INIT {NULL, 0, 0}
775
776static void append_emitted_diff_symbol(struct diff_options *o,
777 struct emitted_diff_symbol *e)
778{
779 struct emitted_diff_symbol *f;
780
781 ALLOC_GROW(o->emitted_symbols->buf,
782 o->emitted_symbols->nr + 1,
783 o->emitted_symbols->alloc);
784 f = &o->emitted_symbols->buf[o->emitted_symbols->nr++];
785
786 memcpy(f, e, sizeof(struct emitted_diff_symbol));
787 f->line = e->line ? xmemdupz(e->line, e->len) : NULL;
788}
789
Stefan Beller2e2d5ac2017-06-30 13:53:07 -0700790struct moved_entry {
791 struct hashmap_entry ent;
792 const struct emitted_diff_symbol *es;
793 struct moved_entry *next_line;
794};
795
Phillip Wood74d156f2018-10-04 11:07:41 +0100796struct moved_block {
797 struct moved_entry *match;
Phillip Wood21536d02018-11-23 11:16:57 +0000798 int wsd; /* The whitespace delta of this block */
Phillip Wood74d156f2018-10-04 11:07:41 +0100799};
800
801static void moved_block_clear(struct moved_block *b)
802{
Phillip Wood21536d02018-11-23 11:16:57 +0000803 memset(b, 0, sizeof(*b));
804}
805
Phillip Wood0cd51e92018-11-23 11:16:58 +0000806#define INDENT_BLANKLINE INT_MIN
807
Phillip Wood21536d02018-11-23 11:16:57 +0000808static void fill_es_indent_data(struct emitted_diff_symbol *es)
809{
Phillip Wood0cd51e92018-11-23 11:16:58 +0000810 unsigned int off = 0, i;
Phillip Wood21536d02018-11-23 11:16:57 +0000811 int width = 0, tab_width = es->flags & WS_TAB_WIDTH_MASK;
812 const char *s = es->line;
813 const int len = es->len;
814
815 /* skip any \v \f \r at start of indentation */
816 while (s[off] == '\f' || s[off] == '\v' ||
817 (s[off] == '\r' && off < len - 1))
818 off++;
819
820 /* calculate the visual width of indentation */
821 while(1) {
822 if (s[off] == ' ') {
823 width++;
824 off++;
825 } else if (s[off] == '\t') {
826 width += tab_width - (width % tab_width);
827 while (s[++off] == '\t')
828 width += tab_width;
829 } else {
830 break;
831 }
832 }
833
Phillip Wood0cd51e92018-11-23 11:16:58 +0000834 /* check if this line is blank */
835 for (i = off; i < len; i++)
836 if (!isspace(s[i]))
837 break;
838
839 if (i == len) {
840 es->indent_width = INDENT_BLANKLINE;
841 es->indent_off = len;
842 } else {
843 es->indent_off = off;
844 es->indent_width = width;
845 }
Phillip Wood74d156f2018-10-04 11:07:41 +0100846}
847
Stefan Bellerca1f4ae2018-07-18 12:31:55 -0700848static int compute_ws_delta(const struct emitted_diff_symbol *a,
Phillip Wood21536d02018-11-23 11:16:57 +0000849 const struct emitted_diff_symbol *b,
850 int *out)
Stefan Bellerca1f4ae2018-07-18 12:31:55 -0700851{
Phillip Wood21536d02018-11-23 11:16:57 +0000852 int a_len = a->len,
853 b_len = b->len,
854 a_off = a->indent_off,
855 a_width = a->indent_width,
856 b_off = b->indent_off,
857 b_width = b->indent_width;
858 int delta;
Stefan Bellerca1f4ae2018-07-18 12:31:55 -0700859
Phillip Wood0cd51e92018-11-23 11:16:58 +0000860 if (a_width == INDENT_BLANKLINE && b_width == INDENT_BLANKLINE) {
861 *out = INDENT_BLANKLINE;
862 return 1;
863 }
864
Phillip Wood21536d02018-11-23 11:16:57 +0000865 if (a->s == DIFF_SYMBOL_PLUS)
866 delta = a_width - b_width;
867 else
868 delta = b_width - a_width;
869
870 if (a_len - a_off != b_len - b_off ||
871 memcmp(a->line + a_off, b->line + b_off, a_len - a_off))
Phillip Woodfe4516d2018-10-04 11:07:43 +0100872 return 0;
873
Phillip Wood21536d02018-11-23 11:16:57 +0000874 *out = delta;
Stefan Bellerca1f4ae2018-07-18 12:31:55 -0700875
Phillip Woodfe4516d2018-10-04 11:07:43 +0100876 return 1;
Stefan Bellerca1f4ae2018-07-18 12:31:55 -0700877}
878
879static int cmp_in_block_with_wsd(const struct diff_options *o,
880 const struct moved_entry *cur,
881 const struct moved_entry *match,
Phillip Wood74d156f2018-10-04 11:07:41 +0100882 struct moved_block *pmb,
Stefan Bellerca1f4ae2018-07-18 12:31:55 -0700883 int n)
884{
885 struct emitted_diff_symbol *l = &o->emitted_symbols->buf[n];
Phillip Wood7a4252c2018-11-23 11:16:56 +0000886 int al = cur->es->len, bl = match->es->len, cl = l->len;
Stefan Bellerca1f4ae2018-07-18 12:31:55 -0700887 const char *a = cur->es->line,
888 *b = match->es->line,
889 *c = l->line;
Phillip Wood21536d02018-11-23 11:16:57 +0000890 int a_off = cur->es->indent_off,
891 a_width = cur->es->indent_width,
892 c_off = l->indent_off,
893 c_width = l->indent_width;
894 int delta;
Stefan Bellerca1f4ae2018-07-18 12:31:55 -0700895
896 /*
Phillip Wood7a4252c2018-11-23 11:16:56 +0000897 * We need to check if 'cur' is equal to 'match'. As those
898 * are from the same (+/-) side, we do not need to adjust for
899 * indent changes. However these were found using fuzzy
900 * matching so we do have to check if they are equal. Here we
901 * just check the lengths. We delay calling memcmp() to check
902 * the contents until later as if the length comparison for a
903 * and c fails we can avoid the call all together.
Stefan Bellerca1f4ae2018-07-18 12:31:55 -0700904 */
Phillip Wood7a4252c2018-11-23 11:16:56 +0000905 if (al != bl)
Stefan Bellerca1f4ae2018-07-18 12:31:55 -0700906 return 1;
907
Phillip Wood0cd51e92018-11-23 11:16:58 +0000908 /* If 'l' and 'cur' are both blank then they match. */
909 if (a_width == INDENT_BLANKLINE && c_width == INDENT_BLANKLINE)
910 return 0;
Stefan Bellerca1f4ae2018-07-18 12:31:55 -0700911
912 /*
Phillip Wood21536d02018-11-23 11:16:57 +0000913 * The indent changes of the block are known and stored in pmb->wsd;
914 * however we need to check if the indent changes of the current line
915 * match those of the current block and that the text of 'l' and 'cur'
916 * after the indentation match.
Stefan Bellerca1f4ae2018-07-18 12:31:55 -0700917 */
Phillip Wood21536d02018-11-23 11:16:57 +0000918 if (cur->es->s == DIFF_SYMBOL_PLUS)
919 delta = a_width - c_width;
920 else
921 delta = c_width - a_width;
Stefan Bellerca1f4ae2018-07-18 12:31:55 -0700922
Phillip Wood0cd51e92018-11-23 11:16:58 +0000923 /*
924 * If the previous lines of this block were all blank then set its
925 * whitespace delta.
926 */
927 if (pmb->wsd == INDENT_BLANKLINE)
928 pmb->wsd = delta;
Stefan Bellerca1f4ae2018-07-18 12:31:55 -0700929
Phillip Wood21536d02018-11-23 11:16:57 +0000930 return !(delta == pmb->wsd && al - a_off == cl - c_off &&
931 !memcmp(a, b, al) && !
932 memcmp(a + a_off, c + c_off, al - a_off));
Stefan Bellerca1f4ae2018-07-18 12:31:55 -0700933}
934
Stefan Belleree1df662018-07-16 16:05:38 -0700935static int moved_entry_cmp(const void *hashmap_cmp_fn_data,
936 const void *entry,
937 const void *entry_or_key,
Stefan Beller2e2d5ac2017-06-30 13:53:07 -0700938 const void *keydata)
939{
Stefan Belleree1df662018-07-16 16:05:38 -0700940 const struct diff_options *diffopt = hashmap_cmp_fn_data;
941 const struct moved_entry *a = entry;
942 const struct moved_entry *b = entry_or_key;
Stefan Bellerb3095712018-07-16 16:05:40 -0700943 unsigned flags = diffopt->color_moved_ws_handling
944 & XDF_WHITESPACE_FLAGS;
Stefan Belleree1df662018-07-16 16:05:38 -0700945
Stefan Bellerca1f4ae2018-07-18 12:31:55 -0700946 if (diffopt->color_moved_ws_handling &
947 COLOR_MOVED_WS_ALLOW_INDENTATION_CHANGE)
948 /*
949 * As there is not specific white space config given,
950 * we'd need to check for a new block, so ignore all
951 * white space. The setup of the white space
952 * configuration for the next block is done else where
953 */
954 flags |= XDF_IGNORE_WHITESPACE;
955
Stefan Beller01be97c2017-10-25 11:49:12 -0700956 return !xdiff_compare_lines(a->es->line, a->es->len,
957 b->es->line, b->es->len,
Stefan Bellerb3095712018-07-16 16:05:40 -0700958 flags);
Stefan Beller2e2d5ac2017-06-30 13:53:07 -0700959}
960
961static struct moved_entry *prepare_entry(struct diff_options *o,
962 int line_no)
963{
964 struct moved_entry *ret = xmalloc(sizeof(*ret));
965 struct emitted_diff_symbol *l = &o->emitted_symbols->buf[line_no];
Stefan Bellerb3095712018-07-16 16:05:40 -0700966 unsigned flags = o->color_moved_ws_handling & XDF_WHITESPACE_FLAGS;
Stefan Beller2e2d5ac2017-06-30 13:53:07 -0700967
Stefan Bellerb3095712018-07-16 16:05:40 -0700968 ret->ent.hash = xdiff_hash_string(l->line, l->len, flags);
Stefan Beller2e2d5ac2017-06-30 13:53:07 -0700969 ret->es = l;
970 ret->next_line = NULL;
971
972 return ret;
973}
974
975static void add_lines_to_move_detection(struct diff_options *o,
976 struct hashmap *add_lines,
977 struct hashmap *del_lines)
978{
979 struct moved_entry *prev_line = NULL;
980
981 int n;
982 for (n = 0; n < o->emitted_symbols->nr; n++) {
983 struct hashmap *hm;
984 struct moved_entry *key;
985
986 switch (o->emitted_symbols->buf[n].s) {
987 case DIFF_SYMBOL_PLUS:
988 hm = add_lines;
989 break;
990 case DIFF_SYMBOL_MINUS:
991 hm = del_lines;
992 break;
993 default:
994 prev_line = NULL;
995 continue;
996 }
997
Phillip Wood21536d02018-11-23 11:16:57 +0000998 if (o->color_moved_ws_handling &
999 COLOR_MOVED_WS_ALLOW_INDENTATION_CHANGE)
1000 fill_es_indent_data(&o->emitted_symbols->buf[n]);
Stefan Beller2e2d5ac2017-06-30 13:53:07 -07001001 key = prepare_entry(o, n);
1002 if (prev_line && prev_line->es->s == o->emitted_symbols->buf[n].s)
1003 prev_line->next_line = key;
1004
1005 hashmap_add(hm, key);
1006 prev_line = key;
1007 }
1008}
1009
Stefan Bellere2fe6ab2018-07-16 16:05:41 -07001010static void pmb_advance_or_null(struct diff_options *o,
1011 struct moved_entry *match,
1012 struct hashmap *hm,
Phillip Wood74d156f2018-10-04 11:07:41 +01001013 struct moved_block *pmb,
Stefan Bellere2fe6ab2018-07-16 16:05:41 -07001014 int pmb_nr)
1015{
1016 int i;
1017 for (i = 0; i < pmb_nr; i++) {
Phillip Wood74d156f2018-10-04 11:07:41 +01001018 struct moved_entry *prev = pmb[i].match;
Stefan Bellere2fe6ab2018-07-16 16:05:41 -07001019 struct moved_entry *cur = (prev && prev->next_line) ?
1020 prev->next_line : NULL;
1021 if (cur && !hm->cmpfn(o, cur, match, NULL)) {
Phillip Wood74d156f2018-10-04 11:07:41 +01001022 pmb[i].match = cur;
Stefan Bellere2fe6ab2018-07-16 16:05:41 -07001023 } else {
Phillip Wood74d156f2018-10-04 11:07:41 +01001024 pmb[i].match = NULL;
Stefan Bellere2fe6ab2018-07-16 16:05:41 -07001025 }
1026 }
1027}
1028
Stefan Bellerca1f4ae2018-07-18 12:31:55 -07001029static void pmb_advance_or_null_multi_match(struct diff_options *o,
1030 struct moved_entry *match,
1031 struct hashmap *hm,
Phillip Wood74d156f2018-10-04 11:07:41 +01001032 struct moved_block *pmb,
Stefan Bellerca1f4ae2018-07-18 12:31:55 -07001033 int pmb_nr, int n)
1034{
1035 int i;
1036 char *got_match = xcalloc(1, pmb_nr);
1037
1038 for (; match; match = hashmap_get_next(hm, match)) {
1039 for (i = 0; i < pmb_nr; i++) {
Phillip Wood74d156f2018-10-04 11:07:41 +01001040 struct moved_entry *prev = pmb[i].match;
Stefan Bellerca1f4ae2018-07-18 12:31:55 -07001041 struct moved_entry *cur = (prev && prev->next_line) ?
1042 prev->next_line : NULL;
1043 if (!cur)
1044 continue;
Phillip Wood74d156f2018-10-04 11:07:41 +01001045 if (!cmp_in_block_with_wsd(o, cur, match, &pmb[i], n))
Stefan Bellerca1f4ae2018-07-18 12:31:55 -07001046 got_match[i] |= 1;
1047 }
1048 }
1049
1050 for (i = 0; i < pmb_nr; i++) {
1051 if (got_match[i]) {
Phillip Wood74d156f2018-10-04 11:07:41 +01001052 /* Advance to the next line */
1053 pmb[i].match = pmb[i].match->next_line;
Phillip Woodfab01ec2018-09-04 14:52:58 +01001054 } else {
Phillip Wood74d156f2018-10-04 11:07:41 +01001055 moved_block_clear(&pmb[i]);
Phillip Woodfab01ec2018-09-04 14:52:58 +01001056 }
Stefan Bellerca1f4ae2018-07-18 12:31:55 -07001057 }
Phillip Wood9c1a6c22018-10-04 11:07:44 +01001058
1059 free(got_match);
Stefan Bellerca1f4ae2018-07-18 12:31:55 -07001060}
1061
Phillip Wood74d156f2018-10-04 11:07:41 +01001062static int shrink_potential_moved_blocks(struct moved_block *pmb,
Stefan Beller2e2d5ac2017-06-30 13:53:07 -07001063 int pmb_nr)
1064{
1065 int lp, rp;
1066
1067 /* Shrink the set of potential block to the remaining running */
1068 for (lp = 0, rp = pmb_nr - 1; lp <= rp;) {
Phillip Wood74d156f2018-10-04 11:07:41 +01001069 while (lp < pmb_nr && pmb[lp].match)
Stefan Beller2e2d5ac2017-06-30 13:53:07 -07001070 lp++;
1071 /* lp points at the first NULL now */
1072
Phillip Wood74d156f2018-10-04 11:07:41 +01001073 while (rp > -1 && !pmb[rp].match)
Stefan Beller2e2d5ac2017-06-30 13:53:07 -07001074 rp--;
1075 /* rp points at the last non-NULL */
1076
1077 if (lp < pmb_nr && rp > -1 && lp < rp) {
1078 pmb[lp] = pmb[rp];
Phillip Wood21536d02018-11-23 11:16:57 +00001079 memset(&pmb[rp], 0, sizeof(pmb[rp]));
Stefan Beller2e2d5ac2017-06-30 13:53:07 -07001080 rp--;
1081 lp++;
1082 }
1083 }
1084
1085 /* Remember the number of running sets */
1086 return rp + 1;
1087}
1088
Jonathan Tan09153272017-08-15 18:27:38 -07001089/*
1090 * If o->color_moved is COLOR_MOVED_PLAIN, this function does nothing.
1091 *
Jonathan Tanf0b8fb62017-08-15 18:27:39 -07001092 * Otherwise, if the last block has fewer alphanumeric characters than
1093 * COLOR_MOVED_MIN_ALNUM_COUNT, unset DIFF_SYMBOL_MOVED_LINE on all lines in
Jonathan Tan09153272017-08-15 18:27:38 -07001094 * that block.
1095 *
1096 * The last block consists of the (n - block_length)'th line up to but not
1097 * including the nth line.
Jonathan Tanf0b8fb62017-08-15 18:27:39 -07001098 *
Phillip Woodb0a2ba42018-11-23 11:16:55 +00001099 * Returns 0 if the last block is empty or is unset by this function, non zero
1100 * otherwise.
1101 *
Jonathan Tanf0b8fb62017-08-15 18:27:39 -07001102 * NEEDSWORK: This uses the same heuristic as blame_entry_score() in blame.c.
1103 * Think of a way to unify them.
Jonathan Tan09153272017-08-15 18:27:38 -07001104 */
Phillip Woodb0a2ba42018-11-23 11:16:55 +00001105static int adjust_last_block(struct diff_options *o, int n, int block_length)
Jonathan Tan09153272017-08-15 18:27:38 -07001106{
Jonathan Tanf0b8fb62017-08-15 18:27:39 -07001107 int i, alnum_count = 0;
1108 if (o->color_moved == COLOR_MOVED_PLAIN)
Phillip Woodb0a2ba42018-11-23 11:16:55 +00001109 return block_length;
Jonathan Tanf0b8fb62017-08-15 18:27:39 -07001110 for (i = 1; i < block_length + 1; i++) {
1111 const char *c = o->emitted_symbols->buf[n - i].line;
1112 for (; *c; c++) {
1113 if (!isalnum(*c))
1114 continue;
1115 alnum_count++;
1116 if (alnum_count >= COLOR_MOVED_MIN_ALNUM_COUNT)
Phillip Woodb0a2ba42018-11-23 11:16:55 +00001117 return 1;
Jonathan Tanf0b8fb62017-08-15 18:27:39 -07001118 }
1119 }
Jonathan Tan09153272017-08-15 18:27:38 -07001120 for (i = 1; i < block_length + 1; i++)
1121 o->emitted_symbols->buf[n - i].flags &= ~DIFF_SYMBOL_MOVED_LINE;
Phillip Woodb0a2ba42018-11-23 11:16:55 +00001122 return 0;
Jonathan Tan09153272017-08-15 18:27:38 -07001123}
1124
Stefan Beller2e2d5ac2017-06-30 13:53:07 -07001125/* Find blocks of moved code, delegate actual coloring decision to helper */
1126static void mark_color_as_moved(struct diff_options *o,
1127 struct hashmap *add_lines,
1128 struct hashmap *del_lines)
1129{
Phillip Wood74d156f2018-10-04 11:07:41 +01001130 struct moved_block *pmb = NULL; /* potentially moved blocks */
Stefan Beller2e2d5ac2017-06-30 13:53:07 -07001131 int pmb_nr = 0, pmb_alloc = 0;
Phillip Woodb0a2ba42018-11-23 11:16:55 +00001132 int n, flipped_block = 0, block_length = 0;
Stefan Beller2e2d5ac2017-06-30 13:53:07 -07001133
1134
1135 for (n = 0; n < o->emitted_symbols->nr; n++) {
1136 struct hashmap *hm = NULL;
1137 struct moved_entry *key;
1138 struct moved_entry *match = NULL;
1139 struct emitted_diff_symbol *l = &o->emitted_symbols->buf[n];
Phillip Woodb0a2ba42018-11-23 11:16:55 +00001140 enum diff_symbol last_symbol = 0;
Stefan Beller2e2d5ac2017-06-30 13:53:07 -07001141
1142 switch (l->s) {
1143 case DIFF_SYMBOL_PLUS:
1144 hm = del_lines;
1145 key = prepare_entry(o, n);
Stefan Beller3783aad2018-07-16 16:05:37 -07001146 match = hashmap_get(hm, key, NULL);
Stefan Beller2e2d5ac2017-06-30 13:53:07 -07001147 free(key);
1148 break;
1149 case DIFF_SYMBOL_MINUS:
1150 hm = add_lines;
1151 key = prepare_entry(o, n);
Stefan Beller3783aad2018-07-16 16:05:37 -07001152 match = hashmap_get(hm, key, NULL);
Stefan Beller2e2d5ac2017-06-30 13:53:07 -07001153 free(key);
1154 break;
1155 default:
Phillip Woodb0a2ba42018-11-23 11:16:55 +00001156 flipped_block = 0;
Stefan Beller2e2d5ac2017-06-30 13:53:07 -07001157 }
1158
1159 if (!match) {
Phillip Wood74d156f2018-10-04 11:07:41 +01001160 int i;
1161
Jonathan Tan09153272017-08-15 18:27:38 -07001162 adjust_last_block(o, n, block_length);
Phillip Wood74d156f2018-10-04 11:07:41 +01001163 for(i = 0; i < pmb_nr; i++)
1164 moved_block_clear(&pmb[i]);
Stefan Beller2e2d5ac2017-06-30 13:53:07 -07001165 pmb_nr = 0;
1166 block_length = 0;
Phillip Woodb0a2ba42018-11-23 11:16:55 +00001167 flipped_block = 0;
1168 last_symbol = l->s;
Stefan Beller2e2d5ac2017-06-30 13:53:07 -07001169 continue;
1170 }
1171
Phillip Wood2034b472018-11-23 11:16:54 +00001172 if (o->color_moved == COLOR_MOVED_PLAIN) {
Phillip Woodb0a2ba42018-11-23 11:16:55 +00001173 last_symbol = l->s;
Phillip Wood2034b472018-11-23 11:16:54 +00001174 l->flags |= DIFF_SYMBOL_MOVED_LINE;
Stefan Beller176841f2017-06-30 13:53:08 -07001175 continue;
Phillip Wood2034b472018-11-23 11:16:54 +00001176 }
Stefan Beller176841f2017-06-30 13:53:08 -07001177
Stefan Bellerca1f4ae2018-07-18 12:31:55 -07001178 if (o->color_moved_ws_handling &
1179 COLOR_MOVED_WS_ALLOW_INDENTATION_CHANGE)
1180 pmb_advance_or_null_multi_match(o, match, hm, pmb, pmb_nr, n);
1181 else
1182 pmb_advance_or_null(o, match, hm, pmb, pmb_nr);
Stefan Beller2e2d5ac2017-06-30 13:53:07 -07001183
1184 pmb_nr = shrink_potential_moved_blocks(pmb, pmb_nr);
1185
1186 if (pmb_nr == 0) {
1187 /*
1188 * The current line is the start of a new block.
1189 * Setup the set of potential blocks.
1190 */
1191 for (; match; match = hashmap_get_next(hm, match)) {
1192 ALLOC_GROW(pmb, pmb_nr + 1, pmb_alloc);
Stefan Bellerca1f4ae2018-07-18 12:31:55 -07001193 if (o->color_moved_ws_handling &
1194 COLOR_MOVED_WS_ALLOW_INDENTATION_CHANGE) {
Phillip Wood74d156f2018-10-04 11:07:41 +01001195 if (compute_ws_delta(l, match->es,
1196 &pmb[pmb_nr].wsd))
1197 pmb[pmb_nr++].match = match;
Stefan Bellerca1f4ae2018-07-18 12:31:55 -07001198 } else {
Phillip Wood21536d02018-11-23 11:16:57 +00001199 pmb[pmb_nr].wsd = 0;
Phillip Wood74d156f2018-10-04 11:07:41 +01001200 pmb[pmb_nr++].match = match;
Stefan Bellerca1f4ae2018-07-18 12:31:55 -07001201 }
Stefan Beller2e2d5ac2017-06-30 13:53:07 -07001202 }
1203
Phillip Woodb0a2ba42018-11-23 11:16:55 +00001204 if (adjust_last_block(o, n, block_length) &&
1205 pmb_nr && last_symbol != l->s)
1206 flipped_block = (flipped_block + 1) % 2;
1207 else
1208 flipped_block = 0;
Jonathan Tanf0b8fb62017-08-15 18:27:39 -07001209
Jonathan Tanf0b8fb62017-08-15 18:27:39 -07001210 block_length = 0;
Stefan Beller2e2d5ac2017-06-30 13:53:07 -07001211 }
1212
Phillip Wood2034b472018-11-23 11:16:54 +00001213 if (pmb_nr) {
1214 block_length++;
Phillip Wood2034b472018-11-23 11:16:54 +00001215 l->flags |= DIFF_SYMBOL_MOVED_LINE;
1216 if (flipped_block && o->color_moved != COLOR_MOVED_BLOCKS)
1217 l->flags |= DIFF_SYMBOL_MOVED_LINE_ALT;
1218 }
Phillip Woodb0a2ba42018-11-23 11:16:55 +00001219 last_symbol = l->s;
Stefan Beller2e2d5ac2017-06-30 13:53:07 -07001220 }
Jonathan Tan09153272017-08-15 18:27:38 -07001221 adjust_last_block(o, n, block_length);
Stefan Beller2e2d5ac2017-06-30 13:53:07 -07001222
Phillip Wood74d156f2018-10-04 11:07:41 +01001223 for(n = 0; n < pmb_nr; n++)
1224 moved_block_clear(&pmb[n]);
Stefan Beller2e2d5ac2017-06-30 13:53:07 -07001225 free(pmb);
1226}
Stefan Bellere6e045f2017-06-29 17:07:06 -07001227
Stefan Beller86b452e2017-06-30 13:53:09 -07001228#define DIFF_SYMBOL_MOVED_LINE_ZEBRA_MASK \
1229 (DIFF_SYMBOL_MOVED_LINE | DIFF_SYMBOL_MOVED_LINE_ALT)
1230static void dim_moved_lines(struct diff_options *o)
1231{
1232 int n;
1233 for (n = 0; n < o->emitted_symbols->nr; n++) {
1234 struct emitted_diff_symbol *prev = (n != 0) ?
1235 &o->emitted_symbols->buf[n - 1] : NULL;
1236 struct emitted_diff_symbol *l = &o->emitted_symbols->buf[n];
1237 struct emitted_diff_symbol *next =
1238 (n < o->emitted_symbols->nr - 1) ?
1239 &o->emitted_symbols->buf[n + 1] : NULL;
1240
1241 /* Not a plus or minus line? */
1242 if (l->s != DIFF_SYMBOL_PLUS && l->s != DIFF_SYMBOL_MINUS)
1243 continue;
1244
1245 /* Not a moved line? */
1246 if (!(l->flags & DIFF_SYMBOL_MOVED_LINE))
1247 continue;
1248
1249 /*
1250 * If prev or next are not a plus or minus line,
1251 * pretend they don't exist
1252 */
1253 if (prev && prev->s != DIFF_SYMBOL_PLUS &&
1254 prev->s != DIFF_SYMBOL_MINUS)
1255 prev = NULL;
1256 if (next && next->s != DIFF_SYMBOL_PLUS &&
1257 next->s != DIFF_SYMBOL_MINUS)
1258 next = NULL;
1259
1260 /* Inside a block? */
1261 if ((prev &&
1262 (prev->flags & DIFF_SYMBOL_MOVED_LINE_ZEBRA_MASK) ==
1263 (l->flags & DIFF_SYMBOL_MOVED_LINE_ZEBRA_MASK)) &&
1264 (next &&
1265 (next->flags & DIFF_SYMBOL_MOVED_LINE_ZEBRA_MASK) ==
1266 (l->flags & DIFF_SYMBOL_MOVED_LINE_ZEBRA_MASK))) {
1267 l->flags |= DIFF_SYMBOL_MOVED_LINE_UNINTERESTING;
1268 continue;
1269 }
1270
1271 /* Check if we are at an interesting bound: */
1272 if (prev && (prev->flags & DIFF_SYMBOL_MOVED_LINE) &&
1273 (prev->flags & DIFF_SYMBOL_MOVED_LINE_ALT) !=
1274 (l->flags & DIFF_SYMBOL_MOVED_LINE_ALT))
1275 continue;
1276 if (next && (next->flags & DIFF_SYMBOL_MOVED_LINE) &&
1277 (next->flags & DIFF_SYMBOL_MOVED_LINE_ALT) !=
1278 (l->flags & DIFF_SYMBOL_MOVED_LINE_ALT))
1279 continue;
1280
1281 /*
1282 * The boundary to prev and next are not interesting,
1283 * so this line is not interesting as a whole
1284 */
1285 l->flags |= DIFF_SYMBOL_MOVED_LINE_UNINTERESTING;
1286 }
1287}
1288
Stefan Beller091f8e22017-06-29 17:06:53 -07001289static void emit_line_ws_markup(struct diff_options *o,
Stefan Beller9d1e16b2018-08-13 18:41:18 -07001290 const char *set_sign, const char *set,
1291 const char *reset,
Stefan Bellerbc9feb02018-10-10 16:24:59 -07001292 int sign_index, const char *line, int len,
Stefan Beller091f8e22017-06-29 17:06:53 -07001293 unsigned ws_rule, int blank_at_eof)
1294{
1295 const char *ws = NULL;
Stefan Bellerbc9feb02018-10-10 16:24:59 -07001296 int sign = o->output_indicators[sign_index];
Stefan Beller091f8e22017-06-29 17:06:53 -07001297
1298 if (o->ws_error_highlight & ws_rule) {
1299 ws = diff_get_color_opt(o, DIFF_WHITESPACE);
1300 if (!*ws)
1301 ws = NULL;
1302 }
1303
Johannes Schindelinf7c3b4e2018-08-13 04:33:20 -07001304 if (!ws && !set_sign)
Stefan Beller017ac452018-08-13 18:41:19 -07001305 emit_line_0(o, set, NULL, 0, reset, sign, line, len);
Johannes Schindelinf7c3b4e2018-08-13 04:33:20 -07001306 else if (!ws) {
Stefan Beller29ef7592018-08-13 18:41:20 -07001307 emit_line_0(o, set_sign, set, !!set_sign, reset, sign, line, len);
Johannes Schindelinf7c3b4e2018-08-13 04:33:20 -07001308 } else if (blank_at_eof)
Stefan Beller091f8e22017-06-29 17:06:53 -07001309 /* Blank line at EOF - paint '+' as well */
Stefan Beller017ac452018-08-13 18:41:19 -07001310 emit_line_0(o, ws, NULL, 0, reset, sign, line, len);
Stefan Beller091f8e22017-06-29 17:06:53 -07001311 else {
1312 /* Emit just the prefix, then the rest. */
Stefan Beller017ac452018-08-13 18:41:19 -07001313 emit_line_0(o, set_sign ? set_sign : set, NULL, !!set_sign, reset,
Johannes Schindelinf7c3b4e2018-08-13 04:33:20 -07001314 sign, "", 0);
Stefan Beller091f8e22017-06-29 17:06:53 -07001315 ws_check_emit(line, len, ws_rule,
1316 o->file, set, reset, ws);
1317 }
1318}
Stefan Beller36a4cef2017-06-29 17:06:49 -07001319
Stefan Bellere6e045f2017-06-29 17:07:06 -07001320static void emit_diff_symbol_from_struct(struct diff_options *o,
1321 struct emitted_diff_symbol *eds)
Stefan Beller36a4cef2017-06-29 17:06:49 -07001322{
Stefan Bellerb9cbfde2017-06-29 17:06:52 -07001323 static const char *nneof = " No newline at end of file\n";
Johannes Schindelinf7c3b4e2018-08-13 04:33:20 -07001324 const char *context, *reset, *set, *set_sign, *meta, *fraginfo;
Stefan Beller0911c472017-06-29 17:07:02 -07001325 struct strbuf sb = STRBUF_INIT;
Stefan Bellere6e045f2017-06-29 17:07:06 -07001326
1327 enum diff_symbol s = eds->s;
1328 const char *line = eds->line;
1329 int len = eds->len;
1330 unsigned flags = eds->flags;
1331
Stefan Beller36a4cef2017-06-29 17:06:49 -07001332 switch (s) {
Stefan Bellerb9cbfde2017-06-29 17:06:52 -07001333 case DIFF_SYMBOL_NO_LF_EOF:
1334 context = diff_get_color_opt(o, DIFF_CONTEXT);
1335 reset = diff_get_color_opt(o, DIFF_RESET);
1336 putc('\n', o->file);
Stefan Beller017ac452018-08-13 18:41:19 -07001337 emit_line_0(o, context, NULL, 0, reset, '\\',
Stefan Bellerb9cbfde2017-06-29 17:06:52 -07001338 nneof, strlen(nneof));
1339 break;
Stefan Bellerf3597132017-06-29 17:07:00 -07001340 case DIFF_SYMBOL_SUBMODULE_HEADER:
1341 case DIFF_SYMBOL_SUBMODULE_ERROR:
1342 case DIFF_SYMBOL_SUBMODULE_PIPETHROUGH:
Stefan Beller0911c472017-06-29 17:07:02 -07001343 case DIFF_SYMBOL_STATS_SUMMARY_INSERTS_DELETES:
Stefan Beller146fdb02017-06-29 17:07:05 -07001344 case DIFF_SYMBOL_SUMMARY:
Stefan Beller0911c472017-06-29 17:07:02 -07001345 case DIFF_SYMBOL_STATS_LINE:
Stefan Beller4eed0eb2017-06-29 17:07:01 -07001346 case DIFF_SYMBOL_BINARY_DIFF_BODY:
Stefan Beller68abc6f2017-06-29 17:06:51 -07001347 case DIFF_SYMBOL_CONTEXT_FRAGINFO:
1348 emit_line(o, "", "", line, len);
1349 break;
Stefan Bellerf2bb1212017-06-29 17:06:55 -07001350 case DIFF_SYMBOL_CONTEXT_INCOMPLETE:
Stefan Bellerc64b4202017-06-29 17:06:50 -07001351 case DIFF_SYMBOL_CONTEXT_MARKER:
1352 context = diff_get_color_opt(o, DIFF_CONTEXT);
1353 reset = diff_get_color_opt(o, DIFF_RESET);
1354 emit_line(o, context, reset, line, len);
1355 break;
Stefan Beller36a4cef2017-06-29 17:06:49 -07001356 case DIFF_SYMBOL_SEPARATOR:
1357 fprintf(o->file, "%s%c",
1358 diff_line_prefix(o),
1359 o->line_termination);
1360 break;
Stefan Beller091f8e22017-06-29 17:06:53 -07001361 case DIFF_SYMBOL_CONTEXT:
1362 set = diff_get_color_opt(o, DIFF_CONTEXT);
1363 reset = diff_get_color_opt(o, DIFF_RESET);
Johannes Schindelinf7c3b4e2018-08-13 04:33:20 -07001364 set_sign = NULL;
1365 if (o->flags.dual_color_diffed_diffs) {
1366 char c = !len ? 0 : line[0];
1367
1368 if (c == '+')
1369 set = diff_get_color_opt(o, DIFF_FILE_NEW);
1370 else if (c == '@')
1371 set = diff_get_color_opt(o, DIFF_FRAGINFO);
1372 else if (c == '-')
1373 set = diff_get_color_opt(o, DIFF_FILE_OLD);
1374 }
Stefan Beller7648b792018-08-17 13:43:52 -07001375 emit_line_ws_markup(o, set_sign, set, reset,
Stefan Bellerbc9feb02018-10-10 16:24:59 -07001376 OUTPUT_INDICATOR_CONTEXT, line, len,
Stefan Beller091f8e22017-06-29 17:06:53 -07001377 flags & (DIFF_SYMBOL_CONTENT_WS_MASK), 0);
1378 break;
1379 case DIFF_SYMBOL_PLUS:
Stefan Beller86b452e2017-06-30 13:53:09 -07001380 switch (flags & (DIFF_SYMBOL_MOVED_LINE |
1381 DIFF_SYMBOL_MOVED_LINE_ALT |
1382 DIFF_SYMBOL_MOVED_LINE_UNINTERESTING)) {
1383 case DIFF_SYMBOL_MOVED_LINE |
1384 DIFF_SYMBOL_MOVED_LINE_ALT |
1385 DIFF_SYMBOL_MOVED_LINE_UNINTERESTING:
1386 set = diff_get_color_opt(o, DIFF_FILE_NEW_MOVED_ALT_DIM);
1387 break;
1388 case DIFF_SYMBOL_MOVED_LINE |
1389 DIFF_SYMBOL_MOVED_LINE_ALT:
Stefan Beller2e2d5ac2017-06-30 13:53:07 -07001390 set = diff_get_color_opt(o, DIFF_FILE_NEW_MOVED_ALT);
Stefan Beller86b452e2017-06-30 13:53:09 -07001391 break;
1392 case DIFF_SYMBOL_MOVED_LINE |
1393 DIFF_SYMBOL_MOVED_LINE_UNINTERESTING:
1394 set = diff_get_color_opt(o, DIFF_FILE_NEW_MOVED_DIM);
1395 break;
1396 case DIFF_SYMBOL_MOVED_LINE:
Stefan Beller2e2d5ac2017-06-30 13:53:07 -07001397 set = diff_get_color_opt(o, DIFF_FILE_NEW_MOVED);
Stefan Beller86b452e2017-06-30 13:53:09 -07001398 break;
1399 default:
Stefan Beller2e2d5ac2017-06-30 13:53:07 -07001400 set = diff_get_color_opt(o, DIFF_FILE_NEW);
Stefan Beller86b452e2017-06-30 13:53:09 -07001401 }
Stefan Beller091f8e22017-06-29 17:06:53 -07001402 reset = diff_get_color_opt(o, DIFF_RESET);
Johannes Schindelinf7c3b4e2018-08-13 04:33:20 -07001403 if (!o->flags.dual_color_diffed_diffs)
1404 set_sign = NULL;
1405 else {
1406 char c = !len ? 0 : line[0];
1407
1408 set_sign = set;
1409 if (c == '-')
Johannes Schindelina7be92a2018-08-13 04:33:32 -07001410 set = diff_get_color_opt(o, DIFF_FILE_OLD_BOLD);
Johannes Schindelinf7c3b4e2018-08-13 04:33:20 -07001411 else if (c == '@')
1412 set = diff_get_color_opt(o, DIFF_FRAGINFO);
Johannes Schindelina7be92a2018-08-13 04:33:32 -07001413 else if (c == '+')
1414 set = diff_get_color_opt(o, DIFF_FILE_NEW_BOLD);
1415 else
1416 set = diff_get_color_opt(o, DIFF_CONTEXT_BOLD);
Johannes Schindelin0b91faa2018-08-13 04:33:24 -07001417 flags &= ~DIFF_SYMBOL_CONTENT_WS_MASK;
Johannes Schindelinf7c3b4e2018-08-13 04:33:20 -07001418 }
Stefan Beller7648b792018-08-17 13:43:52 -07001419 emit_line_ws_markup(o, set_sign, set, reset,
Stefan Bellerbc9feb02018-10-10 16:24:59 -07001420 OUTPUT_INDICATOR_NEW, line, len,
Stefan Beller091f8e22017-06-29 17:06:53 -07001421 flags & DIFF_SYMBOL_CONTENT_WS_MASK,
1422 flags & DIFF_SYMBOL_CONTENT_BLANK_LINE_EOF);
1423 break;
1424 case DIFF_SYMBOL_MINUS:
Stefan Beller86b452e2017-06-30 13:53:09 -07001425 switch (flags & (DIFF_SYMBOL_MOVED_LINE |
1426 DIFF_SYMBOL_MOVED_LINE_ALT |
1427 DIFF_SYMBOL_MOVED_LINE_UNINTERESTING)) {
1428 case DIFF_SYMBOL_MOVED_LINE |
1429 DIFF_SYMBOL_MOVED_LINE_ALT |
1430 DIFF_SYMBOL_MOVED_LINE_UNINTERESTING:
1431 set = diff_get_color_opt(o, DIFF_FILE_OLD_MOVED_ALT_DIM);
1432 break;
1433 case DIFF_SYMBOL_MOVED_LINE |
1434 DIFF_SYMBOL_MOVED_LINE_ALT:
Stefan Beller2e2d5ac2017-06-30 13:53:07 -07001435 set = diff_get_color_opt(o, DIFF_FILE_OLD_MOVED_ALT);
Stefan Beller86b452e2017-06-30 13:53:09 -07001436 break;
1437 case DIFF_SYMBOL_MOVED_LINE |
1438 DIFF_SYMBOL_MOVED_LINE_UNINTERESTING:
1439 set = diff_get_color_opt(o, DIFF_FILE_OLD_MOVED_DIM);
1440 break;
1441 case DIFF_SYMBOL_MOVED_LINE:
Stefan Beller2e2d5ac2017-06-30 13:53:07 -07001442 set = diff_get_color_opt(o, DIFF_FILE_OLD_MOVED);
Stefan Beller86b452e2017-06-30 13:53:09 -07001443 break;
1444 default:
Stefan Beller2e2d5ac2017-06-30 13:53:07 -07001445 set = diff_get_color_opt(o, DIFF_FILE_OLD);
Stefan Beller86b452e2017-06-30 13:53:09 -07001446 }
Stefan Beller091f8e22017-06-29 17:06:53 -07001447 reset = diff_get_color_opt(o, DIFF_RESET);
Johannes Schindelinf7c3b4e2018-08-13 04:33:20 -07001448 if (!o->flags.dual_color_diffed_diffs)
1449 set_sign = NULL;
1450 else {
1451 char c = !len ? 0 : line[0];
1452
1453 set_sign = set;
1454 if (c == '+')
Johannes Schindelina7be92a2018-08-13 04:33:32 -07001455 set = diff_get_color_opt(o, DIFF_FILE_NEW_DIM);
Johannes Schindelinf7c3b4e2018-08-13 04:33:20 -07001456 else if (c == '@')
1457 set = diff_get_color_opt(o, DIFF_FRAGINFO);
Johannes Schindelina7be92a2018-08-13 04:33:32 -07001458 else if (c == '-')
1459 set = diff_get_color_opt(o, DIFF_FILE_OLD_DIM);
1460 else
1461 set = diff_get_color_opt(o, DIFF_CONTEXT_DIM);
Johannes Schindelinf7c3b4e2018-08-13 04:33:20 -07001462 }
Stefan Beller7648b792018-08-17 13:43:52 -07001463 emit_line_ws_markup(o, set_sign, set, reset,
Stefan Bellerbc9feb02018-10-10 16:24:59 -07001464 OUTPUT_INDICATOR_OLD, line, len,
Stefan Beller091f8e22017-06-29 17:06:53 -07001465 flags & DIFF_SYMBOL_CONTENT_WS_MASK, 0);
1466 break;
Stefan Bellerff958672017-06-29 17:06:54 -07001467 case DIFF_SYMBOL_WORDS_PORCELAIN:
1468 context = diff_get_color_opt(o, DIFF_CONTEXT);
1469 reset = diff_get_color_opt(o, DIFF_RESET);
1470 emit_line(o, context, reset, line, len);
1471 fputs("~\n", o->file);
1472 break;
1473 case DIFF_SYMBOL_WORDS:
1474 context = diff_get_color_opt(o, DIFF_CONTEXT);
1475 reset = diff_get_color_opt(o, DIFF_RESET);
1476 /*
1477 * Skip the prefix character, if any. With
1478 * diff_suppress_blank_empty, there may be
1479 * none.
1480 */
1481 if (line[0] != '\n') {
1482 line++;
1483 len--;
1484 }
1485 emit_line(o, context, reset, line, len);
1486 break;
Stefan Beller3ee8b7b2017-06-29 17:06:56 -07001487 case DIFF_SYMBOL_FILEPAIR_PLUS:
1488 meta = diff_get_color_opt(o, DIFF_METAINFO);
1489 reset = diff_get_color_opt(o, DIFF_RESET);
1490 fprintf(o->file, "%s%s+++ %s%s%s\n", diff_line_prefix(o), meta,
1491 line, reset,
1492 strchr(line, ' ') ? "\t" : "");
1493 break;
1494 case DIFF_SYMBOL_FILEPAIR_MINUS:
1495 meta = diff_get_color_opt(o, DIFF_METAINFO);
1496 reset = diff_get_color_opt(o, DIFF_RESET);
1497 fprintf(o->file, "%s%s--- %s%s%s\n", diff_line_prefix(o), meta,
1498 line, reset,
1499 strchr(line, ' ') ? "\t" : "");
1500 break;
Stefan Beller4acaaa72017-06-29 17:06:58 -07001501 case DIFF_SYMBOL_BINARY_FILES:
Stefan Bellera29b0a12017-06-29 17:06:57 -07001502 case DIFF_SYMBOL_HEADER:
1503 fprintf(o->file, "%s", line);
1504 break;
Stefan Beller4eed0eb2017-06-29 17:07:01 -07001505 case DIFF_SYMBOL_BINARY_DIFF_HEADER:
1506 fprintf(o->file, "%sGIT binary patch\n", diff_line_prefix(o));
1507 break;
1508 case DIFF_SYMBOL_BINARY_DIFF_HEADER_DELTA:
1509 fprintf(o->file, "%sdelta %s\n", diff_line_prefix(o), line);
1510 break;
1511 case DIFF_SYMBOL_BINARY_DIFF_HEADER_LITERAL:
1512 fprintf(o->file, "%sliteral %s\n", diff_line_prefix(o), line);
1513 break;
1514 case DIFF_SYMBOL_BINARY_DIFF_FOOTER:
1515 fputs(diff_line_prefix(o), o->file);
1516 fputc('\n', o->file);
1517 break;
Stefan Beller5af6ea92017-06-29 17:06:59 -07001518 case DIFF_SYMBOL_REWRITE_DIFF:
1519 fraginfo = diff_get_color(o->use_color, DIFF_FRAGINFO);
1520 reset = diff_get_color_opt(o, DIFF_RESET);
1521 emit_line(o, fraginfo, reset, line, len);
1522 break;
Stefan Bellerf3597132017-06-29 17:07:00 -07001523 case DIFF_SYMBOL_SUBMODULE_ADD:
1524 set = diff_get_color_opt(o, DIFF_FILE_NEW);
1525 reset = diff_get_color_opt(o, DIFF_RESET);
1526 emit_line(o, set, reset, line, len);
1527 break;
1528 case DIFF_SYMBOL_SUBMODULE_DEL:
1529 set = diff_get_color_opt(o, DIFF_FILE_OLD);
1530 reset = diff_get_color_opt(o, DIFF_RESET);
1531 emit_line(o, set, reset, line, len);
1532 break;
1533 case DIFF_SYMBOL_SUBMODULE_UNTRACKED:
1534 fprintf(o->file, "%sSubmodule %s contains untracked content\n",
1535 diff_line_prefix(o), line);
1536 break;
1537 case DIFF_SYMBOL_SUBMODULE_MODIFIED:
1538 fprintf(o->file, "%sSubmodule %s contains modified content\n",
1539 diff_line_prefix(o), line);
1540 break;
Stefan Beller0911c472017-06-29 17:07:02 -07001541 case DIFF_SYMBOL_STATS_SUMMARY_NO_FILES:
1542 emit_line(o, "", "", " 0 files changed\n",
1543 strlen(" 0 files changed\n"));
1544 break;
1545 case DIFF_SYMBOL_STATS_SUMMARY_ABBREV:
1546 emit_line(o, "", "", " ...\n", strlen(" ...\n"));
1547 break;
Stefan Bellerbd033292017-06-29 17:07:03 -07001548 case DIFF_SYMBOL_WORD_DIFF:
1549 fprintf(o->file, "%.*s", len, line);
1550 break;
Stefan Beller30b7e1e2017-06-29 17:07:04 -07001551 case DIFF_SYMBOL_STAT_SEP:
1552 fputs(o->stat_sep, o->file);
1553 break;
Stefan Beller36a4cef2017-06-29 17:06:49 -07001554 default:
Johannes Schindelin033abf92018-05-02 11:38:39 +02001555 BUG("unknown diff symbol");
Stefan Beller36a4cef2017-06-29 17:06:49 -07001556 }
Stefan Beller0911c472017-06-29 17:07:02 -07001557 strbuf_release(&sb);
Stefan Beller36a4cef2017-06-29 17:06:49 -07001558}
1559
Stefan Bellere6e045f2017-06-29 17:07:06 -07001560static void emit_diff_symbol(struct diff_options *o, enum diff_symbol s,
1561 const char *line, int len, unsigned flags)
1562{
Phillip Wood21536d02018-11-23 11:16:57 +00001563 struct emitted_diff_symbol e = {line, len, flags, 0, 0, s};
Stefan Bellere6e045f2017-06-29 17:07:06 -07001564
1565 if (o->emitted_symbols)
1566 append_emitted_diff_symbol(o, &e);
1567 else
1568 emit_diff_symbol_from_struct(o, &e);
1569}
1570
Stefan Bellerf3597132017-06-29 17:07:00 -07001571void diff_emit_submodule_del(struct diff_options *o, const char *line)
1572{
1573 emit_diff_symbol(o, DIFF_SYMBOL_SUBMODULE_DEL, line, strlen(line), 0);
1574}
1575
1576void diff_emit_submodule_add(struct diff_options *o, const char *line)
1577{
1578 emit_diff_symbol(o, DIFF_SYMBOL_SUBMODULE_ADD, line, strlen(line), 0);
1579}
1580
1581void diff_emit_submodule_untracked(struct diff_options *o, const char *path)
1582{
1583 emit_diff_symbol(o, DIFF_SYMBOL_SUBMODULE_UNTRACKED,
1584 path, strlen(path), 0);
1585}
1586
1587void diff_emit_submodule_modified(struct diff_options *o, const char *path)
1588{
1589 emit_diff_symbol(o, DIFF_SYMBOL_SUBMODULE_MODIFIED,
1590 path, strlen(path), 0);
1591}
1592
1593void diff_emit_submodule_header(struct diff_options *o, const char *header)
1594{
1595 emit_diff_symbol(o, DIFF_SYMBOL_SUBMODULE_HEADER,
1596 header, strlen(header), 0);
1597}
1598
1599void diff_emit_submodule_error(struct diff_options *o, const char *err)
1600{
1601 emit_diff_symbol(o, DIFF_SYMBOL_SUBMODULE_ERROR, err, strlen(err), 0);
1602}
1603
1604void diff_emit_submodule_pipethrough(struct diff_options *o,
1605 const char *line, int len)
1606{
1607 emit_diff_symbol(o, DIFF_SYMBOL_SUBMODULE_PIPETHROUGH, line, len, 0);
1608}
1609
Junio C Hamano6957eb92009-09-14 18:44:01 -07001610static int new_blank_line_at_eof(struct emit_callback *ecbdata, const char *line, int len)
1611{
1612 if (!((ecbdata->ws_rule & WS_BLANK_AT_EOF) &&
1613 ecbdata->blank_at_eof_in_preimage &&
1614 ecbdata->blank_at_eof_in_postimage &&
1615 ecbdata->blank_at_eof_in_preimage <= ecbdata->lno_in_preimage &&
1616 ecbdata->blank_at_eof_in_postimage <= ecbdata->lno_in_postimage))
1617 return 0;
Junio C Hamano018cff72009-09-14 18:44:01 -07001618 return ws_blank_line(line, len, ecbdata->ws_rule);
Junio C Hamano6957eb92009-09-14 18:44:01 -07001619}
1620
Jeff Kinge04df612019-02-14 00:48:13 -05001621static void emit_add_line(struct emit_callback *ecbdata,
Junio C Hamano018cff72009-09-14 18:44:01 -07001622 const char *line, int len)
Junio C Hamano6957eb92009-09-14 18:44:01 -07001623{
Stefan Beller091f8e22017-06-29 17:06:53 -07001624 unsigned flags = WSEH_NEW | ecbdata->ws_rule;
1625 if (new_blank_line_at_eof(ecbdata, line, len))
1626 flags |= DIFF_SYMBOL_CONTENT_BLANK_LINE_EOF;
1627
1628 emit_diff_symbol(ecbdata->opt, DIFF_SYMBOL_PLUS, line, len, flags);
Junio C Hamano6957eb92009-09-14 18:44:01 -07001629}
Junio C Hamano6957eb92009-09-14 18:44:01 -07001630
Jeff Kinge04df612019-02-14 00:48:13 -05001631static void emit_del_line(struct emit_callback *ecbdata,
Junio C Hamano0e383e12015-05-26 09:56:33 -07001632 const char *line, int len)
1633{
Stefan Beller091f8e22017-06-29 17:06:53 -07001634 unsigned flags = WSEH_OLD | ecbdata->ws_rule;
1635 emit_diff_symbol(ecbdata->opt, DIFF_SYMBOL_MINUS, line, len, flags);
Junio C Hamano0e383e12015-05-26 09:56:33 -07001636}
1637
Jeff Kinge04df612019-02-14 00:48:13 -05001638static void emit_context_line(struct emit_callback *ecbdata,
Junio C Hamano0e383e12015-05-26 09:56:33 -07001639 const char *line, int len)
1640{
Stefan Beller091f8e22017-06-29 17:06:53 -07001641 unsigned flags = WSEH_CONTEXT | ecbdata->ws_rule;
1642 emit_diff_symbol(ecbdata->opt, DIFF_SYMBOL_CONTEXT, line, len, flags);
Junio C Hamano6957eb92009-09-14 18:44:01 -07001643}
1644
Bert Wesarg89cb73a2009-11-27 07:55:18 +01001645static void emit_hunk_header(struct emit_callback *ecbdata,
1646 const char *line, int len)
1647{
Jeff King8dbf3eb2015-05-27 16:48:46 -04001648 const char *context = diff_get_color(ecbdata->color_diff, DIFF_CONTEXT);
Bert Wesarg89cb73a2009-11-27 07:55:18 +01001649 const char *frag = diff_get_color(ecbdata->color_diff, DIFF_FRAGINFO);
1650 const char *func = diff_get_color(ecbdata->color_diff, DIFF_FUNCINFO);
1651 const char *reset = diff_get_color(ecbdata->color_diff, DIFF_RESET);
Johannes Schindelinf7c3b4e2018-08-13 04:33:20 -07001652 const char *reverse = ecbdata->color_diff ? GIT_COLOR_REVERSE : "";
Bert Wesarg89cb73a2009-11-27 07:55:18 +01001653 static const char atat[2] = { '@', '@' };
1654 const char *cp, *ep;
Bo Yang2efcc972010-05-29 23:32:05 +08001655 struct strbuf msgbuf = STRBUF_INIT;
1656 int org_len = len;
1657 int i = 1;
Bert Wesarg89cb73a2009-11-27 07:55:18 +01001658
1659 /*
1660 * As a hunk header must begin with "@@ -<old>, +<new> @@",
1661 * it always is at least 10 bytes long.
1662 */
1663 if (len < 10 ||
1664 memcmp(line, atat, 2) ||
1665 !(ep = memmem(line + 2, len - 2, atat, 2))) {
Stefan Bellerc64b4202017-06-29 17:06:50 -07001666 emit_diff_symbol(ecbdata->opt,
Stefan Beller091f8e22017-06-29 17:06:53 -07001667 DIFF_SYMBOL_CONTEXT_MARKER, line, len, 0);
Bert Wesarg89cb73a2009-11-27 07:55:18 +01001668 return;
1669 }
1670 ep += 2; /* skip over @@ */
1671
1672 /* The hunk header in fraginfo color */
Johannes Schindelinf7c3b4e2018-08-13 04:33:20 -07001673 if (ecbdata->opt->flags.dual_color_diffed_diffs)
1674 strbuf_addstr(&msgbuf, reverse);
René Scharfecedc61a2014-07-17 01:38:18 +02001675 strbuf_addstr(&msgbuf, frag);
Bo Yang2efcc972010-05-29 23:32:05 +08001676 strbuf_add(&msgbuf, line, ep - line);
René Scharfecedc61a2014-07-17 01:38:18 +02001677 strbuf_addstr(&msgbuf, reset);
Bo Yang2efcc972010-05-29 23:32:05 +08001678
1679 /*
1680 * trailing "\r\n"
1681 */
1682 for ( ; i < 3; i++)
1683 if (line[len - i] == '\r' || line[len - i] == '\n')
1684 len--;
Bert Wesarg89cb73a2009-11-27 07:55:18 +01001685
1686 /* blank before the func header */
1687 for (cp = ep; ep - line < len; ep++)
1688 if (*ep != ' ' && *ep != '\t')
1689 break;
Bo Yang2efcc972010-05-29 23:32:05 +08001690 if (ep != cp) {
Jeff King8dbf3eb2015-05-27 16:48:46 -04001691 strbuf_addstr(&msgbuf, context);
Bo Yang2efcc972010-05-29 23:32:05 +08001692 strbuf_add(&msgbuf, cp, ep - cp);
René Scharfecedc61a2014-07-17 01:38:18 +02001693 strbuf_addstr(&msgbuf, reset);
Bo Yang2efcc972010-05-29 23:32:05 +08001694 }
Bert Wesarg89cb73a2009-11-27 07:55:18 +01001695
Bo Yang2efcc972010-05-29 23:32:05 +08001696 if (ep < line + len) {
René Scharfecedc61a2014-07-17 01:38:18 +02001697 strbuf_addstr(&msgbuf, func);
Bo Yang2efcc972010-05-29 23:32:05 +08001698 strbuf_add(&msgbuf, ep, line + len - ep);
René Scharfecedc61a2014-07-17 01:38:18 +02001699 strbuf_addstr(&msgbuf, reset);
Bo Yang2efcc972010-05-29 23:32:05 +08001700 }
1701
1702 strbuf_add(&msgbuf, line + len, org_len - len);
Stefan Bellerdfb77282017-06-29 17:06:47 -07001703 strbuf_complete_line(&msgbuf);
Stefan Beller68abc6f2017-06-29 17:06:51 -07001704 emit_diff_symbol(ecbdata->opt,
Stefan Beller091f8e22017-06-29 17:06:53 -07001705 DIFF_SYMBOL_CONTEXT_FRAGINFO, msgbuf.buf, msgbuf.len, 0);
Bo Yang2efcc972010-05-29 23:32:05 +08001706 strbuf_release(&msgbuf);
Bert Wesarg89cb73a2009-11-27 07:55:18 +01001707}
1708
Nguyễn Thái Ngọc Duy3b335762018-12-09 11:25:21 +01001709static struct diff_tempfile *claim_diff_tempfile(void)
1710{
Jeff King479b0ae2009-01-22 00:59:56 -05001711 int i;
1712 for (i = 0; i < ARRAY_SIZE(diff_temp); i++)
1713 if (!diff_temp[i].name)
1714 return diff_temp + i;
Johannes Schindelin033abf92018-05-02 11:38:39 +02001715 BUG("diff is failing to clean up its tempfiles");
Jeff King479b0ae2009-01-22 00:59:56 -05001716}
1717
Jeff King479b0ae2009-01-22 00:59:56 -05001718static void remove_tempfile(void)
1719{
1720 int i;
Nazri Ramliya8344ab2009-02-12 21:36:14 +08001721 for (i = 0; i < ARRAY_SIZE(diff_temp); i++) {
Jeff King076aa2c2017-09-05 08:15:08 -04001722 if (is_tempfile_active(diff_temp[i].tempfile))
Michael Haggerty284098f2015-08-12 19:12:01 +02001723 delete_tempfile(&diff_temp[i].tempfile);
Nazri Ramliya8344ab2009-02-12 21:36:14 +08001724 diff_temp[i].name = NULL;
1725 }
Jeff King479b0ae2009-01-22 00:59:56 -05001726}
1727
Stefan Beller5af6ea92017-06-29 17:06:59 -07001728static void add_line_count(struct strbuf *out, int count)
Junio C Hamano6973dca2006-04-21 23:57:45 -07001729{
1730 switch (count) {
1731 case 0:
Stefan Beller5af6ea92017-06-29 17:06:59 -07001732 strbuf_addstr(out, "0,0");
Junio C Hamano6973dca2006-04-21 23:57:45 -07001733 break;
1734 case 1:
Stefan Beller5af6ea92017-06-29 17:06:59 -07001735 strbuf_addstr(out, "1");
Junio C Hamano6973dca2006-04-21 23:57:45 -07001736 break;
1737 default:
Stefan Beller5af6ea92017-06-29 17:06:59 -07001738 strbuf_addf(out, "1,%d", count);
Junio C Hamano6973dca2006-04-21 23:57:45 -07001739 break;
1740 }
1741}
1742
Junio C Hamano7f7ee2f2009-09-14 18:44:01 -07001743static void emit_rewrite_lines(struct emit_callback *ecb,
1744 int prefix, const char *data, int size)
Junio C Hamano6973dca2006-04-21 23:57:45 -07001745{
Junio C Hamano7f7ee2f2009-09-14 18:44:01 -07001746 const char *endp = NULL;
Junio C Hamano7f7ee2f2009-09-14 18:44:01 -07001747
1748 while (0 < size) {
1749 int len;
1750
1751 endp = memchr(data, '\n', size);
1752 len = endp ? (endp - data + 1) : size;
1753 if (prefix != '+') {
1754 ecb->lno_in_preimage++;
Jeff Kinge04df612019-02-14 00:48:13 -05001755 emit_del_line(ecb, data, len);
Junio C Hamano7f7ee2f2009-09-14 18:44:01 -07001756 } else {
1757 ecb->lno_in_postimage++;
Jeff Kinge04df612019-02-14 00:48:13 -05001758 emit_add_line(ecb, data, len);
Johannes Schindelin13e36ec2007-02-20 15:08:46 +01001759 }
Junio C Hamano7f7ee2f2009-09-14 18:44:01 -07001760 size -= len;
1761 data += len;
Junio C Hamano6973dca2006-04-21 23:57:45 -07001762 }
Stefan Bellerb9cbfde2017-06-29 17:06:52 -07001763 if (!endp)
Stefan Beller091f8e22017-06-29 17:06:53 -07001764 emit_diff_symbol(ecb->opt, DIFF_SYMBOL_NO_LF_EOF, NULL, 0, 0);
Junio C Hamano6973dca2006-04-21 23:57:45 -07001765}
1766
1767static void emit_rewrite_diff(const char *name_a,
1768 const char *name_b,
1769 struct diff_filespec *one,
Johannes Schindelin13e36ec2007-02-20 15:08:46 +01001770 struct diff_filespec *two,
Jeff Kingd9bae1a2010-04-01 20:12:15 -04001771 struct userdiff_driver *textconv_one,
1772 struct userdiff_driver *textconv_two,
Johannes Schindelineab9a402007-12-18 19:32:14 +00001773 struct diff_options *o)
Junio C Hamano6973dca2006-04-21 23:57:45 -07001774{
1775 int lc_a, lc_b;
Junio C Hamanod5625092007-12-26 17:13:36 -08001776 static struct strbuf a_name = STRBUF_INIT, b_name = STRBUF_INIT;
Junio C Hamanoa5a818e2008-08-18 20:08:09 -07001777 const char *a_prefix, *b_prefix;
Jeff King840383b2010-04-01 20:09:26 -04001778 char *data_one, *data_two;
Jeff King3aa1f7c2008-12-09 03:13:21 -05001779 size_t size_one, size_two;
Junio C Hamano7f7ee2f2009-09-14 18:44:01 -07001780 struct emit_callback ecbdata;
Stefan Beller5af6ea92017-06-29 17:06:59 -07001781 struct strbuf out = STRBUF_INIT;
Junio C Hamanoa5a818e2008-08-18 20:08:09 -07001782
Brandon Williams0d1e0e72017-10-31 11:19:11 -07001783 if (diff_mnemonic_prefix && o->flags.reverse_diff) {
Junio C Hamanoa5a818e2008-08-18 20:08:09 -07001784 a_prefix = o->b_prefix;
1785 b_prefix = o->a_prefix;
1786 } else {
1787 a_prefix = o->a_prefix;
1788 b_prefix = o->b_prefix;
1789 }
Junio C Hamano1a9eb3b2006-09-22 16:17:58 -07001790
Junio C Hamano8a13bec2007-02-24 01:42:06 -08001791 name_a += (*name_a == '/');
1792 name_b += (*name_b == '/');
Junio C Hamano1a9eb3b2006-09-22 16:17:58 -07001793
Junio C Hamanod5625092007-12-26 17:13:36 -08001794 strbuf_reset(&a_name);
1795 strbuf_reset(&b_name);
Junio C Hamanoa5a818e2008-08-18 20:08:09 -07001796 quote_two_c_style(&a_name, a_prefix, name_a, 0);
1797 quote_two_c_style(&b_name, b_prefix, name_b, 0);
Junio C Hamanod5625092007-12-26 17:13:36 -08001798
Nguyễn Thái Ngọc Duy6afaf802018-09-21 17:57:22 +02001799 size_one = fill_textconv(o->repo, textconv_one, one, &data_one);
1800 size_two = fill_textconv(o->repo, textconv_two, two, &data_two);
Jeff King3aa1f7c2008-12-09 03:13:21 -05001801
Junio C Hamanod91ba8f2009-09-15 11:21:10 -07001802 memset(&ecbdata, 0, sizeof(ecbdata));
Jeff Kingdaa0c3d2011-08-17 22:04:23 -07001803 ecbdata.color_diff = want_color(o->use_color);
Nguyễn Thái Ngọc Duy26d024e2018-09-21 17:57:37 +02001804 ecbdata.ws_rule = whitespace_rule(o->repo->index, name_b);
Bo Yanga3c158d2010-05-26 15:08:02 +08001805 ecbdata.opt = o;
Junio C Hamanod91ba8f2009-09-15 11:21:10 -07001806 if (ecbdata.ws_rule & WS_BLANK_AT_EOF) {
1807 mmfile_t mf1, mf2;
1808 mf1.ptr = (char *)data_one;
1809 mf2.ptr = (char *)data_two;
1810 mf1.size = size_one;
1811 mf2.size = size_two;
1812 check_blank_at_eof(&mf1, &mf2, &ecbdata);
1813 }
1814 ecbdata.lno_in_preimage = 1;
1815 ecbdata.lno_in_postimage = 1;
1816
Jeff King3aa1f7c2008-12-09 03:13:21 -05001817 lc_a = count_lines(data_one, size_one);
1818 lc_b = count_lines(data_two, size_two);
Stefan Beller3ee8b7b2017-06-29 17:06:56 -07001819
1820 emit_diff_symbol(o, DIFF_SYMBOL_FILEPAIR_MINUS,
1821 a_name.buf, a_name.len, 0);
1822 emit_diff_symbol(o, DIFF_SYMBOL_FILEPAIR_PLUS,
1823 b_name.buf, b_name.len, 0);
1824
Stefan Beller5af6ea92017-06-29 17:06:59 -07001825 strbuf_addstr(&out, "@@ -");
Junio C Hamano467ddc12011-02-28 16:11:55 -08001826 if (!o->irreversible_delete)
Stefan Beller5af6ea92017-06-29 17:06:59 -07001827 add_line_count(&out, lc_a);
Junio C Hamano467ddc12011-02-28 16:11:55 -08001828 else
Stefan Beller5af6ea92017-06-29 17:06:59 -07001829 strbuf_addstr(&out, "?,?");
1830 strbuf_addstr(&out, " +");
1831 add_line_count(&out, lc_b);
1832 strbuf_addstr(&out, " @@\n");
1833 emit_diff_symbol(o, DIFF_SYMBOL_REWRITE_DIFF, out.buf, out.len, 0);
1834 strbuf_release(&out);
1835
Junio C Hamano467ddc12011-02-28 16:11:55 -08001836 if (lc_a && !o->irreversible_delete)
Junio C Hamanod91ba8f2009-09-15 11:21:10 -07001837 emit_rewrite_lines(&ecbdata, '-', data_one, size_one);
Junio C Hamano6973dca2006-04-21 23:57:45 -07001838 if (lc_b)
Junio C Hamanod91ba8f2009-09-15 11:21:10 -07001839 emit_rewrite_lines(&ecbdata, '+', data_two, size_two);
Jeff Kingb76c0562010-04-01 20:04:14 -04001840 if (textconv_one)
Junio C Hamanoaed6ca52010-04-08 23:30:49 -07001841 free((char *)data_one);
Jeff Kingb76c0562010-04-01 20:04:14 -04001842 if (textconv_two)
Junio C Hamanoaed6ca52010-04-08 23:30:49 -07001843 free((char *)data_two);
Junio C Hamano6973dca2006-04-21 23:57:45 -07001844}
1845
Johannes Schindelinf59a59e2006-07-28 23:56:15 +02001846struct diff_words_buffer {
1847 mmfile_t text;
Ramsay Jones071bcaa2017-09-21 17:49:38 +01001848 unsigned long alloc;
Johannes Schindelin2e5d2002009-01-17 17:29:44 +01001849 struct diff_words_orig {
1850 const char *begin, *end;
1851 } *orig;
1852 int orig_nr, orig_alloc;
Johannes Schindelinf59a59e2006-07-28 23:56:15 +02001853};
1854
1855static void diff_words_append(char *line, unsigned long len,
1856 struct diff_words_buffer *buffer)
1857{
Johannes Schindelin23c15752009-01-17 17:29:43 +01001858 ALLOC_GROW(buffer->text.ptr, buffer->text.size + len, buffer->alloc);
Johannes Schindelinf59a59e2006-07-28 23:56:15 +02001859 line++;
1860 len--;
1861 memcpy(buffer->text.ptr + buffer->text.size, line, len);
1862 buffer->text.size += len;
Johannes Schindelin2b6a5412009-01-17 17:29:45 +01001863 buffer->text.ptr[buffer->text.size] = '\0';
Johannes Schindelinf59a59e2006-07-28 23:56:15 +02001864}
1865
Jonathan Nieder9cba13c2011-03-16 02:08:34 -05001866struct diff_words_style_elem {
Thomas Rast882749a2010-04-14 17:59:06 +02001867 const char *prefix;
1868 const char *suffix;
1869 const char *color; /* NULL; filled in by the setup code if
1870 * color is enabled */
1871};
1872
Jonathan Nieder9cba13c2011-03-16 02:08:34 -05001873struct diff_words_style {
Thomas Rast882749a2010-04-14 17:59:06 +02001874 enum diff_words_type type;
Brandon Williams63a01c32018-02-14 10:59:39 -08001875 struct diff_words_style_elem new_word, old_word, ctx;
Thomas Rast882749a2010-04-14 17:59:06 +02001876 const char *newline;
1877};
1878
Stephen Boydc2e86ad2011-03-22 00:51:05 -07001879static struct diff_words_style diff_words_styles[] = {
Thomas Rast882749a2010-04-14 17:59:06 +02001880 { DIFF_WORDS_PORCELAIN, {"+", "\n"}, {"-", "\n"}, {" ", "\n"}, "~\n" },
1881 { DIFF_WORDS_PLAIN, {"{+", "+}"}, {"[-", "-]"}, {"", ""}, "\n" },
1882 { DIFF_WORDS_COLOR, {"", ""}, {"", ""}, {"", ""}, "\n" }
1883};
1884
Johannes Schindelinf59a59e2006-07-28 23:56:15 +02001885struct diff_words_data {
Johannes Schindelinf59a59e2006-07-28 23:56:15 +02001886 struct diff_words_buffer minus, plus;
Johannes Schindelin2e5d2002009-01-17 17:29:44 +01001887 const char *current_plus;
Bo Yang4297c0a2010-05-29 23:32:06 +08001888 int last_minus;
1889 struct diff_options *opt;
Johannes Schindelin2b6a5412009-01-17 17:29:45 +01001890 regex_t *word_regex;
Thomas Rast882749a2010-04-14 17:59:06 +02001891 enum diff_words_type type;
1892 struct diff_words_style *style;
Johannes Schindelinf59a59e2006-07-28 23:56:15 +02001893};
1894
Stefan Bellerbd033292017-06-29 17:07:03 -07001895static int fn_out_diff_words_write_helper(struct diff_options *o,
Thomas Rast882749a2010-04-14 17:59:06 +02001896 struct diff_words_style_elem *st_el,
1897 const char *newline,
Stefan Bellerbd033292017-06-29 17:07:03 -07001898 size_t count, const char *buf)
Thomas Rast882749a2010-04-14 17:59:06 +02001899{
Bo Yang4297c0a2010-05-29 23:32:06 +08001900 int print = 0;
Stefan Bellerbd033292017-06-29 17:07:03 -07001901 struct strbuf sb = STRBUF_INIT;
Bo Yang4297c0a2010-05-29 23:32:06 +08001902
Thomas Rast882749a2010-04-14 17:59:06 +02001903 while (count) {
1904 char *p = memchr(buf, '\n', count);
Bo Yang4297c0a2010-05-29 23:32:06 +08001905 if (print)
Stefan Bellerbd033292017-06-29 17:07:03 -07001906 strbuf_addstr(&sb, diff_line_prefix(o));
1907
Thomas Rast882749a2010-04-14 17:59:06 +02001908 if (p != buf) {
Stefan Bellerbd033292017-06-29 17:07:03 -07001909 const char *reset = st_el->color && *st_el->color ?
1910 GIT_COLOR_RESET : NULL;
1911 if (st_el->color && *st_el->color)
1912 strbuf_addstr(&sb, st_el->color);
1913 strbuf_addstr(&sb, st_el->prefix);
1914 strbuf_add(&sb, buf, p ? p - buf : count);
1915 strbuf_addstr(&sb, st_el->suffix);
1916 if (reset)
1917 strbuf_addstr(&sb, reset);
Thomas Rast882749a2010-04-14 17:59:06 +02001918 }
1919 if (!p)
Stefan Bellerbd033292017-06-29 17:07:03 -07001920 goto out;
1921
1922 strbuf_addstr(&sb, newline);
Thomas Rast882749a2010-04-14 17:59:06 +02001923 count -= p + 1 - buf;
1924 buf = p + 1;
Bo Yang4297c0a2010-05-29 23:32:06 +08001925 print = 1;
Stefan Bellerbd033292017-06-29 17:07:03 -07001926 if (count) {
1927 emit_diff_symbol(o, DIFF_SYMBOL_WORD_DIFF,
1928 sb.buf, sb.len, 0);
1929 strbuf_reset(&sb);
1930 }
Thomas Rast882749a2010-04-14 17:59:06 +02001931 }
Stefan Bellerbd033292017-06-29 17:07:03 -07001932
1933out:
1934 if (sb.len)
1935 emit_diff_symbol(o, DIFF_SYMBOL_WORD_DIFF,
1936 sb.buf, sb.len, 0);
1937 strbuf_release(&sb);
Thomas Rast882749a2010-04-14 17:59:06 +02001938 return 0;
1939}
1940
Bo Yang4297c0a2010-05-29 23:32:06 +08001941/*
1942 * '--color-words' algorithm can be described as:
1943 *
René Genz56217602017-04-30 17:48:27 +02001944 * 1. collect the minus/plus lines of a diff hunk, divided into
Bo Yang4297c0a2010-05-29 23:32:06 +08001945 * minus-lines and plus-lines;
1946 *
1947 * 2. break both minus-lines and plus-lines into words and
1948 * place them into two mmfile_t with one word for each line;
1949 *
1950 * 3. use xdiff to run diff on the two mmfile_t to get the words level diff;
1951 *
1952 * And for the common parts of the both file, we output the plus side text.
1953 * diff_words->current_plus is used to trace the current position of the plus file
1954 * which printed. diff_words->last_minus is used to trace the last minus word
1955 * printed.
1956 *
1957 * For '--graph' to work with '--color-words', we need to output the graph prefix
1958 * on each line of color words output. Generally, there are two conditions on
1959 * which we should output the prefix.
1960 *
1961 * 1. diff_words->last_minus == 0 &&
1962 * diff_words->current_plus == diff_words->plus.text.ptr
1963 *
1964 * that is: the plus text must start as a new line, and if there is no minus
1965 * word printed, a graph prefix must be printed.
1966 *
1967 * 2. diff_words->current_plus > diff_words->plus.text.ptr &&
1968 * *(diff_words->current_plus - 1) == '\n'
1969 *
1970 * that is: a graph prefix must be printed following a '\n'
1971 */
1972static int color_words_output_graph_prefix(struct diff_words_data *diff_words)
1973{
1974 if ((diff_words->last_minus == 0 &&
1975 diff_words->current_plus == diff_words->plus.text.ptr) ||
1976 (diff_words->current_plus > diff_words->plus.text.ptr &&
1977 *(diff_words->current_plus - 1) == '\n')) {
1978 return 1;
1979 } else {
1980 return 0;
1981 }
1982}
1983
Jeff King7c61e252018-11-02 02:37:18 -04001984static void fn_out_diff_words_aux(void *priv,
1985 long minus_first, long minus_len,
1986 long plus_first, long plus_len,
1987 const char *func, long funclen)
Johannes Schindelinf59a59e2006-07-28 23:56:15 +02001988{
1989 struct diff_words_data *diff_words = priv;
Thomas Rast882749a2010-04-14 17:59:06 +02001990 struct diff_words_style *style = diff_words->style;
Johannes Schindelin2e5d2002009-01-17 17:29:44 +01001991 const char *minus_begin, *minus_end, *plus_begin, *plus_end;
Bo Yang4297c0a2010-05-29 23:32:06 +08001992 struct diff_options *opt = diff_words->opt;
John Keeping30997bb2013-02-07 20:15:27 +00001993 const char *line_prefix;
Johannes Schindelinf59a59e2006-07-28 23:56:15 +02001994
Bo Yang4297c0a2010-05-29 23:32:06 +08001995 assert(opt);
John Keeping30997bb2013-02-07 20:15:27 +00001996 line_prefix = diff_line_prefix(opt);
Bo Yang4297c0a2010-05-29 23:32:06 +08001997
Johannes Schindelin2e5d2002009-01-17 17:29:44 +01001998 /* POSIX requires that first be decremented by one if len == 0... */
1999 if (minus_len) {
2000 minus_begin = diff_words->minus.orig[minus_first].begin;
2001 minus_end =
2002 diff_words->minus.orig[minus_first + minus_len - 1].end;
2003 } else
2004 minus_begin = minus_end =
2005 diff_words->minus.orig[minus_first].end;
2006
2007 if (plus_len) {
2008 plus_begin = diff_words->plus.orig[plus_first].begin;
2009 plus_end = diff_words->plus.orig[plus_first + plus_len - 1].end;
2010 } else
2011 plus_begin = plus_end = diff_words->plus.orig[plus_first].end;
2012
Bo Yang4297c0a2010-05-29 23:32:06 +08002013 if (color_words_output_graph_prefix(diff_words)) {
2014 fputs(line_prefix, diff_words->opt->file);
2015 }
2016 if (diff_words->current_plus != plus_begin) {
Stefan Bellerbd033292017-06-29 17:07:03 -07002017 fn_out_diff_words_write_helper(diff_words->opt,
Thomas Rast882749a2010-04-14 17:59:06 +02002018 &style->ctx, style->newline,
2019 plus_begin - diff_words->current_plus,
Stefan Bellerbd033292017-06-29 17:07:03 -07002020 diff_words->current_plus);
Bo Yang4297c0a2010-05-29 23:32:06 +08002021 }
2022 if (minus_begin != minus_end) {
Stefan Bellerbd033292017-06-29 17:07:03 -07002023 fn_out_diff_words_write_helper(diff_words->opt,
Brandon Williams63a01c32018-02-14 10:59:39 -08002024 &style->old_word, style->newline,
Stefan Bellerbd033292017-06-29 17:07:03 -07002025 minus_end - minus_begin, minus_begin);
Bo Yang4297c0a2010-05-29 23:32:06 +08002026 }
2027 if (plus_begin != plus_end) {
Stefan Bellerbd033292017-06-29 17:07:03 -07002028 fn_out_diff_words_write_helper(diff_words->opt,
Brandon Williams63a01c32018-02-14 10:59:39 -08002029 &style->new_word, style->newline,
Stefan Bellerbd033292017-06-29 17:07:03 -07002030 plus_end - plus_begin, plus_begin);
Bo Yang4297c0a2010-05-29 23:32:06 +08002031 }
Johannes Schindelin2e5d2002009-01-17 17:29:44 +01002032
2033 diff_words->current_plus = plus_end;
Bo Yang4297c0a2010-05-29 23:32:06 +08002034 diff_words->last_minus = minus_first;
Johannes Schindelinf59a59e2006-07-28 23:56:15 +02002035}
2036
Johannes Schindelin2b6a5412009-01-17 17:29:45 +01002037/* This function starts looking at *begin, and returns 0 iff a word was found. */
2038static int find_word_boundaries(mmfile_t *buffer, regex_t *word_regex,
2039 int *begin, int *end)
2040{
2041 if (word_regex && *begin < buffer->size) {
2042 regmatch_t match[1];
Johannes Schindelinb7d36ff2016-09-21 20:24:14 +02002043 if (!regexec_buf(word_regex, buffer->ptr + *begin,
2044 buffer->size - *begin, 1, match, 0)) {
Johannes Schindelin2b6a5412009-01-17 17:29:45 +01002045 char *p = memchr(buffer->ptr + *begin + match[0].rm_so,
2046 '\n', match[0].rm_eo - match[0].rm_so);
2047 *end = p ? p - buffer->ptr : match[0].rm_eo + *begin;
2048 *begin += match[0].rm_so;
2049 return *begin >= *end;
2050 }
2051 return -1;
Johannes Schindelinf59a59e2006-07-28 23:56:15 +02002052 }
2053
Johannes Schindelin2b6a5412009-01-17 17:29:45 +01002054 /* find the next word */
2055 while (*begin < buffer->size && isspace(buffer->ptr[*begin]))
2056 (*begin)++;
2057 if (*begin >= buffer->size)
2058 return -1;
2059
2060 /* find the end of the word */
2061 *end = *begin + 1;
2062 while (*end < buffer->size && !isspace(buffer->ptr[*end]))
2063 (*end)++;
2064
2065 return 0;
2066}
2067
Johannes Schindelin23c15752009-01-17 17:29:43 +01002068/*
Johannes Schindelin2e5d2002009-01-17 17:29:44 +01002069 * This function splits the words in buffer->text, stores the list with
2070 * newline separator into out, and saves the offsets of the original words
2071 * in buffer->orig.
Johannes Schindelin23c15752009-01-17 17:29:43 +01002072 */
Johannes Schindelin2b6a5412009-01-17 17:29:45 +01002073static void diff_words_fill(struct diff_words_buffer *buffer, mmfile_t *out,
2074 regex_t *word_regex)
Johannes Schindelin23c15752009-01-17 17:29:43 +01002075{
Johannes Schindelin2e5d2002009-01-17 17:29:44 +01002076 int i, j;
Johannes Schindelin2b6a5412009-01-17 17:29:45 +01002077 long alloc = 0;
Johannes Schindelin2e5d2002009-01-17 17:29:44 +01002078
2079 out->size = 0;
Johannes Schindelin2b6a5412009-01-17 17:29:45 +01002080 out->ptr = NULL;
Johannes Schindelin2e5d2002009-01-17 17:29:44 +01002081
2082 /* fake an empty "0th" word */
2083 ALLOC_GROW(buffer->orig, 1, buffer->orig_alloc);
2084 buffer->orig[0].begin = buffer->orig[0].end = buffer->text.ptr;
2085 buffer->orig_nr = 1;
2086
2087 for (i = 0; i < buffer->text.size; i++) {
Johannes Schindelin2b6a5412009-01-17 17:29:45 +01002088 if (find_word_boundaries(&buffer->text, word_regex, &i, &j))
2089 return;
Johannes Schindelin2e5d2002009-01-17 17:29:44 +01002090
2091 /* store original boundaries */
2092 ALLOC_GROW(buffer->orig, buffer->orig_nr + 1,
2093 buffer->orig_alloc);
2094 buffer->orig[buffer->orig_nr].begin = buffer->text.ptr + i;
2095 buffer->orig[buffer->orig_nr].end = buffer->text.ptr + j;
2096 buffer->orig_nr++;
2097
2098 /* store one word */
Johannes Schindelin2b6a5412009-01-17 17:29:45 +01002099 ALLOC_GROW(out->ptr, out->size + j - i + 1, alloc);
Johannes Schindelin2e5d2002009-01-17 17:29:44 +01002100 memcpy(out->ptr + out->size, buffer->text.ptr + i, j - i);
2101 out->ptr[out->size + j - i] = '\n';
2102 out->size += j - i + 1;
2103
2104 i = j - 1;
Johannes Schindelinf59a59e2006-07-28 23:56:15 +02002105 }
2106}
2107
2108/* this executes the word diff on the accumulated buffers */
2109static void diff_words_show(struct diff_words_data *diff_words)
2110{
2111 xpparam_t xpp;
2112 xdemitconf_t xecfg;
Johannes Schindelinf59a59e2006-07-28 23:56:15 +02002113 mmfile_t minus, plus;
Thomas Rast882749a2010-04-14 17:59:06 +02002114 struct diff_words_style *style = diff_words->style;
Johannes Schindelinf59a59e2006-07-28 23:56:15 +02002115
Bo Yang4297c0a2010-05-29 23:32:06 +08002116 struct diff_options *opt = diff_words->opt;
John Keeping30997bb2013-02-07 20:15:27 +00002117 const char *line_prefix;
Bo Yang4297c0a2010-05-29 23:32:06 +08002118
2119 assert(opt);
John Keeping30997bb2013-02-07 20:15:27 +00002120 line_prefix = diff_line_prefix(opt);
Bo Yang4297c0a2010-05-29 23:32:06 +08002121
Johannes Schindelin2e5d2002009-01-17 17:29:44 +01002122 /* special case: only removal */
2123 if (!diff_words->plus.text.size) {
Stefan Bellerbd033292017-06-29 17:07:03 -07002124 emit_diff_symbol(diff_words->opt, DIFF_SYMBOL_WORD_DIFF,
2125 line_prefix, strlen(line_prefix), 0);
2126 fn_out_diff_words_write_helper(diff_words->opt,
Brandon Williams63a01c32018-02-14 10:59:39 -08002127 &style->old_word, style->newline,
Bo Yang4297c0a2010-05-29 23:32:06 +08002128 diff_words->minus.text.size,
Stefan Bellerbd033292017-06-29 17:07:03 -07002129 diff_words->minus.text.ptr);
Johannes Schindelin2e5d2002009-01-17 17:29:44 +01002130 diff_words->minus.text.size = 0;
2131 return;
2132 }
2133
2134 diff_words->current_plus = diff_words->plus.text.ptr;
Bo Yang4297c0a2010-05-29 23:32:06 +08002135 diff_words->last_minus = 0;
Johannes Schindelinf59a59e2006-07-28 23:56:15 +02002136
Brian Downing9ccd0a82008-10-25 15:30:37 +02002137 memset(&xpp, 0, sizeof(xpp));
Johannes Schindelin30b25012007-07-04 19:05:46 +01002138 memset(&xecfg, 0, sizeof(xecfg));
Johannes Schindelin2b6a5412009-01-17 17:29:45 +01002139 diff_words_fill(&diff_words->minus, &minus, diff_words->word_regex);
2140 diff_words_fill(&diff_words->plus, &plus, diff_words->word_regex);
René Scharfe582aa002010-05-02 15:04:41 +02002141 xpp.flags = 0;
Johannes Schindelin2b6a5412009-01-17 17:29:45 +01002142 /* as only the hunk header will be parsed, we need a 0-context */
Johannes Schindelin2e5d2002009-01-17 17:29:44 +01002143 xecfg.ctxlen = 0;
Jeff King7c61e252018-11-02 02:37:18 -04002144 if (xdi_diff_outf(&minus, &plus, fn_out_diff_words_aux, NULL,
Jeff King9346d6d2018-11-02 02:35:45 -04002145 diff_words, &xpp, &xecfg))
Jeff King3efb9882015-09-24 19:12:23 -04002146 die("unable to generate word diff");
Johannes Schindelinf59a59e2006-07-28 23:56:15 +02002147 free(minus.ptr);
2148 free(plus.ptr);
Johannes Schindelin2e5d2002009-01-17 17:29:44 +01002149 if (diff_words->current_plus != diff_words->plus.text.ptr +
Bo Yang4297c0a2010-05-29 23:32:06 +08002150 diff_words->plus.text.size) {
2151 if (color_words_output_graph_prefix(diff_words))
Stefan Bellerbd033292017-06-29 17:07:03 -07002152 emit_diff_symbol(diff_words->opt, DIFF_SYMBOL_WORD_DIFF,
2153 line_prefix, strlen(line_prefix), 0);
2154 fn_out_diff_words_write_helper(diff_words->opt,
Thomas Rast882749a2010-04-14 17:59:06 +02002155 &style->ctx, style->newline,
Johannes Schindelin2e5d2002009-01-17 17:29:44 +01002156 diff_words->plus.text.ptr + diff_words->plus.text.size
Stefan Bellerbd033292017-06-29 17:07:03 -07002157 - diff_words->current_plus, diff_words->current_plus);
Bo Yang4297c0a2010-05-29 23:32:06 +08002158 }
Johannes Schindelinf59a59e2006-07-28 23:56:15 +02002159 diff_words->minus.text.size = diff_words->plus.text.size = 0;
Johannes Schindelinf59a59e2006-07-28 23:56:15 +02002160}
2161
Junio C Hamano76fd2822009-10-30 10:09:06 -07002162/* In "color-words" mode, show word-diff of words accumulated in the buffer */
2163static void diff_words_flush(struct emit_callback *ecbdata)
2164{
Stefan Bellere6e045f2017-06-29 17:07:06 -07002165 struct diff_options *wo = ecbdata->diff_words->opt;
2166
Junio C Hamano76fd2822009-10-30 10:09:06 -07002167 if (ecbdata->diff_words->minus.text.size ||
2168 ecbdata->diff_words->plus.text.size)
2169 diff_words_show(ecbdata->diff_words);
Stefan Bellere6e045f2017-06-29 17:07:06 -07002170
2171 if (wo->emitted_symbols) {
2172 struct diff_options *o = ecbdata->opt;
2173 struct emitted_diff_symbols *wol = wo->emitted_symbols;
2174 int i;
2175
2176 /*
2177 * NEEDSWORK:
2178 * Instead of appending each, concat all words to a line?
2179 */
2180 for (i = 0; i < wol->nr; i++)
2181 append_emitted_diff_symbol(o, &wol->buf[i]);
2182
2183 for (i = 0; i < wol->nr; i++)
2184 free((void *)wol->buf[i].line);
2185
2186 wol->nr = 0;
2187 }
Junio C Hamano76fd2822009-10-30 10:09:06 -07002188}
2189
Nguyễn Thái Ngọc Duyacd00ea2018-09-21 17:57:33 +02002190static void diff_filespec_load_driver(struct diff_filespec *one,
2191 struct index_state *istate)
Thomas Rast77d1a522012-03-14 19:24:08 +01002192{
2193 /* Use already-loaded driver */
2194 if (one->driver)
2195 return;
2196
2197 if (S_ISREG(one->mode))
Nguyễn Thái Ngọc Duyacd00ea2018-09-21 17:57:33 +02002198 one->driver = userdiff_find_by_path(istate, one->path);
Thomas Rast77d1a522012-03-14 19:24:08 +01002199
2200 /* Fallback to default settings */
2201 if (!one->driver)
2202 one->driver = userdiff_find_by_name("default");
2203}
2204
Nguyễn Thái Ngọc Duyacd00ea2018-09-21 17:57:33 +02002205static const char *userdiff_word_regex(struct diff_filespec *one,
2206 struct index_state *istate)
Thomas Rast77d1a522012-03-14 19:24:08 +01002207{
Nguyễn Thái Ngọc Duyacd00ea2018-09-21 17:57:33 +02002208 diff_filespec_load_driver(one, istate);
Thomas Rast77d1a522012-03-14 19:24:08 +01002209 return one->driver->word_regex;
2210}
2211
2212static void init_diff_words_data(struct emit_callback *ecbdata,
Thomas Rast6440d342012-03-14 19:24:09 +01002213 struct diff_options *orig_opts,
Thomas Rast77d1a522012-03-14 19:24:08 +01002214 struct diff_filespec *one,
2215 struct diff_filespec *two)
2216{
2217 int i;
Thomas Rast6440d342012-03-14 19:24:09 +01002218 struct diff_options *o = xmalloc(sizeof(struct diff_options));
2219 memcpy(o, orig_opts, sizeof(struct diff_options));
Thomas Rast77d1a522012-03-14 19:24:08 +01002220
2221 ecbdata->diff_words =
2222 xcalloc(1, sizeof(struct diff_words_data));
2223 ecbdata->diff_words->type = o->word_diff;
2224 ecbdata->diff_words->opt = o;
Stefan Bellere6e045f2017-06-29 17:07:06 -07002225
2226 if (orig_opts->emitted_symbols)
2227 o->emitted_symbols =
2228 xcalloc(1, sizeof(struct emitted_diff_symbols));
2229
Thomas Rast77d1a522012-03-14 19:24:08 +01002230 if (!o->word_regex)
Nguyễn Thái Ngọc Duyacd00ea2018-09-21 17:57:33 +02002231 o->word_regex = userdiff_word_regex(one, o->repo->index);
Thomas Rast77d1a522012-03-14 19:24:08 +01002232 if (!o->word_regex)
Nguyễn Thái Ngọc Duyacd00ea2018-09-21 17:57:33 +02002233 o->word_regex = userdiff_word_regex(two, o->repo->index);
Thomas Rast77d1a522012-03-14 19:24:08 +01002234 if (!o->word_regex)
2235 o->word_regex = diff_word_regex_cfg;
2236 if (o->word_regex) {
2237 ecbdata->diff_words->word_regex = (regex_t *)
2238 xmalloc(sizeof(regex_t));
2239 if (regcomp(ecbdata->diff_words->word_regex,
2240 o->word_regex,
2241 REG_EXTENDED | REG_NEWLINE))
Nguyễn Thái Ngọc Duy1a07e592018-07-21 09:49:19 +02002242 die("invalid regular expression: %s",
2243 o->word_regex);
Thomas Rast77d1a522012-03-14 19:24:08 +01002244 }
2245 for (i = 0; i < ARRAY_SIZE(diff_words_styles); i++) {
2246 if (o->word_diff == diff_words_styles[i].type) {
2247 ecbdata->diff_words->style =
2248 &diff_words_styles[i];
2249 break;
2250 }
2251 }
2252 if (want_color(o->use_color)) {
2253 struct diff_words_style *st = ecbdata->diff_words->style;
Brandon Williams63a01c32018-02-14 10:59:39 -08002254 st->old_word.color = diff_get_color_opt(o, DIFF_FILE_OLD);
2255 st->new_word.color = diff_get_color_opt(o, DIFF_FILE_NEW);
Jeff King8dbf3eb2015-05-27 16:48:46 -04002256 st->ctx.color = diff_get_color_opt(o, DIFF_CONTEXT);
Thomas Rast77d1a522012-03-14 19:24:08 +01002257 }
2258}
2259
Johannes Schindelinf59a59e2006-07-28 23:56:15 +02002260static void free_diff_words_data(struct emit_callback *ecbdata)
2261{
2262 if (ecbdata->diff_words) {
Junio C Hamano76fd2822009-10-30 10:09:06 -07002263 diff_words_flush(ecbdata);
Stefan Bellere6e045f2017-06-29 17:07:06 -07002264 free (ecbdata->diff_words->opt->emitted_symbols);
Thomas Rast6440d342012-03-14 19:24:09 +01002265 free (ecbdata->diff_words->opt);
Jim Meyering8e0f7002008-01-31 18:26:32 +01002266 free (ecbdata->diff_words->minus.text.ptr);
Johannes Schindelin2e5d2002009-01-17 17:29:44 +01002267 free (ecbdata->diff_words->minus.orig);
Jim Meyering8e0f7002008-01-31 18:26:32 +01002268 free (ecbdata->diff_words->plus.text.ptr);
Johannes Schindelin2e5d2002009-01-17 17:29:44 +01002269 free (ecbdata->diff_words->plus.orig);
Brandon Caseyef5644e2010-09-09 14:02:45 -05002270 if (ecbdata->diff_words->word_regex) {
2271 regfree(ecbdata->diff_words->word_regex);
2272 free(ecbdata->diff_words->word_regex);
2273 }
Ævar Arnfjörð Bjarmason6a83d902017-06-15 23:15:46 +00002274 FREE_AND_NULL(ecbdata->diff_words);
Johannes Schindelinf59a59e2006-07-28 23:56:15 +02002275 }
2276}
2277
Jeff Kingce436972006-07-23 05:24:18 -04002278const char *diff_get_color(int diff_use_color, enum color_diff ix)
Johannes Schindelincd112ce2006-06-13 18:45:44 +02002279{
Jeff Kingdaa0c3d2011-08-17 22:04:23 -07002280 if (want_color(diff_use_color))
Linus Torvalds50f575f2006-06-22 13:53:31 -07002281 return diff_colors[ix];
2282 return "";
Johannes Schindelincd112ce2006-06-13 18:45:44 +02002283}
2284
John Keepingf1922232013-02-07 20:15:26 +00002285const char *diff_line_prefix(struct diff_options *opt)
2286{
2287 struct strbuf *msgbuf;
2288 if (!opt->output_prefix)
2289 return "";
2290
2291 msgbuf = opt->output_prefix(opt, opt->output_prefix_data);
2292 return msgbuf->buf;
2293}
2294
Jeff King19b90462019-02-14 00:48:27 -05002295static unsigned long sane_truncate_line(char *line, unsigned long len)
Junio C Hamano23707812008-01-02 01:50:11 -08002296{
2297 const char *cp;
2298 unsigned long allot;
2299 size_t l = len;
2300
Junio C Hamano23707812008-01-02 01:50:11 -08002301 cp = line;
2302 allot = l;
2303 while (0 < l) {
2304 (void) utf8_width(&cp, &l);
2305 if (!cp)
2306 break; /* truncated in the middle? */
2307 }
2308 return allot - l;
2309}
2310
Junio C Hamanod68fe262009-09-14 22:05:57 -07002311static void find_lno(const char *line, struct emit_callback *ecbdata)
Junio C Hamano690ed842009-09-04 00:41:15 -07002312{
Junio C Hamanod68fe262009-09-14 22:05:57 -07002313 const char *p;
2314 ecbdata->lno_in_preimage = 0;
2315 ecbdata->lno_in_postimage = 0;
2316 p = strchr(line, '-');
Junio C Hamano690ed842009-09-04 00:41:15 -07002317 if (!p)
Junio C Hamanod68fe262009-09-14 22:05:57 -07002318 return; /* cannot happen */
2319 ecbdata->lno_in_preimage = strtol(p + 1, NULL, 10);
2320 p = strchr(p, '+');
2321 if (!p)
2322 return; /* cannot happen */
2323 ecbdata->lno_in_postimage = strtol(p + 1, NULL, 10);
Junio C Hamano690ed842009-09-04 00:41:15 -07002324}
2325
Johannes Schindelincd112ce2006-06-13 18:45:44 +02002326static void fn_out_consume(void *priv, char *line, unsigned long len)
Junio C Hamano6973dca2006-04-21 23:57:45 -07002327{
Junio C Hamano6973dca2006-04-21 23:57:45 -07002328 struct emit_callback *ecbdata = priv;
Bo Yang7be57612010-05-26 15:23:54 +08002329 struct diff_options *o = ecbdata->opt;
Junio C Hamano6973dca2006-04-21 23:57:45 -07002330
Stefan Bellerba162332016-09-07 16:36:46 -07002331 o->found_changes = 1;
2332
Greg Bacon3e97c7c2009-11-19 15:12:24 -06002333 if (ecbdata->header) {
Stefan Bellera29b0a12017-06-29 17:06:57 -07002334 emit_diff_symbol(o, DIFF_SYMBOL_HEADER,
2335 ecbdata->header->buf, ecbdata->header->len, 0);
Greg Bacon3e97c7c2009-11-19 15:12:24 -06002336 strbuf_reset(ecbdata->header);
2337 ecbdata->header = NULL;
2338 }
Johannes Schindelin34a5e1a2007-02-25 23:34:54 +01002339
Junio C Hamano6973dca2006-04-21 23:57:45 -07002340 if (ecbdata->label_path[0]) {
Stefan Beller3ee8b7b2017-06-29 17:06:56 -07002341 emit_diff_symbol(o, DIFF_SYMBOL_FILEPAIR_MINUS,
2342 ecbdata->label_path[0],
2343 strlen(ecbdata->label_path[0]), 0);
2344 emit_diff_symbol(o, DIFF_SYMBOL_FILEPAIR_PLUS,
2345 ecbdata->label_path[1],
2346 strlen(ecbdata->label_path[1]), 0);
Junio C Hamano6973dca2006-04-21 23:57:45 -07002347 ecbdata->label_path[0] = ecbdata->label_path[1] = NULL;
2348 }
Johannes Schindelincd112ce2006-06-13 18:45:44 +02002349
Jim Meyeringa624eaa2008-08-15 13:39:26 +02002350 if (diff_suppress_blank_empty
2351 && len == 2 && line[0] == ' ' && line[1] == '\n') {
2352 line[0] = '\n';
2353 len = 1;
2354 }
2355
Junio C Hamanob8d9c1a2009-09-03 23:59:25 -07002356 if (line[0] == '@') {
Junio C Hamano76fd2822009-10-30 10:09:06 -07002357 if (ecbdata->diff_words)
2358 diff_words_flush(ecbdata);
Jeff King19b90462019-02-14 00:48:27 -05002359 len = sane_truncate_line(line, len);
Junio C Hamanod68fe262009-09-14 22:05:57 -07002360 find_lno(line, ecbdata);
Bert Wesarg89cb73a2009-11-27 07:55:18 +01002361 emit_hunk_header(ecbdata, line, len);
Junio C Hamano448c3ef2006-09-22 22:48:39 -07002362 return;
Johannes Schindelincd112ce2006-06-13 18:45:44 +02002363 }
Junio C Hamano448c3ef2006-09-22 22:48:39 -07002364
Junio C Hamano448c3ef2006-09-22 22:48:39 -07002365 if (ecbdata->diff_words) {
Stefan Bellerff958672017-06-29 17:06:54 -07002366 enum diff_symbol s =
2367 ecbdata->diff_words->type == DIFF_WORDS_PORCELAIN ?
2368 DIFF_SYMBOL_WORDS_PORCELAIN : DIFF_SYMBOL_WORDS;
Junio C Hamano448c3ef2006-09-22 22:48:39 -07002369 if (line[0] == '-') {
2370 diff_words_append(line, len,
2371 &ecbdata->diff_words->minus);
2372 return;
2373 } else if (line[0] == '+') {
2374 diff_words_append(line, len,
2375 &ecbdata->diff_words->plus);
2376 return;
Christian Couder59556542013-11-30 21:55:40 +01002377 } else if (starts_with(line, "\\ ")) {
Thomas Rastc7c2bc02012-01-12 12:15:33 +01002378 /*
2379 * Eat the "no newline at eof" marker as if we
2380 * saw a "+" or "-" line with nothing on it,
2381 * and return without diff_words_flush() to
2382 * defer processing. If this is the end of
2383 * preimage, more "+" lines may come after it.
2384 */
2385 return;
Junio C Hamano448c3ef2006-09-22 22:48:39 -07002386 }
Junio C Hamano76fd2822009-10-30 10:09:06 -07002387 diff_words_flush(ecbdata);
Stefan Bellerff958672017-06-29 17:06:54 -07002388 emit_diff_symbol(o, s, line, len, 0);
Junio C Hamano448c3ef2006-09-22 22:48:39 -07002389 return;
2390 }
Junio C Hamano448c3ef2006-09-22 22:48:39 -07002391
Junio C Hamano0e383e12015-05-26 09:56:33 -07002392 switch (line[0]) {
2393 case '+':
Junio C Hamanod68fe262009-09-14 22:05:57 -07002394 ecbdata->lno_in_postimage++;
Jeff Kinge04df612019-02-14 00:48:13 -05002395 emit_add_line(ecbdata, line + 1, len - 1);
Junio C Hamano0e383e12015-05-26 09:56:33 -07002396 break;
2397 case '-':
2398 ecbdata->lno_in_preimage++;
Jeff Kinge04df612019-02-14 00:48:13 -05002399 emit_del_line(ecbdata, line + 1, len - 1);
Junio C Hamano0e383e12015-05-26 09:56:33 -07002400 break;
2401 case ' ':
2402 ecbdata->lno_in_postimage++;
2403 ecbdata->lno_in_preimage++;
Jeff Kinge04df612019-02-14 00:48:13 -05002404 emit_context_line(ecbdata, line + 1, len - 1);
Junio C Hamano0e383e12015-05-26 09:56:33 -07002405 break;
2406 default:
2407 /* incomplete line at the end */
2408 ecbdata->lno_in_preimage++;
Stefan Bellerf2bb1212017-06-29 17:06:55 -07002409 emit_diff_symbol(o, DIFF_SYMBOL_CONTEXT_INCOMPLETE,
2410 line, len, 0);
Junio C Hamano0e383e12015-05-26 09:56:33 -07002411 break;
Junio C Hamano448c3ef2006-09-22 22:48:39 -07002412 }
Junio C Hamano6973dca2006-04-21 23:57:45 -07002413}
2414
Nguyễn Thái Ngọc Duyc905cbc2018-02-01 20:02:20 +07002415static void pprint_rename(struct strbuf *name, const char *a, const char *b)
Junio C Hamano6973dca2006-04-21 23:57:45 -07002416{
Brandon Williams63a01c32018-02-14 10:59:39 -08002417 const char *old_name = a;
2418 const char *new_name = b;
Junio C Hamano6973dca2006-04-21 23:57:45 -07002419 int pfx_length, sfx_length;
Thomas Rastdd281f02013-02-26 21:47:01 +01002420 int pfx_adjust_for_slash;
Junio C Hamano6973dca2006-04-21 23:57:45 -07002421 int len_a = strlen(a);
2422 int len_b = strlen(b);
Pierre Habouzit663af342007-09-20 00:42:15 +02002423 int a_midlen, b_midlen;
Alexandre Julliarde5bfbf92007-02-10 15:39:00 +01002424 int qlen_a = quote_c_style(a, NULL, NULL, 0);
2425 int qlen_b = quote_c_style(b, NULL, NULL, 0);
2426
2427 if (qlen_a || qlen_b) {
Nguyễn Thái Ngọc Duyc905cbc2018-02-01 20:02:20 +07002428 quote_c_style(a, name, NULL, 0);
2429 strbuf_addstr(name, " => ");
2430 quote_c_style(b, name, NULL, 0);
2431 return;
Alexandre Julliarde5bfbf92007-02-10 15:39:00 +01002432 }
Junio C Hamano6973dca2006-04-21 23:57:45 -07002433
2434 /* Find common prefix */
2435 pfx_length = 0;
Brandon Williams63a01c32018-02-14 10:59:39 -08002436 while (*old_name && *new_name && *old_name == *new_name) {
2437 if (*old_name == '/')
2438 pfx_length = old_name - a + 1;
2439 old_name++;
2440 new_name++;
Junio C Hamano6973dca2006-04-21 23:57:45 -07002441 }
2442
2443 /* Find common suffix */
Brandon Williams63a01c32018-02-14 10:59:39 -08002444 old_name = a + len_a;
2445 new_name = b + len_b;
Junio C Hamano6973dca2006-04-21 23:57:45 -07002446 sfx_length = 0;
Antoine Pelissed020e272013-02-23 17:48:45 +01002447 /*
Thomas Rastdd281f02013-02-26 21:47:01 +01002448 * If there is a common prefix, it must end in a slash. In
2449 * that case we let this loop run 1 into the prefix to see the
2450 * same slash.
2451 *
2452 * If there is no common prefix, we cannot do this as it would
2453 * underrun the input strings.
Antoine Pelissed020e272013-02-23 17:48:45 +01002454 */
Thomas Rastdd281f02013-02-26 21:47:01 +01002455 pfx_adjust_for_slash = (pfx_length ? 1 : 0);
Brandon Williams63a01c32018-02-14 10:59:39 -08002456 while (a + pfx_length - pfx_adjust_for_slash <= old_name &&
2457 b + pfx_length - pfx_adjust_for_slash <= new_name &&
2458 *old_name == *new_name) {
2459 if (*old_name == '/')
2460 sfx_length = len_a - (old_name - a);
2461 old_name--;
2462 new_name--;
Junio C Hamano6973dca2006-04-21 23:57:45 -07002463 }
2464
2465 /*
2466 * pfx{mid-a => mid-b}sfx
2467 * {pfx-a => pfx-b}sfx
2468 * pfx{sfx-a => sfx-b}
2469 * name-a => name-b
2470 */
Pierre Habouzit663af342007-09-20 00:42:15 +02002471 a_midlen = len_a - pfx_length - sfx_length;
2472 b_midlen = len_b - pfx_length - sfx_length;
2473 if (a_midlen < 0)
2474 a_midlen = 0;
2475 if (b_midlen < 0)
2476 b_midlen = 0;
Junio C Hamanocc908b82006-05-14 22:07:28 -07002477
Nguyễn Thái Ngọc Duyc905cbc2018-02-01 20:02:20 +07002478 strbuf_grow(name, pfx_length + a_midlen + b_midlen + sfx_length + 7);
Pierre Habouzit663af342007-09-20 00:42:15 +02002479 if (pfx_length + sfx_length) {
Nguyễn Thái Ngọc Duyc905cbc2018-02-01 20:02:20 +07002480 strbuf_add(name, a, pfx_length);
2481 strbuf_addch(name, '{');
Junio C Hamano6973dca2006-04-21 23:57:45 -07002482 }
Nguyễn Thái Ngọc Duyc905cbc2018-02-01 20:02:20 +07002483 strbuf_add(name, a + pfx_length, a_midlen);
2484 strbuf_addstr(name, " => ");
2485 strbuf_add(name, b + pfx_length, b_midlen);
Pierre Habouzit663af342007-09-20 00:42:15 +02002486 if (pfx_length + sfx_length) {
Nguyễn Thái Ngọc Duyc905cbc2018-02-01 20:02:20 +07002487 strbuf_addch(name, '}');
2488 strbuf_add(name, a + len_a - sfx_length, sfx_length);
Junio C Hamano6973dca2006-04-21 23:57:45 -07002489 }
Junio C Hamano6973dca2006-04-21 23:57:45 -07002490}
2491
2492struct diffstat_t {
Junio C Hamano6973dca2006-04-21 23:57:45 -07002493 int nr;
2494 int alloc;
2495 struct diffstat_file {
Junio C Hamanof6046522007-12-11 23:46:30 -08002496 char *from_name;
Junio C Hamano6973dca2006-04-21 23:57:45 -07002497 char *name;
Junio C Hamanof6046522007-12-11 23:46:30 -08002498 char *print_name;
Nguyễn Thái Ngọc Duyddf88fa2018-02-24 21:09:59 +07002499 const char *comments;
Junio C Hamano6973dca2006-04-21 23:57:45 -07002500 unsigned is_unmerged:1;
2501 unsigned is_binary:1;
2502 unsigned is_renamed:1;
Linus Torvalds74faaa12012-10-17 10:00:37 -07002503 unsigned is_interesting:1;
Jeff King0974c112010-04-17 13:41:08 -04002504 uintmax_t added, deleted;
Junio C Hamano6973dca2006-04-21 23:57:45 -07002505 } **files;
2506};
2507
2508static struct diffstat_file *diffstat_add(struct diffstat_t *diffstat,
2509 const char *name_a,
2510 const char *name_b)
2511{
2512 struct diffstat_file *x;
Brian Gesiak1a4927c2014-05-27 00:33:47 +09002513 x = xcalloc(1, sizeof(*x));
Dmitry S. Dolzhenko4c960a42014-03-04 02:31:53 +04002514 ALLOC_GROW(diffstat->files, diffstat->nr + 1, diffstat->alloc);
Junio C Hamano6973dca2006-04-21 23:57:45 -07002515 diffstat->files[diffstat->nr++] = x;
2516 if (name_b) {
Junio C Hamanof6046522007-12-11 23:46:30 -08002517 x->from_name = xstrdup(name_a);
2518 x->name = xstrdup(name_b);
Junio C Hamano6973dca2006-04-21 23:57:45 -07002519 x->is_renamed = 1;
2520 }
Junio C Hamanof6046522007-12-11 23:46:30 -08002521 else {
2522 x->from_name = NULL;
Shawn Pearce9befac42006-09-02 00:16:31 -04002523 x->name = xstrdup(name_a);
Junio C Hamanof6046522007-12-11 23:46:30 -08002524 }
Junio C Hamano6973dca2006-04-21 23:57:45 -07002525 return x;
2526}
2527
2528static void diffstat_consume(void *priv, char *line, unsigned long len)
2529{
2530 struct diffstat_t *diffstat = priv;
2531 struct diffstat_file *x = diffstat->files[diffstat->nr - 1];
2532
2533 if (line[0] == '+')
2534 x->added++;
2535 else if (line[0] == '-')
2536 x->deleted++;
2537}
2538
Johannes Schindelin698ce6f2006-05-20 15:40:29 +02002539const char mime_boundary_leader[] = "------------";
Junio C Hamano6973dca2006-04-21 23:57:45 -07002540
Junio C Hamanoa2540022006-09-26 18:53:02 -07002541static int scale_linear(int it, int width, int max_change)
2542{
Junio C Hamano2eeeef22012-02-14 13:49:11 -08002543 if (!it)
2544 return 0;
Junio C Hamanoa2540022006-09-26 18:53:02 -07002545 /*
Junio C Hamano2eeeef22012-02-14 13:49:11 -08002546 * make sure that at least one '-' or '+' is printed if
2547 * there is any change to this path. The easiest way is to
2548 * scale linearly as if the alloted width is one column shorter
2549 * than it is, and then add 1 to the result.
Junio C Hamanoa2540022006-09-26 18:53:02 -07002550 */
Junio C Hamano2eeeef22012-02-14 13:49:11 -08002551 return 1 + (it * (width - 1) / max_change);
Junio C Hamanoa2540022006-09-26 18:53:02 -07002552}
2553
Stefan Beller0911c472017-06-29 17:07:02 -07002554static void show_graph(struct strbuf *out, char ch, int cnt,
2555 const char *set, const char *reset)
Junio C Hamanoa2540022006-09-26 18:53:02 -07002556{
2557 if (cnt <= 0)
2558 return;
Stefan Beller0911c472017-06-29 17:07:02 -07002559 strbuf_addstr(out, set);
2560 strbuf_addchars(out, ch, cnt);
2561 strbuf_addstr(out, reset);
Junio C Hamanoa2540022006-09-26 18:53:02 -07002562}
2563
Junio C Hamanof6046522007-12-11 23:46:30 -08002564static void fill_print_name(struct diffstat_file *file)
2565{
Nguyễn Thái Ngọc Duyc905cbc2018-02-01 20:02:20 +07002566 struct strbuf pname = STRBUF_INIT;
Junio C Hamanof6046522007-12-11 23:46:30 -08002567
2568 if (file->print_name)
2569 return;
2570
Nguyễn Thái Ngọc Duyc905cbc2018-02-01 20:02:20 +07002571 if (file->is_renamed)
2572 pprint_rename(&pname, file->from_name, file->name);
2573 else
2574 quote_c_style(file->name, &pname, NULL, 0);
2575
Nguyễn Thái Ngọc Duyddf88fa2018-02-24 21:09:59 +07002576 if (file->comments)
2577 strbuf_addf(&pname, " (%s)", file->comments);
2578
Nguyễn Thái Ngọc Duyc905cbc2018-02-01 20:02:20 +07002579 file->print_name = strbuf_detach(&pname, NULL);
Junio C Hamanof6046522007-12-11 23:46:30 -08002580}
2581
Stefan Beller0911c472017-06-29 17:07:02 -07002582static void print_stat_summary_inserts_deletes(struct diff_options *options,
2583 int files, int insertions, int deletions)
Nguyễn Thái Ngọc Duy7f814632012-02-01 19:55:07 +07002584{
2585 struct strbuf sb = STRBUF_INIT;
Nguyễn Thái Ngọc Duy7f814632012-02-01 19:55:07 +07002586
2587 if (!files) {
2588 assert(insertions == 0 && deletions == 0);
Stefan Beller0911c472017-06-29 17:07:02 -07002589 emit_diff_symbol(options, DIFF_SYMBOL_STATS_SUMMARY_NO_FILES,
2590 NULL, 0, 0);
2591 return;
Nguyễn Thái Ngọc Duy7f814632012-02-01 19:55:07 +07002592 }
2593
2594 strbuf_addf(&sb,
Nguyễn Thái Ngọc Duy218adaa2012-09-13 21:16:26 +07002595 (files == 1) ? " %d file changed" : " %d files changed",
Nguyễn Thái Ngọc Duy7f814632012-02-01 19:55:07 +07002596 files);
2597
2598 /*
2599 * For binary diff, the caller may want to print "x files
2600 * changed" with insertions == 0 && deletions == 0.
2601 *
2602 * Not omitting "0 insertions(+), 0 deletions(-)" in this case
2603 * is probably less confusing (i.e skip over "2 files changed
2604 * but nothing about added/removed lines? Is this a bug in Git?").
2605 */
2606 if (insertions || deletions == 0) {
Nguyễn Thái Ngọc Duy7f814632012-02-01 19:55:07 +07002607 strbuf_addf(&sb,
Nguyễn Thái Ngọc Duy218adaa2012-09-13 21:16:26 +07002608 (insertions == 1) ? ", %d insertion(+)" : ", %d insertions(+)",
Nguyễn Thái Ngọc Duy7f814632012-02-01 19:55:07 +07002609 insertions);
2610 }
2611
2612 if (deletions || insertions == 0) {
Nguyễn Thái Ngọc Duy7f814632012-02-01 19:55:07 +07002613 strbuf_addf(&sb,
Nguyễn Thái Ngọc Duy218adaa2012-09-13 21:16:26 +07002614 (deletions == 1) ? ", %d deletion(-)" : ", %d deletions(-)",
Nguyễn Thái Ngọc Duy7f814632012-02-01 19:55:07 +07002615 deletions);
2616 }
2617 strbuf_addch(&sb, '\n');
Stefan Beller0911c472017-06-29 17:07:02 -07002618 emit_diff_symbol(options, DIFF_SYMBOL_STATS_SUMMARY_INSERTS_DELETES,
2619 sb.buf, sb.len, 0);
Nguyễn Thái Ngọc Duy7f814632012-02-01 19:55:07 +07002620 strbuf_release(&sb);
Stefan Beller0911c472017-06-29 17:07:02 -07002621}
2622
2623void print_stat_summary(FILE *fp, int files,
2624 int insertions, int deletions)
2625{
2626 struct diff_options o;
2627 memset(&o, 0, sizeof(o));
2628 o.file = fp;
2629
2630 print_stat_summary_inserts_deletes(&o, files, insertions, deletions);
Nguyễn Thái Ngọc Duy7f814632012-02-01 19:55:07 +07002631}
2632
Felipe Contreras4b25d092009-05-01 12:06:36 +03002633static void show_stats(struct diffstat_t *data, struct diff_options *options)
Junio C Hamano6973dca2006-04-21 23:57:45 -07002634{
Benjamin Kramereb3a9dd2009-03-07 21:02:10 +01002635 int i, len, add, del, adds = 0, dels = 0;
Jeff King0974c112010-04-17 13:41:08 -04002636 uintmax_t max_change = 0, max_len = 0;
Zbigniew Jędrzejewski-Szmekdc801e72012-04-30 22:38:58 +02002637 int total_files = data->nr, count;
2638 int width, name_width, graph_width, number_width = 0, bin_width = 0;
Johannes Schindelinc0aa3352011-03-22 13:50:08 +01002639 const char *reset, *add_c, *del_c;
Junio C Hamanoe5f85df2011-05-27 21:50:39 -07002640 int extra_shown = 0;
Stefan Beller0911c472017-06-29 17:07:02 -07002641 const char *line_prefix = diff_line_prefix(options);
2642 struct strbuf out = STRBUF_INIT;
Junio C Hamano6973dca2006-04-21 23:57:45 -07002643
2644 if (data->nr == 0)
2645 return;
2646
Michael J Gruber808e1db2011-05-27 14:36:41 +02002647 count = options->stat_count ? options->stat_count : data->nr;
Junio C Hamanoa2540022006-09-26 18:53:02 -07002648
Pierre Habouzit8f67f8a2007-11-10 20:05:14 +01002649 reset = diff_get_color_opt(options, DIFF_RESET);
Pierre Habouzit8f67f8a2007-11-10 20:05:14 +01002650 add_c = diff_get_color_opt(options, DIFF_FILE_NEW);
2651 del_c = diff_get_color_opt(options, DIFF_FILE_OLD);
Junio C Hamano785f7432006-09-26 18:59:41 -07002652
Zbigniew Jędrzejewski-Szmek1b058bc2012-03-01 13:26:43 +01002653 /*
2654 * Find the longest filename and max number of changes
2655 */
Michael J Gruber808e1db2011-05-27 14:36:41 +02002656 for (i = 0; (i < count) && (i < data->nr); i++) {
Junio C Hamano6973dca2006-04-21 23:57:45 -07002657 struct diffstat_file *file = data->files[i];
Jeff King0974c112010-04-17 13:41:08 -04002658 uintmax_t change = file->added + file->deleted;
Junio C Hamanoaf0ed812012-11-27 11:24:54 -08002659
2660 if (!file->is_interesting && (change == 0)) {
Michael J Gruber808e1db2011-05-27 14:36:41 +02002661 count++; /* not shown == room for one more */
Michael J Gruber358e4602011-05-27 14:36:40 +02002662 continue;
2663 }
Junio C Hamanof6046522007-12-11 23:46:30 -08002664 fill_print_name(file);
2665 len = strlen(file->print_name);
Junio C Hamano6973dca2006-04-21 23:57:45 -07002666 if (max_len < len)
2667 max_len = len;
2668
Zbigniew Jędrzejewski-Szmekdc801e72012-04-30 22:38:58 +02002669 if (file->is_unmerged) {
2670 /* "Unmerged" is 8 characters */
2671 bin_width = bin_width < 8 ? 8 : bin_width;
Junio C Hamano6973dca2006-04-21 23:57:45 -07002672 continue;
Zbigniew Jędrzejewski-Szmekdc801e72012-04-30 22:38:58 +02002673 }
2674 if (file->is_binary) {
2675 /* "Bin XXX -> YYY bytes" */
2676 int w = 14 + decimal_width(file->added)
2677 + decimal_width(file->deleted);
2678 bin_width = bin_width < w ? w : bin_width;
2679 /* Display change counts aligned with "Bin" */
2680 number_width = 3;
2681 continue;
2682 }
2683
Junio C Hamanoa2540022006-09-26 18:53:02 -07002684 if (max_change < change)
2685 max_change = change;
Junio C Hamano6973dca2006-04-21 23:57:45 -07002686 }
Junio C Hamanoa20d3c02012-11-27 11:47:46 -08002687 count = i; /* where we can stop scanning in data->files[] */
Junio C Hamano6973dca2006-04-21 23:57:45 -07002688
Zbigniew Jędrzejewski-Szmek1b058bc2012-03-01 13:26:43 +01002689 /*
2690 * We have width = stat_width or term_columns() columns total.
2691 * We want a maximum of min(max_len, stat_name_width) for the name part.
Zbigniew Jędrzejewski-Szmek969fe572012-03-01 13:26:45 +01002692 * We want a maximum of min(max_change, stat_graph_width) for the +- part.
Zbigniew Jędrzejewski-Szmek1b058bc2012-03-01 13:26:43 +01002693 * We also need 1 for " " and 4 + decimal_width(max_change)
2694 * for " | NNNN " and one the empty column at the end, altogether
2695 * 6 + decimal_width(max_change).
Junio C Hamanoa2540022006-09-26 18:53:02 -07002696 *
Zbigniew Jędrzejewski-Szmek1b058bc2012-03-01 13:26:43 +01002697 * If there's not enough space, we will use the smaller of
2698 * stat_name_width (if set) and 5/8*width for the filename,
Zbigniew Jędrzejewski-Szmek969fe572012-03-01 13:26:45 +01002699 * and the rest for constant elements + graph part, but no more
2700 * than stat_graph_width for the graph part.
Zbigniew Jędrzejewski-Szmek1b058bc2012-03-01 13:26:43 +01002701 * (5/8 gives 50 for filename and 30 for the constant parts + graph
2702 * for the standard terminal size).
2703 *
2704 * In other words: stat_width limits the maximum width, and
2705 * stat_name_width fixes the maximum width of the filename,
2706 * and is also used to divide available columns if there
2707 * aren't enough.
Zbigniew Jędrzejewski-Szmekdc801e72012-04-30 22:38:58 +02002708 *
2709 * Binary files are displayed with "Bin XXX -> YYY bytes"
2710 * instead of the change count and graph. This part is treated
2711 * similarly to the graph part, except that it is not
Stefano Lattarini41ccfdd2013-04-12 00:36:10 +02002712 * "scaled". If total width is too small to accommodate the
Zbigniew Jędrzejewski-Szmekdc801e72012-04-30 22:38:58 +02002713 * guaranteed minimum width of the filename part and the
2714 * separators and this message, this message will "overflow"
2715 * making the line longer than the maximum width.
Junio C Hamanoa2540022006-09-26 18:53:02 -07002716 */
Junio C Hamanoa2540022006-09-26 18:53:02 -07002717
Zbigniew Jędrzejewski-Szmek1b058bc2012-03-01 13:26:43 +01002718 if (options->stat_width == -1)
Junio C Hamanocd48dad2016-08-31 16:27:19 -07002719 width = term_columns() - strlen(line_prefix);
Zbigniew Jędrzejewski-Szmek1b058bc2012-03-01 13:26:43 +01002720 else
2721 width = options->stat_width ? options->stat_width : 80;
Zbigniew Jędrzejewski-Szmekdc801e72012-04-30 22:38:58 +02002722 number_width = decimal_width(max_change) > number_width ?
2723 decimal_width(max_change) : number_width;
Zbigniew Jędrzejewski-Szmek1b058bc2012-03-01 13:26:43 +01002724
Zbigniew Jędrzejewski-Szmekdf444832012-03-01 13:26:46 +01002725 if (options->stat_graph_width == -1)
2726 options->stat_graph_width = diff_stat_graph_width;
2727
Zbigniew Jędrzejewski-Szmek1b058bc2012-03-01 13:26:43 +01002728 /*
2729 * Guarantee 3/8*16==6 for the graph part
2730 * and 5/8*16==10 for the filename part
2731 */
2732 if (width < 16 + 6 + number_width)
2733 width = 16 + 6 + number_width;
2734
2735 /*
2736 * First assign sizes that are wanted, ignoring available width.
Zbigniew Jędrzejewski-Szmekdc801e72012-04-30 22:38:58 +02002737 * strlen("Bin XXX -> YYY bytes") == bin_width, and the part
2738 * starting from "XXX" should fit in graph_width.
Zbigniew Jędrzejewski-Szmek1b058bc2012-03-01 13:26:43 +01002739 */
Zbigniew Jędrzejewski-Szmekdc801e72012-04-30 22:38:58 +02002740 graph_width = max_change + 4 > bin_width ? max_change : bin_width - 4;
2741 if (options->stat_graph_width &&
2742 options->stat_graph_width < graph_width)
2743 graph_width = options->stat_graph_width;
2744
Zbigniew Jędrzejewski-Szmek1b058bc2012-03-01 13:26:43 +01002745 name_width = (options->stat_name_width > 0 &&
2746 options->stat_name_width < max_len) ?
2747 options->stat_name_width : max_len;
2748
2749 /*
2750 * Adjust adjustable widths not to exceed maximum width
2751 */
2752 if (name_width + number_width + 6 + graph_width > width) {
Lucian Poston678c5742012-04-18 14:12:18 -07002753 if (graph_width > width * 3/8 - number_width - 6) {
Zbigniew Jędrzejewski-Szmek1b058bc2012-03-01 13:26:43 +01002754 graph_width = width * 3/8 - number_width - 6;
Lucian Poston678c5742012-04-18 14:12:18 -07002755 if (graph_width < 6)
2756 graph_width = 6;
2757 }
2758
Zbigniew Jędrzejewski-Szmek969fe572012-03-01 13:26:45 +01002759 if (options->stat_graph_width &&
2760 graph_width > options->stat_graph_width)
2761 graph_width = options->stat_graph_width;
Zbigniew Jędrzejewski-Szmek1b058bc2012-03-01 13:26:43 +01002762 if (name_width > width - number_width - 6 - graph_width)
2763 name_width = width - number_width - 6 - graph_width;
2764 else
2765 graph_width = width - number_width - 6 - name_width;
2766 }
2767
2768 /*
2769 * From here name_width is the width of the name area,
2770 * and graph_width is the width of the graph area.
2771 * max_change is used to scale graph properly.
2772 */
Michael J Gruber808e1db2011-05-27 14:36:41 +02002773 for (i = 0; i < count; i++) {
Timo Hirvonend2543b82006-06-24 20:20:32 +03002774 const char *prefix = "";
Junio C Hamanoaf0ed812012-11-27 11:24:54 -08002775 struct diffstat_file *file = data->files[i];
2776 char *name = file->print_name;
2777 uintmax_t added = file->added;
2778 uintmax_t deleted = file->deleted;
Junio C Hamanoa2540022006-09-26 18:53:02 -07002779 int name_len;
Junio C Hamano6973dca2006-04-21 23:57:45 -07002780
Junio C Hamanoa20d3c02012-11-27 11:47:46 -08002781 if (!file->is_interesting && (added + deleted == 0))
Michael J Gruber358e4602011-05-27 14:36:40 +02002782 continue;
Junio C Hamanoa20d3c02012-11-27 11:47:46 -08002783
Junio C Hamano6973dca2006-04-21 23:57:45 -07002784 /*
2785 * "scale" the filename
2786 */
Junio C Hamanoa2540022006-09-26 18:53:02 -07002787 len = name_width;
2788 name_len = strlen(name);
2789 if (name_width < name_len) {
Junio C Hamano6973dca2006-04-21 23:57:45 -07002790 char *slash;
2791 prefix = "...";
Junio C Hamanoa2540022006-09-26 18:53:02 -07002792 len -= 3;
2793 name += name_len - len;
Junio C Hamano6973dca2006-04-21 23:57:45 -07002794 slash = strchr(name, '/');
2795 if (slash)
2796 name = slash;
2797 }
Junio C Hamano6973dca2006-04-21 23:57:45 -07002798
Junio C Hamanoaf0ed812012-11-27 11:24:54 -08002799 if (file->is_binary) {
Stefan Beller0911c472017-06-29 17:07:02 -07002800 strbuf_addf(&out, " %s%-*s |", prefix, len, name);
2801 strbuf_addf(&out, " %*s", number_width, "Bin");
Zbigniew Jędrzejewski-Szmeke18872b2012-05-01 19:10:14 +02002802 if (!added && !deleted) {
Stefan Beller0911c472017-06-29 17:07:02 -07002803 strbuf_addch(&out, '\n');
2804 emit_diff_symbol(options, DIFF_SYMBOL_STATS_LINE,
2805 out.buf, out.len, 0);
2806 strbuf_reset(&out);
Zbigniew Jędrzejewski-Szmeke18872b2012-05-01 19:10:14 +02002807 continue;
2808 }
Stefan Beller0911c472017-06-29 17:07:02 -07002809 strbuf_addf(&out, " %s%"PRIuMAX"%s",
Jeff King0974c112010-04-17 13:41:08 -04002810 del_c, deleted, reset);
Stefan Beller0911c472017-06-29 17:07:02 -07002811 strbuf_addstr(&out, " -> ");
2812 strbuf_addf(&out, "%s%"PRIuMAX"%s",
Jeff King0974c112010-04-17 13:41:08 -04002813 add_c, added, reset);
Stefan Beller0911c472017-06-29 17:07:02 -07002814 strbuf_addstr(&out, " bytes\n");
2815 emit_diff_symbol(options, DIFF_SYMBOL_STATS_LINE,
2816 out.buf, out.len, 0);
2817 strbuf_reset(&out);
Junio C Hamanof6046522007-12-11 23:46:30 -08002818 continue;
Junio C Hamano6973dca2006-04-21 23:57:45 -07002819 }
Junio C Hamanoaf0ed812012-11-27 11:24:54 -08002820 else if (file->is_unmerged) {
Stefan Beller0911c472017-06-29 17:07:02 -07002821 strbuf_addf(&out, " %s%-*s |", prefix, len, name);
2822 strbuf_addstr(&out, " Unmerged\n");
2823 emit_diff_symbol(options, DIFF_SYMBOL_STATS_LINE,
2824 out.buf, out.len, 0);
2825 strbuf_reset(&out);
Junio C Hamanof6046522007-12-11 23:46:30 -08002826 continue;
Junio C Hamano6973dca2006-04-21 23:57:45 -07002827 }
Junio C Hamano6973dca2006-04-21 23:57:45 -07002828
Junio C Hamanoa2540022006-09-26 18:53:02 -07002829 /*
2830 * scale the add/delete
2831 */
Junio C Hamano6973dca2006-04-21 23:57:45 -07002832 add = added;
2833 del = deleted;
Junio C Hamano6973dca2006-04-21 23:57:45 -07002834
Zbigniew Jędrzejewski-Szmek1b058bc2012-03-01 13:26:43 +01002835 if (graph_width <= max_change) {
Stefan Bellerd3c9cf32013-07-14 23:35:49 +02002836 int total = scale_linear(add + del, graph_width, max_change);
Junio C Hamano2eeeef22012-02-14 13:49:11 -08002837 if (total < 2 && add && del)
2838 /* width >= 2 due to the sanity check */
2839 total = 2;
2840 if (add < del) {
Zbigniew Jędrzejewski-Szmek1b058bc2012-03-01 13:26:43 +01002841 add = scale_linear(add, graph_width, max_change);
Junio C Hamano2eeeef22012-02-14 13:49:11 -08002842 del = total - add;
2843 } else {
Zbigniew Jędrzejewski-Szmek1b058bc2012-03-01 13:26:43 +01002844 del = scale_linear(del, graph_width, max_change);
Junio C Hamano2eeeef22012-02-14 13:49:11 -08002845 add = total - del;
2846 }
Junio C Hamano6973dca2006-04-21 23:57:45 -07002847 }
Stefan Beller0911c472017-06-29 17:07:02 -07002848 strbuf_addf(&out, " %s%-*s |", prefix, len, name);
2849 strbuf_addf(&out, " %*"PRIuMAX"%s",
Zbigniew Jędrzejewski-Szmekdc801e72012-04-30 22:38:58 +02002850 number_width, added + deleted,
2851 added + deleted ? " " : "");
Stefan Beller0911c472017-06-29 17:07:02 -07002852 show_graph(&out, '+', add, add_c, reset);
2853 show_graph(&out, '-', del, del_c, reset);
2854 strbuf_addch(&out, '\n');
2855 emit_diff_symbol(options, DIFF_SYMBOL_STATS_LINE,
2856 out.buf, out.len, 0);
2857 strbuf_reset(&out);
Junio C Hamano6973dca2006-04-21 23:57:45 -07002858 }
Junio C Hamanoa20d3c02012-11-27 11:47:46 -08002859
2860 for (i = 0; i < data->nr; i++) {
Junio C Hamanoaf0ed812012-11-27 11:24:54 -08002861 struct diffstat_file *file = data->files[i];
2862 uintmax_t added = file->added;
2863 uintmax_t deleted = file->deleted;
Junio C Hamano82dfc2c2012-11-27 12:05:10 -08002864
2865 if (file->is_unmerged ||
2866 (!file->is_interesting && (added + deleted == 0))) {
Michael J Gruber808e1db2011-05-27 14:36:41 +02002867 total_files--;
2868 continue;
2869 }
Junio C Hamanoa20d3c02012-11-27 11:47:46 -08002870
Junio C Hamano82dfc2c2012-11-27 12:05:10 -08002871 if (!file->is_binary) {
Junio C Hamanoa20d3c02012-11-27 11:47:46 -08002872 adds += added;
2873 dels += deleted;
2874 }
2875 if (i < count)
2876 continue;
Junio C Hamanoe5f85df2011-05-27 21:50:39 -07002877 if (!extra_shown)
Stefan Beller0911c472017-06-29 17:07:02 -07002878 emit_diff_symbol(options,
2879 DIFF_SYMBOL_STATS_SUMMARY_ABBREV,
2880 NULL, 0, 0);
Junio C Hamanoe5f85df2011-05-27 21:50:39 -07002881 extra_shown = 1;
Michael J Gruber808e1db2011-05-27 14:36:41 +02002882 }
Stefan Beller0911c472017-06-29 17:07:02 -07002883
2884 print_stat_summary_inserts_deletes(options, total_files, adds, dels);
Rene Scharfe5a612012017-08-30 19:49:43 +02002885 strbuf_release(&out);
Junio C Hamano6973dca2006-04-21 23:57:45 -07002886}
2887
Felipe Contreras2775d922009-10-11 23:46:11 +03002888static void show_shortstats(struct diffstat_t *data, struct diff_options *options)
Nicolas Pitreebd124c2006-12-14 23:15:44 -05002889{
2890 int i, adds = 0, dels = 0, total_files = data->nr;
2891
2892 if (data->nr == 0)
2893 return;
2894
2895 for (i = 0; i < data->nr; i++) {
Zbigniew Jędrzejewski-Szmeke18872b2012-05-01 19:10:14 +02002896 int added = data->files[i]->added;
Stefan Beller0911c472017-06-29 17:07:02 -07002897 int deleted = data->files[i]->deleted;
Zbigniew Jędrzejewski-Szmeke18872b2012-05-01 19:10:14 +02002898
Junio C Hamano20c8cde2012-11-27 14:19:36 -08002899 if (data->files[i]->is_unmerged ||
2900 (!data->files[i]->is_interesting && (added + deleted == 0))) {
Zbigniew Jędrzejewski-Szmeke18872b2012-05-01 19:10:14 +02002901 total_files--;
Alexander Strasserde9658b2012-06-15 23:50:30 +02002902 } else if (!data->files[i]->is_binary) { /* don't count bytes */
Zbigniew Jędrzejewski-Szmeke18872b2012-05-01 19:10:14 +02002903 adds += added;
2904 dels += deleted;
Nicolas Pitreebd124c2006-12-14 23:15:44 -05002905 }
Nicolas Pitreebd124c2006-12-14 23:15:44 -05002906 }
Stefan Beller0911c472017-06-29 17:07:02 -07002907 print_stat_summary_inserts_deletes(options, total_files, adds, dels);
Nicolas Pitreebd124c2006-12-14 23:15:44 -05002908}
2909
Felipe Contreras4b25d092009-05-01 12:06:36 +03002910static void show_numstat(struct diffstat_t *data, struct diff_options *options)
Junio C Hamano74e2abe2006-10-12 03:01:00 -07002911{
2912 int i;
2913
Junio C Hamanof6046522007-12-11 23:46:30 -08002914 if (data->nr == 0)
2915 return;
2916
Junio C Hamano74e2abe2006-10-12 03:01:00 -07002917 for (i = 0; i < data->nr; i++) {
2918 struct diffstat_file *file = data->files[i];
2919
John Keeping30997bb2013-02-07 20:15:27 +00002920 fprintf(options->file, "%s", diff_line_prefix(options));
Bo Yang7be57612010-05-26 15:23:54 +08002921
Junio C Hamanobfddbc52006-12-10 13:50:59 -08002922 if (file->is_binary)
Daniel Barkalowc0c77732008-03-09 22:43:39 -04002923 fprintf(options->file, "-\t-\t");
Junio C Hamanobfddbc52006-12-10 13:50:59 -08002924 else
Daniel Barkalowc0c77732008-03-09 22:43:39 -04002925 fprintf(options->file,
Jeff King0974c112010-04-17 13:41:08 -04002926 "%"PRIuMAX"\t%"PRIuMAX"\t",
2927 file->added, file->deleted);
Junio C Hamanof6046522007-12-11 23:46:30 -08002928 if (options->line_termination) {
2929 fill_print_name(file);
2930 if (!file->is_renamed)
Daniel Barkalowc0c77732008-03-09 22:43:39 -04002931 write_name_quoted(file->name, options->file,
Junio C Hamanof6046522007-12-11 23:46:30 -08002932 options->line_termination);
2933 else {
Daniel Barkalowc0c77732008-03-09 22:43:39 -04002934 fputs(file->print_name, options->file);
2935 putc(options->line_termination, options->file);
Junio C Hamanof6046522007-12-11 23:46:30 -08002936 }
Pierre Habouzit663af342007-09-20 00:42:15 +02002937 } else {
Junio C Hamanof6046522007-12-11 23:46:30 -08002938 if (file->is_renamed) {
Daniel Barkalowc0c77732008-03-09 22:43:39 -04002939 putc('\0', options->file);
2940 write_name_quoted(file->from_name, options->file, '\0');
Junio C Hamanof6046522007-12-11 23:46:30 -08002941 }
Daniel Barkalowc0c77732008-03-09 22:43:39 -04002942 write_name_quoted(file->name, options->file, '\0');
Pierre Habouzit663af342007-09-20 00:42:15 +02002943 }
Junio C Hamano74e2abe2006-10-12 03:01:00 -07002944 }
2945}
2946
Junio C Hamanoc04a7152008-02-12 17:06:58 -08002947struct dirstat_file {
2948 const char *name;
2949 unsigned long changed;
Linus Torvalds7df7c012008-02-12 13:26:31 -08002950};
2951
Junio C Hamanoc04a7152008-02-12 17:06:58 -08002952struct dirstat_dir {
2953 struct dirstat_file *files;
Johan Herland712d2c72011-04-29 11:36:20 +02002954 int alloc, nr, permille, cumulative;
Junio C Hamanoc04a7152008-02-12 17:06:58 -08002955};
2956
Bo Yang7be57612010-05-26 15:23:54 +08002957static long gather_dirstat(struct diff_options *opt, struct dirstat_dir *dir,
2958 unsigned long changed, const char *base, int baselen)
Linus Torvalds7df7c012008-02-12 13:26:31 -08002959{
Brandon Williams585c0e22018-02-14 10:59:28 -08002960 unsigned long sum_changes = 0;
Linus Torvalds7df7c012008-02-12 13:26:31 -08002961 unsigned int sources = 0;
John Keeping30997bb2013-02-07 20:15:27 +00002962 const char *line_prefix = diff_line_prefix(opt);
Linus Torvalds7df7c012008-02-12 13:26:31 -08002963
2964 while (dir->nr) {
Junio C Hamanoc04a7152008-02-12 17:06:58 -08002965 struct dirstat_file *f = dir->files;
Linus Torvalds7df7c012008-02-12 13:26:31 -08002966 int namelen = strlen(f->name);
Brandon Williams585c0e22018-02-14 10:59:28 -08002967 unsigned long changes;
Linus Torvalds7df7c012008-02-12 13:26:31 -08002968 char *slash;
2969
2970 if (namelen < baselen)
2971 break;
2972 if (memcmp(f->name, base, baselen))
2973 break;
2974 slash = strchr(f->name + baselen, '/');
2975 if (slash) {
2976 int newbaselen = slash + 1 - f->name;
Brandon Williams585c0e22018-02-14 10:59:28 -08002977 changes = gather_dirstat(opt, dir, changed, f->name, newbaselen);
Linus Torvalds7df7c012008-02-12 13:26:31 -08002978 sources++;
2979 } else {
Brandon Williams585c0e22018-02-14 10:59:28 -08002980 changes = f->changed;
Linus Torvalds7df7c012008-02-12 13:26:31 -08002981 dir->files++;
2982 dir->nr--;
2983 sources += 2;
2984 }
Brandon Williams585c0e22018-02-14 10:59:28 -08002985 sum_changes += changes;
Linus Torvalds7df7c012008-02-12 13:26:31 -08002986 }
2987
2988 /*
2989 * We don't report dirstat's for
2990 * - the top level
2991 * - or cases where everything came from a single directory
2992 * under this directory (sources == 1).
2993 */
2994 if (baselen && sources != 1) {
Brandon Williams585c0e22018-02-14 10:59:28 -08002995 if (sum_changes) {
2996 int permille = sum_changes * 1000 / changed;
Johan Herland712d2c72011-04-29 11:36:20 +02002997 if (permille >= dir->permille) {
Bo Yang7be57612010-05-26 15:23:54 +08002998 fprintf(opt->file, "%s%4d.%01d%% %.*s\n", line_prefix,
Johan Herland712d2c72011-04-29 11:36:20 +02002999 permille / 10, permille % 10, baselen, base);
Linus Torvalds7df7c012008-02-12 13:26:31 -08003000 if (!dir->cumulative)
3001 return 0;
3002 }
3003 }
3004 }
Brandon Williams585c0e22018-02-14 10:59:28 -08003005 return sum_changes;
Linus Torvalds7df7c012008-02-12 13:26:31 -08003006}
3007
Linus Torvalds441bca02008-08-28 16:19:08 -07003008static int dirstat_compare(const void *_a, const void *_b)
3009{
3010 const struct dirstat_file *a = _a;
3011 const struct dirstat_file *b = _b;
3012 return strcmp(a->name, b->name);
3013}
3014
Junio C Hamanoc04a7152008-02-12 17:06:58 -08003015static void show_dirstat(struct diff_options *options)
Linus Torvalds7df7c012008-02-12 13:26:31 -08003016{
3017 int i;
3018 unsigned long changed;
Junio C Hamanoc04a7152008-02-12 17:06:58 -08003019 struct dirstat_dir dir;
3020 struct diff_queue_struct *q = &diff_queued_diff;
Linus Torvalds7df7c012008-02-12 13:26:31 -08003021
Junio C Hamanoc04a7152008-02-12 17:06:58 -08003022 dir.files = NULL;
3023 dir.alloc = 0;
3024 dir.nr = 0;
Johan Herland712d2c72011-04-29 11:36:20 +02003025 dir.permille = options->dirstat_permille;
Brandon Williams0d1e0e72017-10-31 11:19:11 -07003026 dir.cumulative = options->flags.dirstat_cumulative;
Junio C Hamanoc04a7152008-02-12 17:06:58 -08003027
Linus Torvalds7df7c012008-02-12 13:26:31 -08003028 changed = 0;
Junio C Hamanoc04a7152008-02-12 17:06:58 -08003029 for (i = 0; i < q->nr; i++) {
3030 struct diff_filepair *p = q->queue[i];
3031 const char *name;
3032 unsigned long copied, added, damage;
3033
Johan Herland2ca86712011-04-12 11:24:34 +02003034 name = p->two->path ? p->two->path : p->one->path;
Junio C Hamanoc04a7152008-02-12 17:06:58 -08003035
Jeff Kingd9f62df2018-08-28 17:23:03 -04003036 if (p->one->oid_valid && p->two->oid_valid &&
3037 oideq(&p->one->oid, &p->two->oid)) {
Johan Herland2ff3a802011-04-11 00:48:52 +02003038 /*
3039 * The SHA1 has not changed, so pre-/post-content is
3040 * identical. We can therefore skip looking at the
3041 * file contents altogether.
3042 */
3043 damage = 0;
3044 goto found_damage;
3045 }
3046
Brandon Williams0d1e0e72017-10-31 11:19:11 -07003047 if (options->flags.dirstat_by_file) {
Johan Herland0133dab2011-04-11 00:48:51 +02003048 /*
3049 * In --dirstat-by-file mode, we don't really need to
3050 * look at the actual file contents at all.
3051 * The fact that the SHA1 changed is enough for us to
3052 * add this file to the list of results
3053 * (with each file contributing equal damage).
3054 */
Johan Herland2ff3a802011-04-11 00:48:52 +02003055 damage = 1;
Johan Herland0133dab2011-04-11 00:48:51 +02003056 goto found_damage;
3057 }
Junio C Hamanoc04a7152008-02-12 17:06:58 -08003058
3059 if (DIFF_FILE_VALID(p->one) && DIFF_FILE_VALID(p->two)) {
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +02003060 diff_populate_filespec(options->repo, p->one, 0);
3061 diff_populate_filespec(options->repo, p->two, 0);
3062 diffcore_count_changes(options->repo,
3063 p->one, p->two, NULL, NULL,
Junio C Hamanoc04a7152008-02-12 17:06:58 -08003064 &copied, &added);
3065 diff_free_filespec_data(p->one);
3066 diff_free_filespec_data(p->two);
3067 } else if (DIFF_FILE_VALID(p->one)) {
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +02003068 diff_populate_filespec(options->repo, p->one, CHECK_SIZE_ONLY);
Junio C Hamanoc04a7152008-02-12 17:06:58 -08003069 copied = added = 0;
3070 diff_free_filespec_data(p->one);
3071 } else if (DIFF_FILE_VALID(p->two)) {
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +02003072 diff_populate_filespec(options->repo, p->two, CHECK_SIZE_ONLY);
Junio C Hamanoc04a7152008-02-12 17:06:58 -08003073 copied = 0;
3074 added = p->two->size;
3075 diff_free_filespec_data(p->two);
3076 } else
Junio C Hamano2b0b5512008-02-24 17:37:15 -08003077 continue;
Junio C Hamanoc04a7152008-02-12 17:06:58 -08003078
3079 /*
3080 * Original minus copied is the removed material,
3081 * added is the new material. They are both damages
Johan Herland0133dab2011-04-11 00:48:51 +02003082 * made to the preimage.
Johan Herland2ff3a802011-04-11 00:48:52 +02003083 * If the resulting damage is zero, we know that
3084 * diffcore_count_changes() considers the two entries to
Jeff Kingd9f62df2018-08-28 17:23:03 -04003085 * be identical, but since the oid changed, we
Johan Herland2ff3a802011-04-11 00:48:52 +02003086 * know that there must have been _some_ kind of change,
3087 * so we force all entries to have damage > 0.
Junio C Hamanoc04a7152008-02-12 17:06:58 -08003088 */
3089 damage = (p->one->size - copied) + added;
Johan Herland2ff3a802011-04-11 00:48:52 +02003090 if (!damage)
Heikki Orsilafd337772008-09-05 22:27:35 +03003091 damage = 1;
Junio C Hamanoc04a7152008-02-12 17:06:58 -08003092
Johan Herland0133dab2011-04-11 00:48:51 +02003093found_damage:
Junio C Hamanoc04a7152008-02-12 17:06:58 -08003094 ALLOC_GROW(dir.files, dir.nr + 1, dir.alloc);
3095 dir.files[dir.nr].name = name;
3096 dir.files[dir.nr].changed = damage;
3097 changed += damage;
3098 dir.nr++;
Linus Torvalds7df7c012008-02-12 13:26:31 -08003099 }
3100
3101 /* This can happen even with many files, if everything was renames */
3102 if (!changed)
3103 return;
3104
3105 /* Show all directories with more than x% of the changes */
René Scharfe9ed0d8d2016-09-29 17:27:31 +02003106 QSORT(dir.files, dir.nr, dirstat_compare);
Bo Yang7be57612010-05-26 15:23:54 +08003107 gather_dirstat(options, &dir, changed, "", 0);
Linus Torvalds7df7c012008-02-12 13:26:31 -08003108}
3109
Johan Herland1c57a622011-04-29 11:36:21 +02003110static void show_dirstat_by_line(struct diffstat_t *data, struct diff_options *options)
3111{
3112 int i;
3113 unsigned long changed;
3114 struct dirstat_dir dir;
3115
3116 if (data->nr == 0)
3117 return;
3118
3119 dir.files = NULL;
3120 dir.alloc = 0;
3121 dir.nr = 0;
3122 dir.permille = options->dirstat_permille;
Brandon Williams0d1e0e72017-10-31 11:19:11 -07003123 dir.cumulative = options->flags.dirstat_cumulative;
Johan Herland1c57a622011-04-29 11:36:21 +02003124
3125 changed = 0;
3126 for (i = 0; i < data->nr; i++) {
3127 struct diffstat_file *file = data->files[i];
3128 unsigned long damage = file->added + file->deleted;
3129 if (file->is_binary)
3130 /*
3131 * binary files counts bytes, not lines. Must find some
3132 * way to normalize binary bytes vs. textual lines.
3133 * The following heuristic assumes that there are 64
3134 * bytes per "line".
3135 * This is stupid and ugly, but very cheap...
3136 */
René Scharfe42c78a22017-07-08 12:35:35 +02003137 damage = DIV_ROUND_UP(damage, 64);
Johan Herland1c57a622011-04-29 11:36:21 +02003138 ALLOC_GROW(dir.files, dir.nr + 1, dir.alloc);
3139 dir.files[dir.nr].name = file->name;
3140 dir.files[dir.nr].changed = damage;
3141 changed += damage;
3142 dir.nr++;
3143 }
3144
3145 /* This can happen even with many files, if everything was renames */
3146 if (!changed)
3147 return;
3148
3149 /* Show all directories with more than x% of the changes */
René Scharfe9ed0d8d2016-09-29 17:27:31 +02003150 QSORT(dir.files, dir.nr, dirstat_compare);
Johan Herland1c57a622011-04-29 11:36:21 +02003151 gather_dirstat(options, &dir, changed, "", 0);
3152}
3153
Junio C Hamanof6046522007-12-11 23:46:30 -08003154static void free_diffstat_info(struct diffstat_t *diffstat)
3155{
3156 int i;
3157 for (i = 0; i < diffstat->nr; i++) {
3158 struct diffstat_file *f = diffstat->files[i];
Nguyễn Thái Ngọc Duyc905cbc2018-02-01 20:02:20 +07003159 free(f->print_name);
Junio C Hamanof6046522007-12-11 23:46:30 -08003160 free(f->name);
3161 free(f->from_name);
3162 free(f);
3163 }
3164 free(diffstat->files);
3165}
3166
Johannes Schindelin88246892006-05-20 23:43:13 +02003167struct checkdiff_t {
Johannes Schindelin88246892006-05-20 23:43:13 +02003168 const char *filename;
Junio C Hamano1ba111d2008-06-26 15:36:34 -07003169 int lineno;
Junio C Hamanoa757c642010-03-24 19:21:32 -07003170 int conflict_marker_size;
Junio C Hamano1ba111d2008-06-26 15:36:34 -07003171 struct diff_options *o;
Junio C Hamanocf1b7862007-12-06 00:14:14 -08003172 unsigned ws_rule;
Wincent Colaiuta62c64892007-12-13 21:24:52 +01003173 unsigned status;
Johannes Schindelin88246892006-05-20 23:43:13 +02003174};
3175
Junio C Hamanoa757c642010-03-24 19:21:32 -07003176static int is_conflict_marker(const char *line, int marker_size, unsigned long len)
Junio C Hamano04954042008-06-26 15:37:21 -07003177{
3178 char firstchar;
3179 int cnt;
3180
Junio C Hamanoa757c642010-03-24 19:21:32 -07003181 if (len < marker_size + 1)
Junio C Hamano04954042008-06-26 15:37:21 -07003182 return 0;
3183 firstchar = line[0];
3184 switch (firstchar) {
Junio C Hamanoa757c642010-03-24 19:21:32 -07003185 case '=': case '>': case '<': case '|':
Junio C Hamano04954042008-06-26 15:37:21 -07003186 break;
3187 default:
3188 return 0;
3189 }
Junio C Hamanoa757c642010-03-24 19:21:32 -07003190 for (cnt = 1; cnt < marker_size; cnt++)
Junio C Hamano04954042008-06-26 15:37:21 -07003191 if (line[cnt] != firstchar)
3192 return 0;
Junio C Hamanoa757c642010-03-24 19:21:32 -07003193 /* line[1] thru line[marker_size-1] are same as firstchar */
3194 if (len < marker_size + 1 || !isspace(line[marker_size]))
Junio C Hamano04954042008-06-26 15:37:21 -07003195 return 0;
Junio C Hamano04954042008-06-26 15:37:21 -07003196 return 1;
3197}
3198
Jeff King75ab7632018-11-02 02:39:03 -04003199static void checkdiff_consume_hunk(void *priv,
3200 long ob, long on, long nb, long nn,
3201 const char *func, long funclen)
3202
3203{
3204 struct checkdiff_t *data = priv;
3205 data->lineno = nb - 1;
3206}
3207
Johannes Schindelin88246892006-05-20 23:43:13 +02003208static void checkdiff_consume(void *priv, char *line, unsigned long len)
3209{
3210 struct checkdiff_t *data = priv;
Junio C Hamanoa757c642010-03-24 19:21:32 -07003211 int marker_size = data->conflict_marker_size;
Jeff Kingf1c96262011-08-17 22:03:12 -07003212 const char *ws = diff_get_color(data->o->use_color, DIFF_WHITESPACE);
3213 const char *reset = diff_get_color(data->o->use_color, DIFF_RESET);
3214 const char *set = diff_get_color(data->o->use_color, DIFF_FILE_NEW);
Wincent Colaiutac1795bb2007-12-13 14:32:29 +01003215 char *err;
John Keeping30997bb2013-02-07 20:15:27 +00003216 const char *line_prefix;
Bo Yang7be57612010-05-26 15:23:54 +08003217
3218 assert(data->o);
John Keeping30997bb2013-02-07 20:15:27 +00003219 line_prefix = diff_line_prefix(data->o);
Johannes Schindelin88246892006-05-20 23:43:13 +02003220
3221 if (line[0] == '+') {
Junio C Hamano18374e52008-06-26 13:16:33 -07003222 unsigned bad;
Junio C Hamano0ef617f2008-02-15 20:30:05 -08003223 data->lineno++;
Junio C Hamanoa757c642010-03-24 19:21:32 -07003224 if (is_conflict_marker(line + 1, marker_size, len - 1)) {
Junio C Hamano04954042008-06-26 15:37:21 -07003225 data->status |= 1;
3226 fprintf(data->o->file,
Bo Yang7be57612010-05-26 15:23:54 +08003227 "%s%s:%d: leftover conflict marker\n",
3228 line_prefix, data->filename, data->lineno);
Junio C Hamano04954042008-06-26 15:37:21 -07003229 }
Junio C Hamano8f8841e2008-06-26 15:35:21 -07003230 bad = ws_check(line + 1, len - 1, data->ws_rule);
Junio C Hamano18374e52008-06-26 13:16:33 -07003231 if (!bad)
Wincent Colaiutac1795bb2007-12-13 14:32:29 +01003232 return;
Junio C Hamano18374e52008-06-26 13:16:33 -07003233 data->status |= bad;
3234 err = whitespace_error_string(bad);
Bo Yang7be57612010-05-26 15:23:54 +08003235 fprintf(data->o->file, "%s%s:%d: %s.\n",
3236 line_prefix, data->filename, data->lineno, err);
Wincent Colaiutac1795bb2007-12-13 14:32:29 +01003237 free(err);
Bo Yanga3c158d2010-05-26 15:08:02 +08003238 emit_line(data->o, set, reset, line, 1);
Junio C Hamano8f8841e2008-06-26 15:35:21 -07003239 ws_check_emit(line + 1, len - 1, data->ws_rule,
Junio C Hamano1ba111d2008-06-26 15:36:34 -07003240 data->o->file, set, reset, ws);
Junio C Hamano877f23c2008-06-26 15:36:59 -07003241 } else if (line[0] == ' ') {
Johannes Schindelin88246892006-05-20 23:43:13 +02003242 data->lineno++;
Johannes Schindelin88246892006-05-20 23:43:13 +02003243 }
3244}
3245
Junio C Hamano06606262006-05-05 02:41:53 -07003246static unsigned char *deflate_it(char *data,
3247 unsigned long size,
3248 unsigned long *result_size)
Junio C Hamano051308f2006-05-04 16:51:44 -07003249{
Junio C Hamano06606262006-05-05 02:41:53 -07003250 int bound;
3251 unsigned char *deflated;
Junio C Hamanoef49a7a2011-06-10 11:52:15 -07003252 git_zstream stream;
Junio C Hamano051308f2006-05-04 16:51:44 -07003253
Junio C Hamano55bb5c92011-06-10 10:55:10 -07003254 git_deflate_init(&stream, zlib_compression_level);
Junio C Hamano225a6f12011-06-10 11:18:17 -07003255 bound = git_deflate_bound(&stream, size);
Junio C Hamano06606262006-05-05 02:41:53 -07003256 deflated = xmalloc(bound);
3257 stream.next_out = deflated;
3258 stream.avail_out = bound;
Junio C Hamano051308f2006-05-04 16:51:44 -07003259
Junio C Hamano06606262006-05-05 02:41:53 -07003260 stream.next_in = (unsigned char *)data;
3261 stream.avail_in = size;
Junio C Hamano55bb5c92011-06-10 10:55:10 -07003262 while (git_deflate(&stream, Z_FINISH) == Z_OK)
Junio C Hamano06606262006-05-05 02:41:53 -07003263 ; /* nothing */
Junio C Hamano55bb5c92011-06-10 10:55:10 -07003264 git_deflate_end(&stream);
Junio C Hamano06606262006-05-05 02:41:53 -07003265 *result_size = stream.total_out;
3266 return deflated;
Junio C Hamano051308f2006-05-04 16:51:44 -07003267}
3268
Stefan Beller4eed0eb2017-06-29 17:07:01 -07003269static void emit_binary_diff_body(struct diff_options *o,
3270 mmfile_t *one, mmfile_t *two)
Junio C Hamano051308f2006-05-04 16:51:44 -07003271{
Junio C Hamano06606262006-05-05 02:41:53 -07003272 void *cp;
3273 void *delta;
3274 void *deflated;
3275 void *data;
3276 unsigned long orig_size;
Junio C Hamano051308f2006-05-04 16:51:44 -07003277 unsigned long delta_size;
Junio C Hamano06606262006-05-05 02:41:53 -07003278 unsigned long deflate_size;
3279 unsigned long data_size;
Junio C Hamano051308f2006-05-04 16:51:44 -07003280
Junio C Hamano06606262006-05-05 02:41:53 -07003281 /* We could do deflated delta, or we could do just deflated two,
3282 * whichever is smaller.
3283 */
3284 delta = NULL;
3285 deflated = deflate_it(two->ptr, two->size, &deflate_size);
3286 if (one->size && two->size) {
3287 delta = diff_delta(one->ptr, one->size,
3288 two->ptr, two->size,
3289 &delta_size, deflate_size);
3290 if (delta) {
3291 void *to_free = delta;
3292 orig_size = delta_size;
3293 delta = deflate_it(delta, delta_size, &delta_size);
3294 free(to_free);
3295 }
3296 }
Junio C Hamano051308f2006-05-04 16:51:44 -07003297
Junio C Hamano06606262006-05-05 02:41:53 -07003298 if (delta && delta_size < deflate_size) {
Torsten Bögershausenca473ce2018-11-11 08:05:04 +01003299 char *s = xstrfmt("%"PRIuMAX , (uintmax_t)orig_size);
Stefan Beller4eed0eb2017-06-29 17:07:01 -07003300 emit_diff_symbol(o, DIFF_SYMBOL_BINARY_DIFF_HEADER_DELTA,
3301 s, strlen(s), 0);
3302 free(s);
Junio C Hamano06606262006-05-05 02:41:53 -07003303 free(deflated);
3304 data = delta;
3305 data_size = delta_size;
Stefan Beller4eed0eb2017-06-29 17:07:01 -07003306 } else {
3307 char *s = xstrfmt("%lu", two->size);
3308 emit_diff_symbol(o, DIFF_SYMBOL_BINARY_DIFF_HEADER_LITERAL,
3309 s, strlen(s), 0);
3310 free(s);
Junio C Hamano06606262006-05-05 02:41:53 -07003311 free(delta);
3312 data = deflated;
3313 data_size = deflate_size;
3314 }
3315
3316 /* emit data encoded in base85 */
3317 cp = data;
3318 while (data_size) {
Stefan Beller4eed0eb2017-06-29 17:07:01 -07003319 int len;
Junio C Hamano06606262006-05-05 02:41:53 -07003320 int bytes = (52 < data_size) ? 52 : data_size;
Stefan Beller4eed0eb2017-06-29 17:07:01 -07003321 char line[71];
Junio C Hamano06606262006-05-05 02:41:53 -07003322 data_size -= bytes;
Junio C Hamano051308f2006-05-04 16:51:44 -07003323 if (bytes <= 26)
3324 line[0] = bytes + 'A' - 1;
3325 else
3326 line[0] = bytes - 26 + 'a' - 1;
3327 encode_85(line + 1, cp, bytes);
Florian Forster1d7f1712006-06-18 17:18:09 +02003328 cp = (char *) cp + bytes;
Stefan Beller4eed0eb2017-06-29 17:07:01 -07003329
3330 len = strlen(line);
3331 line[len++] = '\n';
3332 line[len] = '\0';
3333
3334 emit_diff_symbol(o, DIFF_SYMBOL_BINARY_DIFF_BODY,
3335 line, len, 0);
Junio C Hamano051308f2006-05-04 16:51:44 -07003336 }
Stefan Beller4eed0eb2017-06-29 17:07:01 -07003337 emit_diff_symbol(o, DIFF_SYMBOL_BINARY_DIFF_FOOTER, NULL, 0, 0);
Junio C Hamano06606262006-05-05 02:41:53 -07003338 free(data);
Junio C Hamano051308f2006-05-04 16:51:44 -07003339}
3340
Stefan Beller4eed0eb2017-06-29 17:07:01 -07003341static void emit_binary_diff(struct diff_options *o,
3342 mmfile_t *one, mmfile_t *two)
Junio C Hamanod4c452f2006-08-16 16:08:14 -07003343{
Stefan Beller4eed0eb2017-06-29 17:07:01 -07003344 emit_diff_symbol(o, DIFF_SYMBOL_BINARY_DIFF_HEADER, NULL, 0, 0);
3345 emit_binary_diff_body(o, one, two);
3346 emit_binary_diff_body(o, two, one);
Junio C Hamanod4c452f2006-08-16 16:08:14 -07003347}
3348
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +02003349int diff_filespec_is_binary(struct repository *r,
3350 struct diff_filespec *one)
Junio C Hamano29a3eef2007-07-06 00:18:54 -07003351{
Jeff King122aa6f2008-10-05 17:43:36 -04003352 if (one->is_binary == -1) {
Nguyễn Thái Ngọc Duyacd00ea2018-09-21 17:57:33 +02003353 diff_filespec_load_driver(one, r->index);
Jeff King122aa6f2008-10-05 17:43:36 -04003354 if (one->driver->binary != -1)
3355 one->is_binary = one->driver->binary;
3356 else {
3357 if (!one->data && DIFF_FILE_VALID(one))
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +02003358 diff_populate_filespec(r, one, CHECK_BINARY);
Nguyễn Thái Ngọc Duy6bf3b812014-08-16 10:08:05 +07003359 if (one->is_binary == -1 && one->data)
Jeff King122aa6f2008-10-05 17:43:36 -04003360 one->is_binary = buffer_is_binary(one->data,
3361 one->size);
3362 if (one->is_binary == -1)
3363 one->is_binary = 0;
3364 }
3365 }
Junio C Hamano29a3eef2007-07-06 00:18:54 -07003366 return one->is_binary;
Junio C Hamano6973dca2006-04-21 23:57:45 -07003367}
3368
Nguyễn Thái Ngọc Duyacd00ea2018-09-21 17:57:33 +02003369static const struct userdiff_funcname *
3370diff_funcname_pattern(struct diff_options *o, struct diff_filespec *one)
Junio C Hamanof2584752007-07-06 00:45:10 -07003371{
Nguyễn Thái Ngọc Duyacd00ea2018-09-21 17:57:33 +02003372 diff_filespec_load_driver(one, o->repo->index);
Jeff King122aa6f2008-10-05 17:43:36 -04003373 return one->driver->funcname.pattern ? &one->driver->funcname : NULL;
Junio C Hamanof2584752007-07-06 00:45:10 -07003374}
3375
Junio C Hamanoa5a818e2008-08-18 20:08:09 -07003376void diff_set_mnemonic_prefix(struct diff_options *options, const char *a, const char *b)
3377{
3378 if (!options->a_prefix)
3379 options->a_prefix = a;
3380 if (!options->b_prefix)
3381 options->b_prefix = b;
3382}
3383
Nguyễn Thái Ngọc Duybd7ad452018-11-10 06:49:06 +01003384struct userdiff_driver *get_textconv(struct repository *r,
Nguyễn Thái Ngọc Duyacd00ea2018-09-21 17:57:33 +02003385 struct diff_filespec *one)
Jeff King04427ac2008-10-26 00:44:53 -04003386{
3387 if (!DIFF_FILE_VALID(one))
3388 return NULL;
Jeff Kingd391c0f2010-09-21 17:01:24 -04003389
Nguyễn Thái Ngọc Duybd7ad452018-11-10 06:49:06 +01003390 diff_filespec_load_driver(one, r->index);
3391 return userdiff_get_textconv(r, one->driver);
Jeff King04427ac2008-10-26 00:44:53 -04003392}
3393
Junio C Hamano6973dca2006-04-21 23:57:45 -07003394static void builtin_diff(const char *name_a,
3395 const char *name_b,
3396 struct diff_filespec *one,
3397 struct diff_filespec *two,
3398 const char *xfrm_msg,
Christian Couder296c6bb2010-05-26 04:50:12 +02003399 int must_show_header,
Junio C Hamano051308f2006-05-04 16:51:44 -07003400 struct diff_options *o,
Junio C Hamano6973dca2006-04-21 23:57:45 -07003401 int complete_rewrite)
3402{
3403 mmfile_t mf1, mf2;
3404 const char *lbl[2];
3405 char *a_one, *b_two;
Jeff Kingd9c552f2012-11-13 21:12:46 +05303406 const char *meta = diff_get_color_opt(o, DIFF_METAINFO);
Pierre Habouzit8f67f8a2007-11-10 20:05:14 +01003407 const char *reset = diff_get_color_opt(o, DIFF_RESET);
Junio C Hamanoa5a818e2008-08-18 20:08:09 -07003408 const char *a_prefix, *b_prefix;
Jeff Kingd9bae1a2010-04-01 20:12:15 -04003409 struct userdiff_driver *textconv_one = NULL;
3410 struct userdiff_driver *textconv_two = NULL;
Greg Bacon3e97c7c2009-11-19 15:12:24 -06003411 struct strbuf header = STRBUF_INIT;
John Keeping30997bb2013-02-07 20:15:27 +00003412 const char *line_prefix = diff_line_prefix(o);
Junio C Hamano6973dca2006-04-21 23:57:45 -07003413
Junio C Hamanoa5a818e2008-08-18 20:08:09 -07003414 diff_set_mnemonic_prefix(o, "a/", "b/");
Brandon Williams0d1e0e72017-10-31 11:19:11 -07003415 if (o->flags.reverse_diff) {
Junio C Hamanoa5a818e2008-08-18 20:08:09 -07003416 a_prefix = o->b_prefix;
3417 b_prefix = o->a_prefix;
3418 } else {
3419 a_prefix = o->a_prefix;
3420 b_prefix = o->b_prefix;
3421 }
3422
Jacob Keller61cfbc02016-08-31 16:27:21 -07003423 if (o->submodule_format == DIFF_SUBMODULE_LOG &&
3424 (!one->mode || S_ISGITLINK(one->mode)) &&
3425 (!two->mode || S_ISGITLINK(two->mode))) {
Stefan Bellerf3597132017-06-29 17:07:00 -07003426 show_submodule_summary(o, one->path ? one->path : two->path,
Jacob Keller602a2832016-08-31 16:27:23 -07003427 &one->oid, &two->oid,
Stefan Bellerf3597132017-06-29 17:07:00 -07003428 two->dirty_submodule);
Junio C Hamano6973dca2006-04-21 23:57:45 -07003429 return;
Jacob Kellerfd47ae62016-08-31 16:27:25 -07003430 } else if (o->submodule_format == DIFF_SUBMODULE_INLINE_DIFF &&
3431 (!one->mode || S_ISGITLINK(one->mode)) &&
3432 (!two->mode || S_ISGITLINK(two->mode))) {
Stefan Bellerf3597132017-06-29 17:07:00 -07003433 show_submodule_inline_diff(o, one->path ? one->path : two->path,
Jacob Kellerfd47ae62016-08-31 16:27:25 -07003434 &one->oid, &two->oid,
Stefan Bellerf3597132017-06-29 17:07:00 -07003435 two->dirty_submodule);
Jacob Kellerfd47ae62016-08-31 16:27:25 -07003436 return;
Junio C Hamano6973dca2006-04-21 23:57:45 -07003437 }
3438
Brandon Williams0d1e0e72017-10-31 11:19:11 -07003439 if (o->flags.allow_textconv) {
Nguyễn Thái Ngọc Duybd7ad452018-11-10 06:49:06 +01003440 textconv_one = get_textconv(o->repo, one);
3441 textconv_two = get_textconv(o->repo, two);
Junio C Hamano6973dca2006-04-21 23:57:45 -07003442 }
3443
Linus Torvalds71b989e2008-10-05 15:35:15 -04003444 /* Never use a non-valid filename anywhere if at all possible */
3445 name_a = DIFF_FILE_VALID(one) ? name_a : name_b;
3446 name_b = DIFF_FILE_VALID(two) ? name_b : name_a;
3447
Junio C Hamanoa5a818e2008-08-18 20:08:09 -07003448 a_one = quote_two(a_prefix, name_a + (*name_a == '/'));
3449 b_two = quote_two(b_prefix, name_b + (*name_b == '/'));
Junio C Hamano6973dca2006-04-21 23:57:45 -07003450 lbl[0] = DIFF_FILE_VALID(one) ? a_one : "/dev/null";
3451 lbl[1] = DIFF_FILE_VALID(two) ? b_two : "/dev/null";
Jeff Kingd9c552f2012-11-13 21:12:46 +05303452 strbuf_addf(&header, "%s%sdiff --git %s %s%s\n", line_prefix, meta, a_one, b_two, reset);
Junio C Hamano6973dca2006-04-21 23:57:45 -07003453 if (lbl[0][0] == '/') {
3454 /* /dev/null */
Jeff Kingd9c552f2012-11-13 21:12:46 +05303455 strbuf_addf(&header, "%s%snew file mode %06o%s\n", line_prefix, meta, two->mode, reset);
Bert Wesarg37466442010-05-04 00:38:07 +02003456 if (xfrm_msg)
3457 strbuf_addstr(&header, xfrm_msg);
Christian Couder296c6bb2010-05-26 04:50:12 +02003458 must_show_header = 1;
Junio C Hamano6973dca2006-04-21 23:57:45 -07003459 }
3460 else if (lbl[1][0] == '/') {
Jeff Kingd9c552f2012-11-13 21:12:46 +05303461 strbuf_addf(&header, "%s%sdeleted file mode %06o%s\n", line_prefix, meta, one->mode, reset);
Bert Wesarg37466442010-05-04 00:38:07 +02003462 if (xfrm_msg)
3463 strbuf_addstr(&header, xfrm_msg);
Christian Couder296c6bb2010-05-26 04:50:12 +02003464 must_show_header = 1;
Junio C Hamano6973dca2006-04-21 23:57:45 -07003465 }
3466 else {
3467 if (one->mode != two->mode) {
Jeff Kingd9c552f2012-11-13 21:12:46 +05303468 strbuf_addf(&header, "%s%sold mode %06o%s\n", line_prefix, meta, one->mode, reset);
3469 strbuf_addf(&header, "%s%snew mode %06o%s\n", line_prefix, meta, two->mode, reset);
Christian Couder296c6bb2010-05-26 04:50:12 +02003470 must_show_header = 1;
Junio C Hamano6973dca2006-04-21 23:57:45 -07003471 }
Bert Wesarg37466442010-05-04 00:38:07 +02003472 if (xfrm_msg)
3473 strbuf_addstr(&header, xfrm_msg);
Greg Bacon3e97c7c2009-11-19 15:12:24 -06003474
Junio C Hamano6973dca2006-04-21 23:57:45 -07003475 /*
3476 * we do not run diff between different kind
3477 * of objects.
3478 */
3479 if ((one->mode ^ two->mode) & S_IFMT)
3480 goto free_ab_and_return;
Jeff King0c018572008-12-09 03:12:28 -05003481 if (complete_rewrite &&
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +02003482 (textconv_one || !diff_filespec_is_binary(o->repo, one)) &&
3483 (textconv_two || !diff_filespec_is_binary(o->repo, two))) {
Stefan Bellera29b0a12017-06-29 17:06:57 -07003484 emit_diff_symbol(o, DIFF_SYMBOL_HEADER,
3485 header.buf, header.len, 0);
Greg Bacon3e97c7c2009-11-19 15:12:24 -06003486 strbuf_reset(&header);
Jeff King3aa1f7c2008-12-09 03:13:21 -05003487 emit_rewrite_diff(name_a, name_b, one, two,
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +02003488 textconv_one, textconv_two, o);
Johannes Schindelin34a5e1a2007-02-25 23:34:54 +01003489 o->found_changes = 1;
Junio C Hamano6973dca2006-04-21 23:57:45 -07003490 goto free_ab_and_return;
3491 }
3492 }
3493
Junio C Hamano467ddc12011-02-28 16:11:55 -08003494 if (o->irreversible_delete && lbl[1][0] == '/') {
Stefan Bellera29b0a12017-06-29 17:06:57 -07003495 emit_diff_symbol(o, DIFF_SYMBOL_HEADER, header.buf,
3496 header.len, 0);
Junio C Hamano467ddc12011-02-28 16:11:55 -08003497 strbuf_reset(&header);
3498 goto free_ab_and_return;
Brandon Williams0d1e0e72017-10-31 11:19:11 -07003499 } else if (!o->flags.text &&
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +02003500 ( (!textconv_one && diff_filespec_is_binary(o->repo, one)) ||
3501 (!textconv_two && diff_filespec_is_binary(o->repo, two)) )) {
Stefan Beller4acaaa72017-06-29 17:06:58 -07003502 struct strbuf sb = STRBUF_INIT;
Nguyễn Thái Ngọc Duy1aaf69e2014-08-16 10:08:06 +07003503 if (!one->data && !two->data &&
3504 S_ISREG(one->mode) && S_ISREG(two->mode) &&
Brandon Williams0d1e0e72017-10-31 11:19:11 -07003505 !o->flags.binary) {
Jeff King4a7e27e2018-08-28 17:22:40 -04003506 if (oideq(&one->oid, &two->oid)) {
Nguyễn Thái Ngọc Duy1aaf69e2014-08-16 10:08:06 +07003507 if (must_show_header)
Stefan Bellera29b0a12017-06-29 17:06:57 -07003508 emit_diff_symbol(o, DIFF_SYMBOL_HEADER,
3509 header.buf, header.len,
3510 0);
Nguyễn Thái Ngọc Duy1aaf69e2014-08-16 10:08:06 +07003511 goto free_ab_and_return;
3512 }
Stefan Bellera29b0a12017-06-29 17:06:57 -07003513 emit_diff_symbol(o, DIFF_SYMBOL_HEADER,
3514 header.buf, header.len, 0);
Stefan Beller4acaaa72017-06-29 17:06:58 -07003515 strbuf_addf(&sb, "%sBinary files %s and %s differ\n",
3516 diff_line_prefix(o), lbl[0], lbl[1]);
3517 emit_diff_symbol(o, DIFF_SYMBOL_BINARY_FILES,
3518 sb.buf, sb.len, 0);
3519 strbuf_release(&sb);
Nguyễn Thái Ngọc Duy1aaf69e2014-08-16 10:08:06 +07003520 goto free_ab_and_return;
3521 }
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +02003522 if (fill_mmfile(o->repo, &mf1, one) < 0 ||
3523 fill_mmfile(o->repo, &mf2, two) < 0)
Jeff Kingb3373982010-04-01 20:14:24 -04003524 die("unable to read files to diff");
Junio C Hamano06606262006-05-05 02:41:53 -07003525 /* Quite common confusing case */
3526 if (mf1.size == mf2.size &&
Christian Couder296c6bb2010-05-26 04:50:12 +02003527 !memcmp(mf1.ptr, mf2.ptr, mf1.size)) {
3528 if (must_show_header)
Stefan Bellera29b0a12017-06-29 17:06:57 -07003529 emit_diff_symbol(o, DIFF_SYMBOL_HEADER,
3530 header.buf, header.len, 0);
Junio C Hamano06606262006-05-05 02:41:53 -07003531 goto free_ab_and_return;
Christian Couder296c6bb2010-05-26 04:50:12 +02003532 }
Stefan Bellera29b0a12017-06-29 17:06:57 -07003533 emit_diff_symbol(o, DIFF_SYMBOL_HEADER, header.buf, header.len, 0);
Greg Bacon3e97c7c2009-11-19 15:12:24 -06003534 strbuf_reset(&header);
Brandon Williams0d1e0e72017-10-31 11:19:11 -07003535 if (o->flags.binary)
Stefan Beller4eed0eb2017-06-29 17:07:01 -07003536 emit_binary_diff(o, &mf1, &mf2);
Stefan Beller4acaaa72017-06-29 17:06:58 -07003537 else {
3538 strbuf_addf(&sb, "%sBinary files %s and %s differ\n",
3539 diff_line_prefix(o), lbl[0], lbl[1]);
3540 emit_diff_symbol(o, DIFF_SYMBOL_BINARY_FILES,
3541 sb.buf, sb.len, 0);
3542 strbuf_release(&sb);
3543 }
Johannes Schindelin34a5e1a2007-02-25 23:34:54 +01003544 o->found_changes = 1;
Junio C Hamano467ddc12011-02-28 16:11:55 -08003545 } else {
Junio C Hamano6973dca2006-04-21 23:57:45 -07003546 /* Crazy xdl interfaces.. */
Jeff King0da0e922019-01-11 17:17:22 -05003547 const char *diffopts;
Jeff Kingae021d82014-06-18 15:47:50 -04003548 const char *v;
Junio C Hamano6973dca2006-04-21 23:57:45 -07003549 xpparam_t xpp;
3550 xdemitconf_t xecfg;
Junio C Hamano6973dca2006-04-21 23:57:45 -07003551 struct emit_callback ecbdata;
Jeff Kingbe58e702008-10-05 17:43:21 -04003552 const struct userdiff_funcname *pe;
Junio C Hamanof2584752007-07-06 00:45:10 -07003553
Junio C Hamanob3f01ff2012-02-29 18:14:16 -08003554 if (must_show_header) {
Stefan Bellera29b0a12017-06-29 17:06:57 -07003555 emit_diff_symbol(o, DIFF_SYMBOL_HEADER,
3556 header.buf, header.len, 0);
Greg Bacon3e97c7c2009-11-19 15:12:24 -06003557 strbuf_reset(&header);
3558 }
3559
Nguyễn Thái Ngọc Duy6afaf802018-09-21 17:57:22 +02003560 mf1.size = fill_textconv(o->repo, textconv_one, one, &mf1.ptr);
3561 mf2.size = fill_textconv(o->repo, textconv_two, two, &mf2.ptr);
Jeff King04427ac2008-10-26 00:44:53 -04003562
Nguyễn Thái Ngọc Duyacd00ea2018-09-21 17:57:33 +02003563 pe = diff_funcname_pattern(o, one);
Brandon Casey45e7ca02008-09-18 17:40:48 -05003564 if (!pe)
Nguyễn Thái Ngọc Duyacd00ea2018-09-21 17:57:33 +02003565 pe = diff_funcname_pattern(o, two);
Junio C Hamano6973dca2006-04-21 23:57:45 -07003566
Brian Downing9ccd0a82008-10-25 15:30:37 +02003567 memset(&xpp, 0, sizeof(xpp));
Johannes Schindelin30b25012007-07-04 19:05:46 +01003568 memset(&xecfg, 0, sizeof(xecfg));
Johannes Schindelincd112ce2006-06-13 18:45:44 +02003569 memset(&ecbdata, 0, sizeof(ecbdata));
Johannes Schindelin1cdde292018-08-13 04:33:11 -07003570 if (o->flags.suppress_diff_headers)
3571 lbl[0] = NULL;
Junio C Hamano6973dca2006-04-21 23:57:45 -07003572 ecbdata.label_path = lbl;
Jeff Kingdaa0c3d2011-08-17 22:04:23 -07003573 ecbdata.color_diff = want_color(o->use_color);
Nguyễn Thái Ngọc Duy26d024e2018-09-21 17:57:37 +02003574 ecbdata.ws_rule = whitespace_rule(o->repo->index, name_b);
Junio C Hamano690ed842009-09-04 00:41:15 -07003575 if (ecbdata.ws_rule & WS_BLANK_AT_EOF)
Junio C Hamanod68fe262009-09-14 22:05:57 -07003576 check_blank_at_eof(&mf1, &mf2, &ecbdata);
Bo Yanga3c158d2010-05-26 15:08:02 +08003577 ecbdata.opt = o;
Johannes Schindelin1cdde292018-08-13 04:33:11 -07003578 if (header.len && !o->flags.suppress_diff_headers)
3579 ecbdata.header = &header;
René Scharfe582aa002010-05-02 15:04:41 +02003580 xpp.flags = o->xdl_opts;
Jonathan Tan2477ab22017-11-27 11:47:47 -08003581 xpp.anchors = o->anchors;
3582 xpp.anchors_nr = o->anchors_nr;
Linus Torvaldsee1e5412006-05-13 13:23:48 -07003583 xecfg.ctxlen = o->context;
René Scharfe6d0e6742008-12-28 19:45:32 +01003584 xecfg.interhunkctxlen = o->interhunkcontext;
Junio C Hamano6973dca2006-04-21 23:57:45 -07003585 xecfg.flags = XDL_EMIT_FUNCNAMES;
Brandon Williams0d1e0e72017-10-31 11:19:11 -07003586 if (o->flags.funccontext)
René Scharfe14937c22011-10-09 13:36:57 +02003587 xecfg.flags |= XDL_EMIT_FUNCCONTEXT;
Brandon Casey45e7ca02008-09-18 17:40:48 -05003588 if (pe)
Brandon Caseya0135852008-09-18 17:42:48 -05003589 xdiff_set_find_func(&xecfg, pe->pattern, pe->cflags);
Jeff King0da0e922019-01-11 17:17:22 -05003590
3591 diffopts = getenv("GIT_DIFF_OPTS");
Junio C Hamano6973dca2006-04-21 23:57:45 -07003592 if (!diffopts)
3593 ;
Jeff Kingae021d82014-06-18 15:47:50 -04003594 else if (skip_prefix(diffopts, "--unified=", &v))
3595 xecfg.ctxlen = strtoul(v, NULL, 10);
3596 else if (skip_prefix(diffopts, "-u", &v))
3597 xecfg.ctxlen = strtoul(v, NULL, 10);
Jeff King0da0e922019-01-11 17:17:22 -05003598
Thomas Rast77d1a522012-03-14 19:24:08 +01003599 if (o->word_diff)
3600 init_diff_words_data(&ecbdata, o, one, two);
Jeff King9346d6d2018-11-02 02:35:45 -04003601 if (xdi_diff_outf(&mf1, &mf2, NULL, fn_out_consume,
3602 &ecbdata, &xpp, &xecfg))
Jeff King3efb9882015-09-24 19:12:23 -04003603 die("unable to generate diff for %s", one->path);
Thomas Rast882749a2010-04-14 17:59:06 +02003604 if (o->word_diff)
Johannes Schindelinf59a59e2006-07-28 23:56:15 +02003605 free_diff_words_data(&ecbdata);
Jeff King04427ac2008-10-26 00:44:53 -04003606 if (textconv_one)
3607 free(mf1.ptr);
3608 if (textconv_two)
3609 free(mf2.ptr);
René Scharfe8cfe5f12009-07-02 00:01:43 +02003610 xdiff_clear_find_func(&xecfg);
Junio C Hamano6973dca2006-04-21 23:57:45 -07003611 }
3612
3613 free_ab_and_return:
Greg Bacon3e97c7c2009-11-19 15:12:24 -06003614 strbuf_release(&header);
Junio C Hamanofc3abdf2007-05-03 13:05:48 -07003615 diff_free_filespec_data(one);
3616 diff_free_filespec_data(two);
Junio C Hamano6973dca2006-04-21 23:57:45 -07003617 free(a_one);
3618 free(b_two);
3619 return;
3620}
3621
Nguyễn Thái Ngọc Duyddf88fa2018-02-24 21:09:59 +07003622static char *get_compact_summary(const struct diff_filepair *p, int is_renamed)
3623{
3624 if (!is_renamed) {
3625 if (p->status == DIFF_STATUS_ADDED) {
3626 if (S_ISLNK(p->two->mode))
3627 return "new +l";
3628 else if ((p->two->mode & 0777) == 0755)
3629 return "new +x";
3630 else
3631 return "new";
3632 } else if (p->status == DIFF_STATUS_DELETED)
3633 return "gone";
3634 }
3635 if (S_ISLNK(p->one->mode) && !S_ISLNK(p->two->mode))
3636 return "mode -l";
3637 else if (!S_ISLNK(p->one->mode) && S_ISLNK(p->two->mode))
3638 return "mode +l";
3639 else if ((p->one->mode & 0777) == 0644 &&
3640 (p->two->mode & 0777) == 0755)
3641 return "mode +x";
3642 else if ((p->one->mode & 0777) == 0755 &&
3643 (p->two->mode & 0777) == 0644)
3644 return "mode -x";
3645 return NULL;
3646}
3647
Junio C Hamano6973dca2006-04-21 23:57:45 -07003648static void builtin_diffstat(const char *name_a, const char *name_b,
3649 struct diff_filespec *one,
3650 struct diff_filespec *two,
Junio C Hamano710158e2006-04-25 23:40:09 -07003651 struct diffstat_t *diffstat,
Johannes Schindelin0d21efa2006-06-14 17:40:23 +02003652 struct diff_options *o,
Linus Torvalds74faaa12012-10-17 10:00:37 -07003653 struct diff_filepair *p)
Junio C Hamano6973dca2006-04-21 23:57:45 -07003654{
3655 mmfile_t mf1, mf2;
3656 struct diffstat_file *data;
Zbigniew Jędrzejewski-Szmek352ca4e2012-05-01 19:10:15 +02003657 int same_contents;
Linus Torvalds74faaa12012-10-17 10:00:37 -07003658 int complete_rewrite = 0;
3659
3660 if (!DIFF_PAIR_UNMERGED(p)) {
3661 if (p->status == DIFF_STATUS_MODIFIED && p->score)
3662 complete_rewrite = 1;
3663 }
Junio C Hamano6973dca2006-04-21 23:57:45 -07003664
3665 data = diffstat_add(diffstat, name_a, name_b);
Junio C Hamano99bfd402012-11-27 11:17:14 -08003666 data->is_interesting = p->status != DIFF_STATUS_UNKNOWN;
Nguyễn Thái Ngọc Duyddf88fa2018-02-24 21:09:59 +07003667 if (o->flags.stat_with_summary)
3668 data->comments = get_compact_summary(p, data->is_renamed);
Junio C Hamano6973dca2006-04-21 23:57:45 -07003669
3670 if (!one || !two) {
3671 data->is_unmerged = 1;
3672 return;
3673 }
Jeff Kingded0abc2011-02-19 03:04:56 -05003674
Jeff King4a7e27e2018-08-28 17:22:40 -04003675 same_contents = oideq(&one->oid, &two->oid);
Zbigniew Jędrzejewski-Szmek352ca4e2012-05-01 19:10:15 +02003676
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +02003677 if (diff_filespec_is_binary(o->repo, one) ||
3678 diff_filespec_is_binary(o->repo, two)) {
Jeff Kingded0abc2011-02-19 03:04:56 -05003679 data->is_binary = 1;
Zbigniew Jędrzejewski-Szmek352ca4e2012-05-01 19:10:15 +02003680 if (same_contents) {
Zbigniew Jędrzejewski-Szmeke18872b2012-05-01 19:10:14 +02003681 data->added = 0;
3682 data->deleted = 0;
3683 } else {
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +02003684 data->added = diff_filespec_size(o->repo, two);
3685 data->deleted = diff_filespec_size(o->repo, one);
Zbigniew Jędrzejewski-Szmeke18872b2012-05-01 19:10:14 +02003686 }
Jeff Kingded0abc2011-02-19 03:04:56 -05003687 }
3688
3689 else if (complete_rewrite) {
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +02003690 diff_populate_filespec(o->repo, one, 0);
3691 diff_populate_filespec(o->repo, two, 0);
Junio C Hamano710158e2006-04-25 23:40:09 -07003692 data->deleted = count_lines(one->data, one->size);
3693 data->added = count_lines(two->data, two->size);
Junio C Hamano710158e2006-04-25 23:40:09 -07003694 }
Junio C Hamano6973dca2006-04-21 23:57:45 -07003695
Zbigniew Jędrzejewski-Szmek352ca4e2012-05-01 19:10:15 +02003696 else if (!same_contents) {
Junio C Hamano6973dca2006-04-21 23:57:45 -07003697 /* Crazy xdl interfaces.. */
3698 xpparam_t xpp;
3699 xdemitconf_t xecfg;
Junio C Hamano6973dca2006-04-21 23:57:45 -07003700
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +02003701 if (fill_mmfile(o->repo, &mf1, one) < 0 ||
3702 fill_mmfile(o->repo, &mf2, two) < 0)
Jeff Kingded0abc2011-02-19 03:04:56 -05003703 die("unable to read files to diff");
3704
Brian Downing9ccd0a82008-10-25 15:30:37 +02003705 memset(&xpp, 0, sizeof(xpp));
Johannes Schindelin30b25012007-07-04 19:05:46 +01003706 memset(&xecfg, 0, sizeof(xecfg));
René Scharfe582aa002010-05-02 15:04:41 +02003707 xpp.flags = o->xdl_opts;
Jonathan Tan2477ab22017-11-27 11:47:47 -08003708 xpp.anchors = o->anchors;
3709 xpp.anchors_nr = o->anchors_nr;
Junio C Hamanof01cae92011-09-22 10:54:47 -07003710 xecfg.ctxlen = o->context;
3711 xecfg.interhunkctxlen = o->interhunkcontext;
Jeff King3b40a092018-11-02 02:36:06 -04003712 if (xdi_diff_outf(&mf1, &mf2, discard_hunk_line,
3713 diffstat_consume, diffstat, &xpp, &xecfg))
Jeff King3efb9882015-09-24 19:12:23 -04003714 die("unable to generate diffstat for %s", one->path);
Junio C Hamano6973dca2006-04-21 23:57:45 -07003715 }
Junio C Hamanofc3abdf2007-05-03 13:05:48 -07003716
Junio C Hamanofc3abdf2007-05-03 13:05:48 -07003717 diff_free_filespec_data(one);
3718 diff_free_filespec_data(two);
Junio C Hamano6973dca2006-04-21 23:57:45 -07003719}
3720
Johannes Schindelin88246892006-05-20 23:43:13 +02003721static void builtin_checkdiff(const char *name_a, const char *name_b,
Junio C Hamanocd676a52008-02-12 14:26:02 -08003722 const char *attr_path,
Junio C Hamano5ff10dd2008-06-26 15:34:54 -07003723 struct diff_filespec *one,
3724 struct diff_filespec *two,
3725 struct diff_options *o)
Johannes Schindelin88246892006-05-20 23:43:13 +02003726{
3727 mmfile_t mf1, mf2;
3728 struct checkdiff_t data;
3729
3730 if (!two)
3731 return;
3732
3733 memset(&data, 0, sizeof(data));
Johannes Schindelin88246892006-05-20 23:43:13 +02003734 data.filename = name_b ? name_b : name_a;
3735 data.lineno = 0;
Junio C Hamano1ba111d2008-06-26 15:36:34 -07003736 data.o = o;
Nguyễn Thái Ngọc Duy26d024e2018-09-21 17:57:37 +02003737 data.ws_rule = whitespace_rule(o->repo->index, attr_path);
Nguyễn Thái Ngọc Duy32eaa462018-09-21 17:57:27 +02003738 data.conflict_marker_size = ll_merge_marker_size(o->repo->index, attr_path);
Johannes Schindelin88246892006-05-20 23:43:13 +02003739
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +02003740 if (fill_mmfile(o->repo, &mf1, one) < 0 ||
3741 fill_mmfile(o->repo, &mf2, two) < 0)
Johannes Schindelin88246892006-05-20 23:43:13 +02003742 die("unable to read files to diff");
3743
Junio C Hamano5ff10dd2008-06-26 15:34:54 -07003744 /*
3745 * All the other codepaths check both sides, but not checking
3746 * the "old" side here is deliberate. We are checking the newly
3747 * introduced changes, and as long as the "new" side is text, we
3748 * can and should check what it introduces.
3749 */
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +02003750 if (diff_filespec_is_binary(o->repo, two))
Junio C Hamanofc3abdf2007-05-03 13:05:48 -07003751 goto free_and_return;
Johannes Schindelin88246892006-05-20 23:43:13 +02003752 else {
3753 /* Crazy xdl interfaces.. */
3754 xpparam_t xpp;
3755 xdemitconf_t xecfg;
Johannes Schindelin88246892006-05-20 23:43:13 +02003756
Brian Downing9ccd0a82008-10-25 15:30:37 +02003757 memset(&xpp, 0, sizeof(xpp));
Johannes Schindelin30b25012007-07-04 19:05:46 +01003758 memset(&xecfg, 0, sizeof(xecfg));
Junio C Hamanoc35539e2008-08-20 11:47:55 -07003759 xecfg.ctxlen = 1; /* at least one context line */
René Scharfe582aa002010-05-02 15:04:41 +02003760 xpp.flags = 0;
Jeff King75ab7632018-11-02 02:39:03 -04003761 if (xdi_diff_outf(&mf1, &mf2, checkdiff_consume_hunk,
3762 checkdiff_consume, &data,
Jeff King3efb9882015-09-24 19:12:23 -04003763 &xpp, &xecfg))
3764 die("unable to generate checkdiff for %s", one->path);
Junio C Hamano877f23c2008-06-26 15:36:59 -07003765
Junio C Hamano467babf2009-09-03 23:39:43 -07003766 if (data.ws_rule & WS_BLANK_AT_EOF) {
Junio C Hamanod68fe262009-09-14 22:05:57 -07003767 struct emit_callback ecbdata;
3768 int blank_at_eof;
3769
3770 ecbdata.ws_rule = data.ws_rule;
3771 check_blank_at_eof(&mf1, &mf2, &ecbdata);
Christoph Mallon8837d332010-10-10 19:24:06 +02003772 blank_at_eof = ecbdata.blank_at_eof_in_postimage;
Junio C Hamanod68fe262009-09-14 22:05:57 -07003773
Junio C Hamano467babf2009-09-03 23:39:43 -07003774 if (blank_at_eof) {
3775 static char *err;
3776 if (!err)
3777 err = whitespace_error_string(WS_BLANK_AT_EOF);
3778 fprintf(o->file, "%s:%d: %s.\n",
3779 data.filename, blank_at_eof, err);
3780 data.status = 1; /* report errors */
3781 }
Junio C Hamano877f23c2008-06-26 15:36:59 -07003782 }
Johannes Schindelin88246892006-05-20 23:43:13 +02003783 }
Junio C Hamanofc3abdf2007-05-03 13:05:48 -07003784 free_and_return:
3785 diff_free_filespec_data(one);
3786 diff_free_filespec_data(two);
Wincent Colaiuta62c64892007-12-13 21:24:52 +01003787 if (data.status)
Brandon Williams0d1e0e72017-10-31 11:19:11 -07003788 o->flags.check_failed = 1;
Johannes Schindelin88246892006-05-20 23:43:13 +02003789}
3790
Junio C Hamano6973dca2006-04-21 23:57:45 -07003791struct diff_filespec *alloc_filespec(const char *path)
3792{
Jeff King96ffc062016-02-22 17:44:32 -05003793 struct diff_filespec *spec;
Junio C Hamano6973dca2006-04-21 23:57:45 -07003794
Jeff King96ffc062016-02-22 17:44:32 -05003795 FLEXPTR_ALLOC_STR(spec, path, path);
Linus Torvalds9fb88412007-10-25 11:19:10 -07003796 spec->count = 1;
Jeff King122aa6f2008-10-05 17:43:36 -04003797 spec->is_binary = -1;
Junio C Hamano6973dca2006-04-21 23:57:45 -07003798 return spec;
3799}
3800
Linus Torvalds9fb88412007-10-25 11:19:10 -07003801void free_filespec(struct diff_filespec *spec)
3802{
3803 if (!--spec->count) {
3804 diff_free_filespec_data(spec);
3805 free(spec);
3806 }
3807}
3808
Brandon Williamsf9704c22017-05-30 10:30:50 -07003809void fill_filespec(struct diff_filespec *spec, const struct object_id *oid,
3810 int oid_valid, unsigned short mode)
Junio C Hamano6973dca2006-04-21 23:57:45 -07003811{
3812 if (mode) {
3813 spec->mode = canon_mode(mode);
Brandon Williamsf9704c22017-05-30 10:30:50 -07003814 oidcpy(&spec->oid, oid);
3815 spec->oid_valid = oid_valid;
Junio C Hamano6973dca2006-04-21 23:57:45 -07003816 }
3817}
3818
3819/*
Jakub Narebski5adf3172007-05-26 00:37:40 +02003820 * Given a name and sha1 pair, if the index tells us the file in
Junio C Hamano6973dca2006-04-21 23:57:45 -07003821 * the work tree has that object contents, return true, so that
3822 * prepare_temp_file() does not have to inflate and extract.
3823 */
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +02003824static int reuse_worktree_file(struct index_state *istate,
3825 const char *name,
3826 const struct object_id *oid,
3827 int want_file)
Junio C Hamano6973dca2006-04-21 23:57:45 -07003828{
Nguyễn Thái Ngọc Duy9c5e6c82013-07-09 22:29:00 +07003829 const struct cache_entry *ce;
Junio C Hamano6973dca2006-04-21 23:57:45 -07003830 struct stat st;
3831 int pos, len;
3832
Junio C Hamano150115a2009-03-22 15:26:07 -07003833 /*
3834 * We do not read the cache ourselves here, because the
Junio C Hamano6973dca2006-04-21 23:57:45 -07003835 * benchmark with my previous version that always reads cache
3836 * shows that it makes things worse for diff-tree comparing
3837 * two linux-2.6 kernel trees in an already checked out work
3838 * tree. This is because most diff-tree comparisons deal with
3839 * only a small number of files, while reading the cache is
3840 * expensive for a large project, and its cost outweighs the
3841 * savings we get by not inflating the object to a temporary
3842 * file. Practically, this code only helps when we are used
3843 * by diff-cache --cached, which does read the cache before
3844 * calling us.
3845 */
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +02003846 if (!istate->cache)
Junio C Hamano6973dca2006-04-21 23:57:45 -07003847 return 0;
3848
Shawn O. Pearce1510fea2006-12-14 06:15:57 -05003849 /* We want to avoid the working directory if our caller
3850 * doesn't need the data in a normal file, this system
3851 * is rather slow with its stat/open/mmap/close syscalls,
3852 * and the object is contained in a pack file. The pack
3853 * is probably already open and will be faster to obtain
3854 * the data through than the working directory. Loose
3855 * objects however would tend to be slower as they need
3856 * to be individually opened and inflated.
3857 */
brian m. carlson14c3c802018-05-02 00:25:33 +00003858 if (!FAST_WORKING_DIRECTORY && !want_file && has_object_pack(oid))
Shawn O. Pearce1510fea2006-12-14 06:15:57 -05003859 return 0;
3860
Jeff King06dec432016-07-22 11:27:53 -04003861 /*
3862 * Similarly, if we'd have to convert the file contents anyway, that
3863 * makes the optimization not worthwhile.
3864 */
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +02003865 if (!want_file && would_convert_to_git(istate, name))
Jeff King06dec432016-07-22 11:27:53 -04003866 return 0;
3867
Junio C Hamano6973dca2006-04-21 23:57:45 -07003868 len = strlen(name);
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +02003869 pos = index_name_pos(istate, name, len);
Junio C Hamano6973dca2006-04-21 23:57:45 -07003870 if (pos < 0)
3871 return 0;
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +02003872 ce = istate->cache[pos];
Junio C Hamanoeadb5832008-01-18 23:45:24 -08003873
3874 /*
3875 * This is not the sha1 we are looking for, or
3876 * unreusable because it is not a regular file.
Junio C Hamano6973dca2006-04-21 23:57:45 -07003877 */
Jeff King9001dc22018-08-28 17:22:48 -04003878 if (!oideq(oid, &ce->oid) || !S_ISREG(ce->ce_mode))
Junio C Hamanoeadb5832008-01-18 23:45:24 -08003879 return 0;
3880
3881 /*
Junio C Hamano150115a2009-03-22 15:26:07 -07003882 * If ce is marked as "assume unchanged", there is no
3883 * guarantee that work tree matches what we are looking for.
3884 */
Nguyễn Thái Ngọc Duyb4d16902009-08-20 20:46:58 +07003885 if ((ce->ce_flags & CE_VALID) || ce_skip_worktree(ce))
Junio C Hamano150115a2009-03-22 15:26:07 -07003886 return 0;
3887
3888 /*
Junio C Hamanoeadb5832008-01-18 23:45:24 -08003889 * If ce matches the file in the work tree, we can reuse it.
3890 */
3891 if (ce_uptodate(ce) ||
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +02003892 (!lstat(name, &st) && !ie_match_stat(istate, ce, &st, 0)))
Junio C Hamanoeadb5832008-01-18 23:45:24 -08003893 return 1;
3894
3895 return 0;
Junio C Hamano6973dca2006-04-21 23:57:45 -07003896}
3897
Linus Torvalds04786752007-04-15 11:14:28 -07003898static int diff_populate_gitlink(struct diff_filespec *s, int size_only)
3899{
Jeff Kingb1ddfb92016-02-22 17:45:08 -05003900 struct strbuf buf = STRBUF_INIT;
3901 char *dirty = "";
Junio C Hamano8e08b412010-01-16 18:42:53 +01003902
3903 /* Are we looking at the work tree? */
Jens Lehmann85adbf22010-03-12 22:23:52 +01003904 if (s->dirty_submodule)
Junio C Hamano8e08b412010-01-16 18:42:53 +01003905 dirty = "-dirty";
3906
brian m. carlsona0d12c42016-06-24 23:09:23 +00003907 strbuf_addf(&buf, "Subproject commit %s%s\n",
3908 oid_to_hex(&s->oid), dirty);
Jeff Kingb1ddfb92016-02-22 17:45:08 -05003909 s->size = buf.len;
Linus Torvalds04786752007-04-15 11:14:28 -07003910 if (size_only) {
3911 s->data = NULL;
Jeff Kingb1ddfb92016-02-22 17:45:08 -05003912 strbuf_release(&buf);
3913 } else {
3914 s->data = strbuf_detach(&buf, NULL);
3915 s->should_free = 1;
Linus Torvalds04786752007-04-15 11:14:28 -07003916 }
3917 return 0;
3918}
3919
Junio C Hamano6973dca2006-04-21 23:57:45 -07003920/*
3921 * While doing rename detection and pickaxe operation, we may need to
3922 * grab the data for the blob (or file) for our own in-core comparison.
3923 * diff_filespec has data and size fields for this purpose.
3924 */
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +02003925int diff_populate_filespec(struct repository *r,
3926 struct diff_filespec *s,
3927 unsigned int flags)
Junio C Hamano6973dca2006-04-21 23:57:45 -07003928{
Nguyễn Thái Ngọc Duy8e5dd3d2014-08-16 10:08:04 +07003929 int size_only = flags & CHECK_SIZE_ONLY;
Junio C Hamano6973dca2006-04-21 23:57:45 -07003930 int err = 0;
Torsten Bögershausen8462ff42018-01-13 23:49:31 +01003931 int conv_flags = global_conv_flags_eol;
Junio C Hamano5430bb22013-06-24 14:35:04 -07003932 /*
3933 * demote FAIL to WARN to allow inspecting the situation
3934 * instead of refusing.
3935 */
Torsten Bögershausen8462ff42018-01-13 23:49:31 +01003936 if (conv_flags & CONV_EOL_RNDTRP_DIE)
3937 conv_flags = CONV_EOL_RNDTRP_WARN;
Junio C Hamano5430bb22013-06-24 14:35:04 -07003938
Junio C Hamano6973dca2006-04-21 23:57:45 -07003939 if (!DIFF_FILE_VALID(s))
3940 die("internal error: asking to populate invalid file.");
3941 if (S_ISDIR(s->mode))
3942 return -1;
3943
Junio C Hamano6973dca2006-04-21 23:57:45 -07003944 if (s->data)
Junio C Hamanofc3abdf2007-05-03 13:05:48 -07003945 return 0;
Linus Torvalds04786752007-04-15 11:14:28 -07003946
Junio C Hamano6e0b8ed2007-05-07 01:14:21 -07003947 if (size_only && 0 < s->size)
3948 return 0;
3949
Martin Waitz302b9282007-05-21 22:08:28 +02003950 if (S_ISGITLINK(s->mode))
Linus Torvalds04786752007-04-15 11:14:28 -07003951 return diff_populate_gitlink(s, size_only);
3952
brian m. carlson41c95602016-06-24 23:09:24 +00003953 if (!s->oid_valid ||
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +02003954 reuse_worktree_file(r->index, s->path, &s->oid, 0)) {
Brandon Caseyf285a2d2008-10-09 14:12:12 -05003955 struct strbuf buf = STRBUF_INIT;
Junio C Hamano6973dca2006-04-21 23:57:45 -07003956 struct stat st;
3957 int fd;
Linus Torvalds6c510be2007-02-13 11:07:23 -08003958
Junio C Hamano6973dca2006-04-21 23:57:45 -07003959 if (lstat(s->path, &st) < 0) {
Andrey Okoshkin10e0ca82017-10-27 12:33:25 +03003960 err_empty:
3961 err = -1;
3962 empty:
3963 s->data = (char *)"";
3964 s->size = 0;
3965 return err;
Junio C Hamano6973dca2006-04-21 23:57:45 -07003966 }
Shawn O. Pearcedc49cd72007-03-06 20:44:37 -05003967 s->size = xsize_t(st.st_size);
Junio C Hamano6973dca2006-04-21 23:57:45 -07003968 if (!s->size)
3969 goto empty;
Junio C Hamano6973dca2006-04-21 23:57:45 -07003970 if (S_ISLNK(st.st_mode)) {
Linus Torvaldscf219d82008-12-17 10:26:13 -08003971 struct strbuf sb = STRBUF_INIT;
3972
3973 if (strbuf_readlink(&sb, s->path, s->size))
Junio C Hamano6973dca2006-04-21 23:57:45 -07003974 goto err_empty;
René Scharfe0956a6d2008-12-18 17:56:51 +01003975 s->size = sb.len;
3976 s->data = strbuf_detach(&sb, NULL);
Linus Torvaldscf219d82008-12-17 10:26:13 -08003977 s->should_free = 1;
Junio C Hamano6973dca2006-04-21 23:57:45 -07003978 return 0;
3979 }
Junio C Hamano12426e12017-03-01 18:04:44 +01003980
3981 /*
3982 * Even if the caller would be happy with getting
3983 * only the size, we cannot return early at this
3984 * point if the path requires us to run the content
3985 * conversion.
3986 */
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +02003987 if (size_only && !would_convert_to_git(r->index, s->path))
Linus Torvaldscf219d82008-12-17 10:26:13 -08003988 return 0;
Junio C Hamano12426e12017-03-01 18:04:44 +01003989
3990 /*
3991 * Note: this check uses xsize_t(st.st_size) that may
3992 * not be the true size of the blob after it goes
3993 * through convert_to_git(). This may not strictly be
3994 * correct, but the whole point of big_file_threshold
3995 * and is_binary check being that we want to avoid
3996 * opening the file and inspecting the contents, this
3997 * is probably fine.
3998 */
Nguyễn Thái Ngọc Duy6bf3b812014-08-16 10:08:05 +07003999 if ((flags & CHECK_BINARY) &&
4000 s->size > big_file_threshold && s->is_binary == -1) {
4001 s->is_binary = 1;
4002 return 0;
4003 }
Junio C Hamano6973dca2006-04-21 23:57:45 -07004004 fd = open(s->path, O_RDONLY);
4005 if (fd < 0)
4006 goto err_empty;
Shawn O. Pearcec4712e42006-12-24 00:47:23 -05004007 s->data = xmmap(NULL, s->size, PROT_READ, MAP_PRIVATE, fd, 0);
Junio C Hamano6973dca2006-04-21 23:57:45 -07004008 close(fd);
Junio C Hamano6973dca2006-04-21 23:57:45 -07004009 s->should_munmap = 1;
Linus Torvalds6c510be2007-02-13 11:07:23 -08004010
4011 /*
4012 * Convert from working tree format to canonical git format
4013 */
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +02004014 if (convert_to_git(r->index, s->path, s->data, s->size, &buf, conv_flags)) {
René Scharfec32f7492007-10-21 11:23:49 +02004015 size_t size = 0;
Linus Torvalds6c510be2007-02-13 11:07:23 -08004016 munmap(s->data, s->size);
4017 s->should_munmap = 0;
René Scharfec32f7492007-10-21 11:23:49 +02004018 s->data = strbuf_detach(&buf, &size);
4019 s->size = size;
Linus Torvalds6c510be2007-02-13 11:07:23 -08004020 s->should_free = 1;
4021 }
Junio C Hamano6973dca2006-04-21 23:57:45 -07004022 }
4023 else {
Nicolas Pitre21666f12007-02-26 14:55:59 -05004024 enum object_type type;
Nguyễn Thái Ngọc Duy6bf3b812014-08-16 10:08:05 +07004025 if (size_only || (flags & CHECK_BINARY)) {
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +02004026 type = oid_object_info(r, &s->oid, &s->size);
Nicolas Pitrec50c4312010-10-22 00:02:27 -04004027 if (type < 0)
brian m. carlsona0d12c42016-06-24 23:09:23 +00004028 die("unable to read %s",
4029 oid_to_hex(&s->oid));
Nguyễn Thái Ngọc Duy6bf3b812014-08-16 10:08:05 +07004030 if (size_only)
4031 return 0;
4032 if (s->size > big_file_threshold && s->is_binary == -1) {
4033 s->is_binary = 1;
4034 return 0;
4035 }
Junio C Hamano6973dca2006-04-21 23:57:45 -07004036 }
brian m. carlsonb4f5aca2018-03-12 02:27:53 +00004037 s->data = read_object_file(&s->oid, &type, &s->size);
Nguyễn Thái Ngọc Duy6bf3b812014-08-16 10:08:05 +07004038 if (!s->data)
brian m. carlsona0d12c42016-06-24 23:09:23 +00004039 die("unable to read %s", oid_to_hex(&s->oid));
Nguyễn Thái Ngọc Duy6bf3b812014-08-16 10:08:05 +07004040 s->should_free = 1;
Junio C Hamano6973dca2006-04-21 23:57:45 -07004041 }
4042 return 0;
4043}
4044
Junio C Hamano8ae92e62007-10-02 21:01:03 -07004045void diff_free_filespec_blob(struct diff_filespec *s)
Junio C Hamano6973dca2006-04-21 23:57:45 -07004046{
4047 if (s->should_free)
4048 free(s->data);
4049 else if (s->should_munmap)
4050 munmap(s->data, s->size);
Junio C Hamanofc3abdf2007-05-03 13:05:48 -07004051
4052 if (s->should_free || s->should_munmap) {
4053 s->should_free = s->should_munmap = 0;
4054 s->data = NULL;
4055 }
Jeff Kingeede7b72007-09-25 15:29:42 -04004056}
4057
4058void diff_free_filespec_data(struct diff_filespec *s)
4059{
Junio C Hamano8ae92e62007-10-02 21:01:03 -07004060 diff_free_filespec_blob(s);
Ævar Arnfjörð Bjarmason6a83d902017-06-15 23:15:46 +00004061 FREE_AND_NULL(s->cnt_data);
Junio C Hamano6973dca2006-04-21 23:57:45 -07004062}
4063
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +02004064static void prep_temp_blob(struct index_state *istate,
4065 const char *path, struct diff_tempfile *temp,
Junio C Hamano6973dca2006-04-21 23:57:45 -07004066 void *blob,
4067 unsigned long size,
brian m. carlson09bdff22016-06-24 23:09:29 +00004068 const struct object_id *oid,
Junio C Hamano6973dca2006-04-21 23:57:45 -07004069 int mode)
4070{
Johannes Schindelin4e218f52009-03-21 12:42:52 +01004071 struct strbuf buf = STRBUF_INIT;
Brandon Williamsc2a46a72018-02-14 10:59:54 -08004072 struct strbuf tempfile = STRBUF_INIT;
David Aguilar003b33a2009-05-31 01:35:52 -07004073 char *path_dup = xstrdup(path);
4074 const char *base = basename(path_dup);
Junio C Hamano6973dca2006-04-21 23:57:45 -07004075
David Aguilar003b33a2009-05-31 01:35:52 -07004076 /* Generate "XXXXXX_basename.ext" */
Brandon Williamsc2a46a72018-02-14 10:59:54 -08004077 strbuf_addstr(&tempfile, "XXXXXX_");
4078 strbuf_addstr(&tempfile, base);
David Aguilar003b33a2009-05-31 01:35:52 -07004079
Brandon Williamsc2a46a72018-02-14 10:59:54 -08004080 temp->tempfile = mks_tempfile_ts(tempfile.buf, strlen(base) + 1);
Jeff King076aa2c2017-09-05 08:15:08 -04004081 if (!temp->tempfile)
Thomas Rastd824cbb2009-06-27 17:58:46 +02004082 die_errno("unable to create temp-file");
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +02004083 if (convert_to_working_tree(istate, path,
Johannes Schindelin4e218f52009-03-21 12:42:52 +01004084 (const char *)blob, (size_t)size, &buf)) {
4085 blob = buf.buf;
4086 size = buf.len;
4087 }
Junio C Hamanoc50424a2017-09-25 15:24:06 +09004088 if (write_in_full(temp->tempfile->fd, blob, size) < 0 ||
Jeff King076aa2c2017-09-05 08:15:08 -04004089 close_tempfile_gently(temp->tempfile))
Thomas Rast0721c312009-06-27 17:58:47 +02004090 die_errno("unable to write temp-file");
Jeff King076aa2c2017-09-05 08:15:08 -04004091 temp->name = get_tempfile_path(temp->tempfile);
brian m. carlson09bdff22016-06-24 23:09:29 +00004092 oid_to_hex_r(temp->hex, oid);
Jeff King5096d492015-09-24 17:06:08 -04004093 xsnprintf(temp->mode, sizeof(temp->mode), "%06o", mode);
Johannes Schindelin4e218f52009-03-21 12:42:52 +01004094 strbuf_release(&buf);
Brandon Williamsc2a46a72018-02-14 10:59:54 -08004095 strbuf_release(&tempfile);
David Aguilar003b33a2009-05-31 01:35:52 -07004096 free(path_dup);
Junio C Hamano6973dca2006-04-21 23:57:45 -07004097}
4098
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +02004099static struct diff_tempfile *prepare_temp_file(struct repository *r,
4100 const char *name,
4101 struct diff_filespec *one)
Junio C Hamano6973dca2006-04-21 23:57:45 -07004102{
Jeff King479b0ae2009-01-22 00:59:56 -05004103 struct diff_tempfile *temp = claim_diff_tempfile();
4104
Junio C Hamano6973dca2006-04-21 23:57:45 -07004105 if (!DIFF_FILE_VALID(one)) {
4106 not_a_valid_file:
4107 /* A '-' entry produces this for file-2, and
4108 * a '+' entry produces this for file-1.
4109 */
4110 temp->name = "/dev/null";
Jeff King5096d492015-09-24 17:06:08 -04004111 xsnprintf(temp->hex, sizeof(temp->hex), ".");
4112 xsnprintf(temp->mode, sizeof(temp->mode), ".");
Jeff King479b0ae2009-01-22 00:59:56 -05004113 return temp;
4114 }
4115
Thomas Rastaba47272014-02-16 17:52:34 +01004116 if (!S_ISGITLINK(one->mode) &&
brian m. carlson41c95602016-06-24 23:09:24 +00004117 (!one->oid_valid ||
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +02004118 reuse_worktree_file(r->index, name, &one->oid, 1))) {
Junio C Hamano6973dca2006-04-21 23:57:45 -07004119 struct stat st;
4120 if (lstat(name, &st) < 0) {
4121 if (errno == ENOENT)
4122 goto not_a_valid_file;
Thomas Rastd824cbb2009-06-27 17:58:46 +02004123 die_errno("stat(%s)", name);
Junio C Hamano6973dca2006-04-21 23:57:45 -07004124 }
4125 if (S_ISLNK(st.st_mode)) {
Jeff King3cd73882009-05-25 06:46:09 -04004126 struct strbuf sb = STRBUF_INIT;
4127 if (strbuf_readlink(&sb, name, st.st_size) < 0)
Thomas Rast0721c312009-06-27 17:58:47 +02004128 die_errno("readlink(%s)", name);
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +02004129 prep_temp_blob(r->index, name, temp, sb.buf, sb.len,
brian m. carlson41c95602016-06-24 23:09:24 +00004130 (one->oid_valid ?
brian m. carlson09bdff22016-06-24 23:09:29 +00004131 &one->oid : &null_oid),
brian m. carlson41c95602016-06-24 23:09:24 +00004132 (one->oid_valid ?
Junio C Hamano6973dca2006-04-21 23:57:45 -07004133 one->mode : S_IFLNK));
Jeff King3cd73882009-05-25 06:46:09 -04004134 strbuf_release(&sb);
Junio C Hamano6973dca2006-04-21 23:57:45 -07004135 }
4136 else {
4137 /* we can borrow from the file in the work tree */
4138 temp->name = name;
brian m. carlson41c95602016-06-24 23:09:24 +00004139 if (!one->oid_valid)
Brandon Williams74014152017-05-30 10:30:52 -07004140 oid_to_hex_r(temp->hex, &null_oid);
Junio C Hamano6973dca2006-04-21 23:57:45 -07004141 else
René Scharfe24905742017-01-28 23:03:03 +01004142 oid_to_hex_r(temp->hex, &one->oid);
Junio C Hamano6973dca2006-04-21 23:57:45 -07004143 /* Even though we may sometimes borrow the
4144 * contents from the work tree, we always want
4145 * one->mode. mode is trustworthy even when
Brandon Williams74014152017-05-30 10:30:52 -07004146 * !(one->oid_valid), as long as
Junio C Hamano6973dca2006-04-21 23:57:45 -07004147 * DIFF_FILE_VALID(one).
4148 */
Jeff King5096d492015-09-24 17:06:08 -04004149 xsnprintf(temp->mode, sizeof(temp->mode), "%06o", one->mode);
Junio C Hamano6973dca2006-04-21 23:57:45 -07004150 }
Jeff King479b0ae2009-01-22 00:59:56 -05004151 return temp;
Junio C Hamano6973dca2006-04-21 23:57:45 -07004152 }
4153 else {
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +02004154 if (diff_populate_filespec(r, one, 0))
Junio C Hamano6973dca2006-04-21 23:57:45 -07004155 die("cannot read data blob for %s", one->path);
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +02004156 prep_temp_blob(r->index, name, temp,
4157 one->data, one->size,
brian m. carlson09bdff22016-06-24 23:09:29 +00004158 &one->oid, one->mode);
Junio C Hamano6973dca2006-04-21 23:57:45 -07004159 }
Jeff King479b0ae2009-01-22 00:59:56 -05004160 return temp;
Junio C Hamano6973dca2006-04-21 23:57:45 -07004161}
4162
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +02004163static void add_external_diff_name(struct repository *r,
4164 struct argv_array *argv,
Jeff Kingf3efe782014-04-19 15:22:25 -04004165 const char *name,
4166 struct diff_filespec *df)
4167{
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +02004168 struct diff_tempfile *temp = prepare_temp_file(r, name, df);
Jeff Kingf3efe782014-04-19 15:22:25 -04004169 argv_array_push(argv, temp->name);
4170 argv_array_push(argv, temp->hex);
4171 argv_array_push(argv, temp->mode);
4172}
4173
Junio C Hamano6973dca2006-04-21 23:57:45 -07004174/* An external diff command takes:
4175 *
4176 * diff-cmd name infile1 infile1-sha1 infile1-mode \
4177 * infile2 infile2-sha1 infile2-mode [ rename-to ]
4178 *
4179 */
4180static void run_external_diff(const char *pgm,
4181 const char *name,
4182 const char *other,
4183 struct diff_filespec *one,
4184 struct diff_filespec *two,
4185 const char *xfrm_msg,
Zoltan Klingeree7fb0b2013-12-06 10:38:46 +11004186 struct diff_options *o)
Junio C Hamano6973dca2006-04-21 23:57:45 -07004187{
Jeff King82fbf262014-04-19 15:17:06 -04004188 struct argv_array argv = ARGV_ARRAY_INIT;
Jeff Kingae049c92014-04-19 15:17:25 -04004189 struct argv_array env = ARGV_ARRAY_INIT;
Zoltan Klingeree7fb0b2013-12-06 10:38:46 +11004190 struct diff_queue_struct *q = &diff_queued_diff;
Junio C Hamano6973dca2006-04-21 23:57:45 -07004191
Jeff King0d4217d2014-04-19 15:20:46 -04004192 argv_array_push(&argv, pgm);
4193 argv_array_push(&argv, name);
Junio C Hamano6973dca2006-04-21 23:57:45 -07004194
Junio C Hamano6973dca2006-04-21 23:57:45 -07004195 if (one && two) {
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +02004196 add_external_diff_name(o->repo, &argv, name, one);
Jeff Kingf3efe782014-04-19 15:22:25 -04004197 if (!other)
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +02004198 add_external_diff_name(o->repo, &argv, name, two);
Jeff Kingf3efe782014-04-19 15:22:25 -04004199 else {
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +02004200 add_external_diff_name(o->repo, &argv, other, two);
Jeff King82fbf262014-04-19 15:17:06 -04004201 argv_array_push(&argv, other);
4202 argv_array_push(&argv, xfrm_msg);
Junio C Hamano6973dca2006-04-21 23:57:45 -07004203 }
Junio C Hamano6973dca2006-04-21 23:57:45 -07004204 }
Zoltan Klingeree7fb0b2013-12-06 10:38:46 +11004205
Jeff Kingae049c92014-04-19 15:17:25 -04004206 argv_array_pushf(&env, "GIT_DIFF_PATH_COUNTER=%d", ++o->diff_path_counter);
4207 argv_array_pushf(&env, "GIT_DIFF_PATH_TOTAL=%d", q->nr);
Zoltan Klingeree7fb0b2013-12-06 10:38:46 +11004208
Jeff King89294d12014-04-19 15:19:19 -04004209 if (run_command_v_opt_cd_env(argv.argv, RUN_USING_SHELL, NULL, env.argv))
4210 die(_("external diff died, stopping at %s"), name);
4211
Junio C Hamano6973dca2006-04-21 23:57:45 -07004212 remove_tempfile();
Jeff King82fbf262014-04-19 15:17:06 -04004213 argv_array_clear(&argv);
Jeff Kingae049c92014-04-19 15:17:25 -04004214 argv_array_clear(&env);
Junio C Hamano6973dca2006-04-21 23:57:45 -07004215}
4216
Junio C Hamanob67b9612009-01-26 00:08:24 -08004217static int similarity_index(struct diff_filepair *p)
4218{
4219 return p->score * 100 / MAX_SCORE;
4220}
4221
Jeff King4f036662016-10-20 02:21:25 -04004222static const char *diff_abbrev_oid(const struct object_id *oid, int abbrev)
4223{
4224 if (startup_info->have_repository)
brian m. carlsonaab95832018-03-12 02:27:30 +00004225 return find_unique_abbrev(oid, abbrev);
Jeff King4f036662016-10-20 02:21:25 -04004226 else {
4227 char *hex = oid_to_hex(oid);
Junio C Hamano0d9c5272016-10-27 14:58:48 -07004228 if (abbrev < 0)
4229 abbrev = FALLBACK_DEFAULT_ABBREV;
brian m. carlson02afca12018-07-16 01:28:05 +00004230 if (abbrev > the_hash_algo->hexsz)
Johannes Schindelin033abf92018-05-02 11:38:39 +02004231 BUG("oid abbreviation out of range: %d", abbrev);
Jack Bates43d19482016-12-06 09:56:14 -07004232 if (abbrev)
4233 hex[abbrev] = '\0';
Jeff King4f036662016-10-20 02:21:25 -04004234 return hex;
4235 }
4236}
4237
Junio C Hamanob67b9612009-01-26 00:08:24 -08004238static void fill_metainfo(struct strbuf *msg,
4239 const char *name,
4240 const char *other,
4241 struct diff_filespec *one,
4242 struct diff_filespec *two,
4243 struct diff_options *o,
Bert Wesarg37466442010-05-04 00:38:07 +02004244 struct diff_filepair *p,
Junio C Hamano59777442010-06-18 11:16:57 -07004245 int *must_show_header,
Bert Wesarg37466442010-05-04 00:38:07 +02004246 int use_color)
Junio C Hamanob67b9612009-01-26 00:08:24 -08004247{
Bert Wesarg37466442010-05-04 00:38:07 +02004248 const char *set = diff_get_color(use_color, DIFF_METAINFO);
4249 const char *reset = diff_get_color(use_color, DIFF_RESET);
John Keeping30997bb2013-02-07 20:15:27 +00004250 const char *line_prefix = diff_line_prefix(o);
Bo Yang7be57612010-05-26 15:23:54 +08004251
Christian Couder296c6bb2010-05-26 04:50:12 +02004252 *must_show_header = 1;
Junio C Hamanob67b9612009-01-26 00:08:24 -08004253 strbuf_init(msg, PATH_MAX * 2 + 300);
4254 switch (p->status) {
4255 case DIFF_STATUS_COPIED:
Junio C Hamano98ad90f2010-06-18 11:16:57 -07004256 strbuf_addf(msg, "%s%ssimilarity index %d%%",
4257 line_prefix, set, similarity_index(p));
4258 strbuf_addf(msg, "%s\n%s%scopy from ",
4259 reset, line_prefix, set);
Junio C Hamanob67b9612009-01-26 00:08:24 -08004260 quote_c_style(name, msg, NULL, 0);
Junio C Hamano98ad90f2010-06-18 11:16:57 -07004261 strbuf_addf(msg, "%s\n%s%scopy to ", reset, line_prefix, set);
Junio C Hamanob67b9612009-01-26 00:08:24 -08004262 quote_c_style(other, msg, NULL, 0);
Bert Wesarg37466442010-05-04 00:38:07 +02004263 strbuf_addf(msg, "%s\n", reset);
Junio C Hamanob67b9612009-01-26 00:08:24 -08004264 break;
4265 case DIFF_STATUS_RENAMED:
Junio C Hamano98ad90f2010-06-18 11:16:57 -07004266 strbuf_addf(msg, "%s%ssimilarity index %d%%",
4267 line_prefix, set, similarity_index(p));
4268 strbuf_addf(msg, "%s\n%s%srename from ",
4269 reset, line_prefix, set);
Junio C Hamanob67b9612009-01-26 00:08:24 -08004270 quote_c_style(name, msg, NULL, 0);
Junio C Hamano98ad90f2010-06-18 11:16:57 -07004271 strbuf_addf(msg, "%s\n%s%srename to ",
4272 reset, line_prefix, set);
Junio C Hamanob67b9612009-01-26 00:08:24 -08004273 quote_c_style(other, msg, NULL, 0);
Bert Wesarg37466442010-05-04 00:38:07 +02004274 strbuf_addf(msg, "%s\n", reset);
Junio C Hamanob67b9612009-01-26 00:08:24 -08004275 break;
4276 case DIFF_STATUS_MODIFIED:
4277 if (p->score) {
Junio C Hamano98ad90f2010-06-18 11:16:57 -07004278 strbuf_addf(msg, "%s%sdissimilarity index %d%%%s\n",
4279 line_prefix,
Bert Wesarg37466442010-05-04 00:38:07 +02004280 set, similarity_index(p), reset);
Junio C Hamanob67b9612009-01-26 00:08:24 -08004281 break;
4282 }
4283 /* fallthru */
4284 default:
Christian Couder296c6bb2010-05-26 04:50:12 +02004285 *must_show_header = 0;
Junio C Hamanob67b9612009-01-26 00:08:24 -08004286 }
Jeff King9001dc22018-08-28 17:22:48 -04004287 if (one && two && !oideq(&one->oid, &two->oid)) {
brian m. carlsonde1d81d2018-05-02 00:25:52 +00004288 const unsigned hexsz = the_hash_algo->hexsz;
4289 int abbrev = o->flags.full_index ? hexsz : DEFAULT_ABBREV;
Junio C Hamanob67b9612009-01-26 00:08:24 -08004290
Brandon Williams0d1e0e72017-10-31 11:19:11 -07004291 if (o->flags.binary) {
Junio C Hamanob67b9612009-01-26 00:08:24 -08004292 mmfile_t mf;
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +02004293 if ((!fill_mmfile(o->repo, &mf, one) &&
4294 diff_filespec_is_binary(o->repo, one)) ||
4295 (!fill_mmfile(o->repo, &mf, two) &&
4296 diff_filespec_is_binary(o->repo, two)))
brian m. carlsonde1d81d2018-05-02 00:25:52 +00004297 abbrev = hexsz;
Junio C Hamanob67b9612009-01-26 00:08:24 -08004298 }
Jeff King4f036662016-10-20 02:21:25 -04004299 strbuf_addf(msg, "%s%sindex %s..%s", line_prefix, set,
4300 diff_abbrev_oid(&one->oid, abbrev),
4301 diff_abbrev_oid(&two->oid, abbrev));
Junio C Hamanob67b9612009-01-26 00:08:24 -08004302 if (one->mode == two->mode)
4303 strbuf_addf(msg, " %06o", one->mode);
Bert Wesarg37466442010-05-04 00:38:07 +02004304 strbuf_addf(msg, "%s\n", reset);
Junio C Hamanob67b9612009-01-26 00:08:24 -08004305 }
Junio C Hamanob67b9612009-01-26 00:08:24 -08004306}
4307
Junio C Hamano6973dca2006-04-21 23:57:45 -07004308static void run_diff_cmd(const char *pgm,
4309 const char *name,
4310 const char *other,
Junio C Hamanocd676a52008-02-12 14:26:02 -08004311 const char *attr_path,
Junio C Hamano6973dca2006-04-21 23:57:45 -07004312 struct diff_filespec *one,
4313 struct diff_filespec *two,
Junio C Hamanob67b9612009-01-26 00:08:24 -08004314 struct strbuf *msg,
Junio C Hamano051308f2006-05-04 16:51:44 -07004315 struct diff_options *o,
Junio C Hamanob67b9612009-01-26 00:08:24 -08004316 struct diff_filepair *p)
Junio C Hamano6973dca2006-04-21 23:57:45 -07004317{
Junio C Hamanob67b9612009-01-26 00:08:24 -08004318 const char *xfrm_msg = NULL;
4319 int complete_rewrite = (p->status == DIFF_STATUS_MODIFIED) && p->score;
Christian Couder296c6bb2010-05-26 04:50:12 +02004320 int must_show_header = 0;
Junio C Hamanob67b9612009-01-26 00:08:24 -08004321
Junio C Hamanobd8c1a92012-07-17 22:08:59 -07004322
Brandon Williams0d1e0e72017-10-31 11:19:11 -07004323 if (o->flags.allow_external) {
Nguyễn Thái Ngọc Duyacd00ea2018-09-21 17:57:33 +02004324 struct userdiff_driver *drv;
4325
4326 drv = userdiff_find_by_path(o->repo->index, attr_path);
Jeff Kingbe58e702008-10-05 17:43:21 -04004327 if (drv && drv->external)
4328 pgm = drv->external;
Junio C Hamanof1af60b2007-04-22 17:52:55 -07004329 }
4330
Bert Wesarg37466442010-05-04 00:38:07 +02004331 if (msg) {
4332 /*
4333 * don't use colors when the header is intended for an
4334 * external diff driver
4335 */
4336 fill_metainfo(msg, name, other, one, two, o, p,
Junio C Hamano59777442010-06-18 11:16:57 -07004337 &must_show_header,
Jeff Kingdaa0c3d2011-08-17 22:04:23 -07004338 want_color(o->use_color) && !pgm);
Bert Wesarg37466442010-05-04 00:38:07 +02004339 xfrm_msg = msg->len ? msg->buf : NULL;
4340 }
4341
Junio C Hamano6973dca2006-04-21 23:57:45 -07004342 if (pgm) {
Jeff King4bc17922019-02-14 00:49:42 -05004343 run_external_diff(pgm, name, other, one, two, xfrm_msg, o);
Junio C Hamano6973dca2006-04-21 23:57:45 -07004344 return;
4345 }
4346 if (one && two)
4347 builtin_diff(name, other ? other : name,
Christian Couder296c6bb2010-05-26 04:50:12 +02004348 one, two, xfrm_msg, must_show_header,
4349 o, complete_rewrite);
Junio C Hamano6973dca2006-04-21 23:57:45 -07004350 else
Daniel Barkalowc0c77732008-03-09 22:43:39 -04004351 fprintf(o->file, "* Unmerged path %s\n", name);
Junio C Hamano6973dca2006-04-21 23:57:45 -07004352}
4353
Nguyễn Thái Ngọc Duy58bf2a42018-09-21 17:57:31 +02004354static void diff_fill_oid_info(struct diff_filespec *one, struct index_state *istate)
Junio C Hamano6973dca2006-04-21 23:57:45 -07004355{
4356 if (DIFF_FILE_VALID(one)) {
brian m. carlson41c95602016-06-24 23:09:24 +00004357 if (!one->oid_valid) {
Junio C Hamano6973dca2006-04-21 23:57:45 -07004358 struct stat st;
Junio C Hamano4682d852012-06-27 20:14:47 -07004359 if (one->is_stdin) {
brian m. carlsona0d12c42016-06-24 23:09:23 +00004360 oidclr(&one->oid);
Johannes Schindelin5332b2a2007-02-25 23:36:10 +01004361 return;
4362 }
Junio C Hamano6973dca2006-04-21 23:57:45 -07004363 if (lstat(one->path, &st) < 0)
Thomas Rast0721c312009-06-27 17:58:47 +02004364 die_errno("stat '%s'", one->path);
Nguyễn Thái Ngọc Duy58bf2a42018-09-21 17:57:31 +02004365 if (index_path(istate, &one->oid, one->path, &st, 0))
Alexander Potashevd7530702009-01-04 21:38:41 +03004366 die("cannot hash %s", one->path);
Junio C Hamano6973dca2006-04-21 23:57:45 -07004367 }
4368 }
4369 else
brian m. carlsona0d12c42016-06-24 23:09:23 +00004370 oidclr(&one->oid);
Junio C Hamano6973dca2006-04-21 23:57:45 -07004371}
4372
Junio C Hamanocd676a52008-02-12 14:26:02 -08004373static void strip_prefix(int prefix_length, const char **namep, const char **otherp)
4374{
4375 /* Strip the prefix but do not molest /dev/null and absolute paths */
Johannes Sixtffd04e92018-10-19 18:58:07 +02004376 if (*namep && !is_absolute_path(*namep)) {
Junio C Hamanocd676a52008-02-12 14:26:02 -08004377 *namep += prefix_length;
Jakub Narebskid8faea92010-08-09 10:50:53 -04004378 if (**namep == '/')
4379 ++*namep;
4380 }
Johannes Sixtffd04e92018-10-19 18:58:07 +02004381 if (*otherp && !is_absolute_path(*otherp)) {
Junio C Hamanocd676a52008-02-12 14:26:02 -08004382 *otherp += prefix_length;
Jakub Narebskid8faea92010-08-09 10:50:53 -04004383 if (**otherp == '/')
4384 ++*otherp;
4385 }
Junio C Hamanocd676a52008-02-12 14:26:02 -08004386}
4387
Junio C Hamano6973dca2006-04-21 23:57:45 -07004388static void run_diff(struct diff_filepair *p, struct diff_options *o)
4389{
4390 const char *pgm = external_diff();
Pierre Habouzit663af342007-09-20 00:42:15 +02004391 struct strbuf msg;
Pierre Habouzit663af342007-09-20 00:42:15 +02004392 struct diff_filespec *one = p->one;
4393 struct diff_filespec *two = p->two;
Junio C Hamano6973dca2006-04-21 23:57:45 -07004394 const char *name;
4395 const char *other;
Junio C Hamanocd676a52008-02-12 14:26:02 -08004396 const char *attr_path;
Pierre Habouzit663af342007-09-20 00:42:15 +02004397
Stefan Bellerf2d2a5d2017-06-29 17:06:46 -07004398 name = one->path;
4399 other = (strcmp(name, two->path) ? two->path : NULL);
Junio C Hamanocd676a52008-02-12 14:26:02 -08004400 attr_path = name;
4401 if (o->prefix_length)
4402 strip_prefix(o->prefix_length, &name, &other);
4403
Brandon Williams0d1e0e72017-10-31 11:19:11 -07004404 if (!o->flags.allow_external)
Junio C Hamanobd8c1a92012-07-17 22:08:59 -07004405 pgm = NULL;
4406
Junio C Hamanocd676a52008-02-12 14:26:02 -08004407 if (DIFF_PAIR_UNMERGED(p)) {
4408 run_diff_cmd(pgm, name, NULL, attr_path,
Junio C Hamanob67b9612009-01-26 00:08:24 -08004409 NULL, NULL, NULL, o, p);
Junio C Hamanocd676a52008-02-12 14:26:02 -08004410 return;
4411 }
4412
Nguyễn Thái Ngọc Duy58bf2a42018-09-21 17:57:31 +02004413 diff_fill_oid_info(one, o->repo->index);
4414 diff_fill_oid_info(two, o->repo->index);
Junio C Hamano6973dca2006-04-21 23:57:45 -07004415
Junio C Hamano6973dca2006-04-21 23:57:45 -07004416 if (!pgm &&
4417 DIFF_FILE_VALID(one) && DIFF_FILE_VALID(two) &&
4418 (S_IFMT & one->mode) != (S_IFMT & two->mode)) {
Junio C Hamanob67b9612009-01-26 00:08:24 -08004419 /*
4420 * a filepair that changes between file and symlink
Junio C Hamano6973dca2006-04-21 23:57:45 -07004421 * needs to be split into deletion and creation.
4422 */
4423 struct diff_filespec *null = alloc_filespec(two->path);
Junio C Hamanocd676a52008-02-12 14:26:02 -08004424 run_diff_cmd(NULL, name, other, attr_path,
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +02004425 one, null, &msg,
4426 o, p);
Junio C Hamano6973dca2006-04-21 23:57:45 -07004427 free(null);
Junio C Hamanob67b9612009-01-26 00:08:24 -08004428 strbuf_release(&msg);
4429
Junio C Hamano6973dca2006-04-21 23:57:45 -07004430 null = alloc_filespec(one->path);
Junio C Hamanocd676a52008-02-12 14:26:02 -08004431 run_diff_cmd(NULL, name, other, attr_path,
Junio C Hamanob67b9612009-01-26 00:08:24 -08004432 null, two, &msg, o, p);
Junio C Hamano6973dca2006-04-21 23:57:45 -07004433 free(null);
4434 }
4435 else
Junio C Hamanocd676a52008-02-12 14:26:02 -08004436 run_diff_cmd(pgm, name, other, attr_path,
Junio C Hamanob67b9612009-01-26 00:08:24 -08004437 one, two, &msg, o, p);
Junio C Hamano6973dca2006-04-21 23:57:45 -07004438
Pierre Habouzit663af342007-09-20 00:42:15 +02004439 strbuf_release(&msg);
Junio C Hamano6973dca2006-04-21 23:57:45 -07004440}
4441
4442static void run_diffstat(struct diff_filepair *p, struct diff_options *o,
4443 struct diffstat_t *diffstat)
4444{
4445 const char *name;
4446 const char *other;
4447
4448 if (DIFF_PAIR_UNMERGED(p)) {
4449 /* unmerged */
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +02004450 builtin_diffstat(p->one->path, NULL, NULL, NULL,
4451 diffstat, o, p);
Junio C Hamano6973dca2006-04-21 23:57:45 -07004452 return;
4453 }
4454
4455 name = p->one->path;
4456 other = (strcmp(name, p->two->path) ? p->two->path : NULL);
4457
Junio C Hamanocd676a52008-02-12 14:26:02 -08004458 if (o->prefix_length)
4459 strip_prefix(o->prefix_length, &name, &other);
4460
Nguyễn Thái Ngọc Duy58bf2a42018-09-21 17:57:31 +02004461 diff_fill_oid_info(p->one, o->repo->index);
4462 diff_fill_oid_info(p->two, o->repo->index);
Junio C Hamano6973dca2006-04-21 23:57:45 -07004463
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +02004464 builtin_diffstat(name, other, p->one, p->two,
4465 diffstat, o, p);
Junio C Hamano6973dca2006-04-21 23:57:45 -07004466}
4467
Johannes Schindelin88246892006-05-20 23:43:13 +02004468static void run_checkdiff(struct diff_filepair *p, struct diff_options *o)
4469{
4470 const char *name;
4471 const char *other;
Junio C Hamanocd676a52008-02-12 14:26:02 -08004472 const char *attr_path;
Johannes Schindelin88246892006-05-20 23:43:13 +02004473
4474 if (DIFF_PAIR_UNMERGED(p)) {
4475 /* unmerged */
4476 return;
4477 }
4478
4479 name = p->one->path;
4480 other = (strcmp(name, p->two->path) ? p->two->path : NULL);
Junio C Hamanocd676a52008-02-12 14:26:02 -08004481 attr_path = other ? other : name;
4482
4483 if (o->prefix_length)
4484 strip_prefix(o->prefix_length, &name, &other);
Johannes Schindelin88246892006-05-20 23:43:13 +02004485
Nguyễn Thái Ngọc Duy58bf2a42018-09-21 17:57:31 +02004486 diff_fill_oid_info(p->one, o->repo->index);
4487 diff_fill_oid_info(p->two, o->repo->index);
Johannes Schindelin88246892006-05-20 23:43:13 +02004488
Junio C Hamanocd676a52008-02-12 14:26:02 -08004489 builtin_checkdiff(name, other, attr_path, p->one, p->two, o);
Johannes Schindelin88246892006-05-20 23:43:13 +02004490}
4491
Nguyễn Thái Ngọc Duy4a288472019-01-27 07:35:31 +07004492static void prep_parse_options(struct diff_options *options);
4493
Nguyễn Thái Ngọc Duye6757652018-09-21 17:57:24 +02004494void repo_diff_setup(struct repository *r, struct diff_options *options)
Junio C Hamano6973dca2006-04-21 23:57:45 -07004495{
Johannes Schindelinbe4f2b42010-08-05 10:49:55 +02004496 memcpy(options, &default_diff_options, sizeof(*options));
Daniel Barkalowc0c77732008-03-09 22:43:39 -04004497
4498 options->file = stdout;
Nguyễn Thái Ngọc Duye6757652018-09-21 17:57:24 +02004499 options->repo = r;
Daniel Barkalowc0c77732008-03-09 22:43:39 -04004500
Stefan Beller7648b792018-08-17 13:43:52 -07004501 options->output_indicators[OUTPUT_INDICATOR_NEW] = '+';
4502 options->output_indicators[OUTPUT_INDICATOR_OLD] = '-';
4503 options->output_indicators[OUTPUT_INDICATOR_CONTEXT] = ' ';
Jack Bates43d19482016-12-06 09:56:14 -07004504 options->abbrev = DEFAULT_ABBREV;
Junio C Hamano6973dca2006-04-21 23:57:45 -07004505 options->line_termination = '\n';
4506 options->break_opt = -1;
4507 options->rename_limit = -1;
Johan Herland712d2c72011-04-29 11:36:20 +02004508 options->dirstat_permille = diff_dirstat_permille_default;
Jeff Muizelaar6468a4e2012-09-27 15:12:52 -04004509 options->context = diff_context_default;
Vegard Nossumc4888672017-01-12 13:21:11 +01004510 options->interhunkcontext = diff_interhunk_context_default;
Junio C Hamanoa17505f2016-10-04 15:26:27 -07004511 options->ws_error_highlight = ws_error_highlight_default;
Brandon Williams0d1e0e72017-10-31 11:19:11 -07004512 options->flags.rename_empty = 1;
Stefan Beller15af58c2018-01-04 14:50:42 -08004513 options->objfind = NULL;
Junio C Hamano6973dca2006-04-21 23:57:45 -07004514
Kirill Smelkov72441af2014-04-07 01:46:26 +04004515 /* pathchange left =NULL by default */
Junio C Hamano6973dca2006-04-21 23:57:45 -07004516 options->change = diff_change;
4517 options->add_remove = diff_addremove;
Jeff Kingf1c96262011-08-17 22:03:12 -07004518 options->use_color = diff_use_color_default;
Eric Wongb68ea122006-07-07 04:01:23 -07004519 options->detect_rename = diff_detect_rename_default;
Michal Privoznik07ab4de2013-01-16 08:51:57 +01004520 options->xdl_opts |= diff_algorithm;
Michael Haggerty433860f2016-09-05 11:44:51 +02004521 if (diff_indent_heuristic)
4522 DIFF_XDL_SET(options, INDENT_HEURISTIC);
Johannes Schindelineab9a402007-12-18 19:32:14 +00004523
Samuel Bronson6d8940b2013-12-18 19:08:12 -05004524 options->orderfile = diff_order_file_cfg;
4525
Eli Collinsf89504d2010-05-02 19:03:41 -07004526 if (diff_no_prefix) {
4527 options->a_prefix = options->b_prefix = "";
4528 } else if (!diff_mnemonic_prefix) {
Junio C Hamanoa5a818e2008-08-18 20:08:09 -07004529 options->a_prefix = "a/";
4530 options->b_prefix = "b/";
4531 }
Stefan Beller2e2d5ac2017-06-30 13:53:07 -07004532
4533 options->color_moved = diff_color_moved_default;
Stefan Beller626c0b52018-07-18 12:31:56 -07004534 options->color_moved_ws_handling = diff_color_moved_ws_default;
Nguyễn Thái Ngọc Duy4a288472019-01-27 07:35:31 +07004535
4536 prep_parse_options(options);
Junio C Hamano6973dca2006-04-21 23:57:45 -07004537}
4538
Thomas Rast28452652012-08-03 14:16:24 +02004539void diff_setup_done(struct diff_options *options)
Junio C Hamano6973dca2006-04-21 23:57:45 -07004540{
Stefan Beller4d8c51a2018-01-04 14:50:44 -08004541 unsigned check_mask = DIFF_FORMAT_NAME |
4542 DIFF_FORMAT_NAME_STATUS |
4543 DIFF_FORMAT_CHECKDIFF |
4544 DIFF_FORMAT_NO_OUTPUT;
brian m. carlsonde1d81d2018-05-02 00:25:52 +00004545 /*
4546 * This must be signed because we're comparing against a potentially
4547 * negative value.
4548 */
4549 const int hexsz = the_hash_algo->hexsz;
Timo Hirvonend7de00f2006-06-24 20:26:49 +03004550
Junio C Hamano6c374002013-05-10 17:10:11 +02004551 if (options->set_default)
4552 options->set_default(options);
4553
Stefan Beller4d8c51a2018-01-04 14:50:44 -08004554 if (HAS_MULTI_BITS(options->output_format & check_mask))
Jean-Noël AVILAa2f05c92016-09-20 21:04:27 +02004555 die(_("--name-only, --name-status, --check and -s are mutually exclusive"));
Timo Hirvonend7de00f2006-06-24 20:26:49 +03004556
Stefan Beller5e505252018-01-04 14:50:43 -08004557 if (HAS_MULTI_BITS(options->pickaxe_opts & DIFF_PICKAXE_KINDS_MASK))
4558 die(_("-G, -S and --find-object are mutually exclusive"));
4559
Junio C Hamanof2451942009-05-22 12:45:29 -07004560 /*
4561 * Most of the time we can say "there are changes"
4562 * only by checking if there are changed paths, but
4563 * --ignore-whitespace* options force us to look
Jim Meyering97bf2a02009-08-30 22:27:02 +02004564 * inside contents.
Junio C Hamanof2451942009-05-22 12:45:29 -07004565 */
4566
Junio C Hamano446d12c2017-10-26 15:15:51 +09004567 if ((options->xdl_opts & XDF_WHITESPACE_FLAGS))
Brandon Williams0d1e0e72017-10-31 11:19:11 -07004568 options->flags.diff_from_contents = 1;
Junio C Hamanof2451942009-05-22 12:45:29 -07004569 else
Brandon Williams0d1e0e72017-10-31 11:19:11 -07004570 options->flags.diff_from_contents = 0;
Junio C Hamanof2451942009-05-22 12:45:29 -07004571
Brandon Williams0d1e0e72017-10-31 11:19:11 -07004572 if (options->flags.find_copies_harder)
Junio C Hamano03b9d562006-08-09 13:17:19 -07004573 options->detect_rename = DIFF_DETECT_COPY;
4574
Brandon Williams0d1e0e72017-10-31 11:19:11 -07004575 if (!options->flags.relative_name)
Junio C Hamanocd676a52008-02-12 14:26:02 -08004576 options->prefix = NULL;
4577 if (options->prefix)
4578 options->prefix_length = strlen(options->prefix);
4579 else
4580 options->prefix_length = 0;
4581
Timo Hirvonenc6744342006-06-24 20:21:53 +03004582 if (options->output_format & (DIFF_FORMAT_NAME |
4583 DIFF_FORMAT_NAME_STATUS |
4584 DIFF_FORMAT_CHECKDIFF |
4585 DIFF_FORMAT_NO_OUTPUT))
4586 options->output_format &= ~(DIFF_FORMAT_RAW |
Junio C Hamano74e2abe2006-10-12 03:01:00 -07004587 DIFF_FORMAT_NUMSTAT |
Timo Hirvonenc6744342006-06-24 20:21:53 +03004588 DIFF_FORMAT_DIFFSTAT |
Nicolas Pitreebd124c2006-12-14 23:15:44 -05004589 DIFF_FORMAT_SHORTSTAT |
Linus Torvalds7df7c012008-02-12 13:26:31 -08004590 DIFF_FORMAT_DIRSTAT |
Timo Hirvonenc6744342006-06-24 20:21:53 +03004591 DIFF_FORMAT_SUMMARY |
4592 DIFF_FORMAT_PATCH);
4593
Junio C Hamano6973dca2006-04-21 23:57:45 -07004594 /*
4595 * These cases always need recursive; we do not drop caller-supplied
4596 * recursive bits for other formats here.
4597 */
Timo Hirvonenc6744342006-06-24 20:21:53 +03004598 if (options->output_format & (DIFF_FORMAT_PATCH |
Junio C Hamano74e2abe2006-10-12 03:01:00 -07004599 DIFF_FORMAT_NUMSTAT |
Timo Hirvonenc6744342006-06-24 20:21:53 +03004600 DIFF_FORMAT_DIFFSTAT |
Nicolas Pitreebd124c2006-12-14 23:15:44 -05004601 DIFF_FORMAT_SHORTSTAT |
Linus Torvalds7df7c012008-02-12 13:26:31 -08004602 DIFF_FORMAT_DIRSTAT |
Johannes Schindelind7014dc2006-10-03 23:09:56 +02004603 DIFF_FORMAT_SUMMARY |
Timo Hirvonenc6744342006-06-24 20:21:53 +03004604 DIFF_FORMAT_CHECKDIFF))
Brandon Williams0d1e0e72017-10-31 11:19:11 -07004605 options->flags.recursive = 1;
Junio C Hamano5e363542006-05-22 00:31:02 -07004606 /*
Junio C Hamano3969cf72006-06-27 15:08:19 -07004607 * Also pickaxe would not work very well if you do not say recursive
Junio C Hamano5e363542006-05-22 00:31:02 -07004608 */
Stefan Bellercf630512018-01-04 14:50:41 -08004609 if (options->pickaxe_opts & DIFF_PICKAXE_KINDS_MASK)
Brandon Williams0d1e0e72017-10-31 11:19:11 -07004610 options->flags.recursive = 1;
Jens Lehmannae6d5c12010-03-11 22:50:25 +01004611 /*
4612 * When patches are generated, submodules diffed against the work tree
4613 * must be checked for dirtiness too so it can be shown in the output
4614 */
4615 if (options->output_format & DIFF_FORMAT_PATCH)
Brandon Williams0d1e0e72017-10-31 11:19:11 -07004616 options->flags.dirty_submodules = 1;
Junio C Hamano5e363542006-05-22 00:31:02 -07004617
Junio C Hamano6973dca2006-04-21 23:57:45 -07004618 if (options->detect_rename && options->rename_limit < 0)
4619 options->rename_limit = diff_rename_limit_default;
brian m. carlsonde1d81d2018-05-02 00:25:52 +00004620 if (hexsz < options->abbrev)
4621 options->abbrev = hexsz; /* full */
Junio C Hamano6973dca2006-04-21 23:57:45 -07004622
Junio C Hamano68aacb22007-03-14 11:12:13 -07004623 /*
4624 * It does not make sense to show the first hit we happened
4625 * to have found. It does not make sense not to return with
4626 * exit code in such a case either.
4627 */
Brandon Williams0d1e0e72017-10-31 11:19:11 -07004628 if (options->flags.quick) {
Junio C Hamano68aacb22007-03-14 11:12:13 -07004629 options->output_format = DIFF_FORMAT_NO_OUTPUT;
Brandon Williams0d1e0e72017-10-31 11:19:11 -07004630 options->flags.exit_with_status = 1;
Junio C Hamano68aacb22007-03-14 11:12:13 -07004631 }
Zoltan Klingeree7fb0b2013-12-06 10:38:46 +11004632
Jeff King0ea7d5b2013-12-16 15:02:21 -05004633 options->diff_path_counter = 0;
Junio C Hamanob0e2c992014-06-16 10:07:09 -07004634
Brandon Williams0d1e0e72017-10-31 11:19:11 -07004635 if (options->flags.follow_renames && options->pathspec.nr != 1)
Jeff Kingdd63f162014-05-20 02:49:20 -04004636 die(_("--follow requires exactly one pathspec"));
Stefan Beller2e2d5ac2017-06-30 13:53:07 -07004637
4638 if (!options->use_color || external_diff())
4639 options->color_moved = 0;
Nguyễn Thái Ngọc Duy4a288472019-01-27 07:35:31 +07004640
4641 FREE_AND_NULL(options->parseopts);
Junio C Hamano6973dca2006-04-21 23:57:45 -07004642}
4643
Matthieu Moydea007f2010-08-05 10:22:52 +02004644int parse_long_opt(const char *opt, const char **argv,
4645 const char **optarg)
4646{
4647 const char *arg = argv[0];
Jeff King95b567c2014-06-18 15:48:29 -04004648 if (!skip_prefix(arg, "--", &arg))
Matthieu Moydea007f2010-08-05 10:22:52 +02004649 return 0;
Jeff King95b567c2014-06-18 15:48:29 -04004650 if (!skip_prefix(arg, opt, &arg))
Matthieu Moydea007f2010-08-05 10:22:52 +02004651 return 0;
Nicolas Vigierb0d12fc2013-10-31 12:08:28 +01004652 if (*arg == '=') { /* stuck form: --option=value */
Matthieu Moydea007f2010-08-05 10:22:52 +02004653 *optarg = arg + 1;
4654 return 1;
4655 }
4656 if (*arg != '\0')
4657 return 0;
4658 /* separate form: --option value */
4659 if (!argv[1])
4660 die("Option '--%s' requires a value", opt);
4661 *optarg = argv[1];
4662 return 2;
4663}
4664
Nguyễn Thái Ngọc Duy84b50892019-02-21 18:16:10 +07004665static int diff_opt_stat(const struct option *opt, const char *value, int unset)
Jonathan Nieder4d7f7a42010-08-05 10:22:53 +02004666{
Nguyễn Thái Ngọc Duy84b50892019-02-21 18:16:10 +07004667 struct diff_options *options = opt->value;
Jonathan Nieder4d7f7a42010-08-05 10:22:53 +02004668 int width = options->stat_width;
4669 int name_width = options->stat_name_width;
Zbigniew Jędrzejewski-Szmek969fe572012-03-01 13:26:45 +01004670 int graph_width = options->stat_graph_width;
Michael J Gruber808e1db2011-05-27 14:36:41 +02004671 int count = options->stat_count;
Nguyễn Thái Ngọc Duy84b50892019-02-21 18:16:10 +07004672 char *end;
Jonathan Nieder4d7f7a42010-08-05 10:22:53 +02004673
Nguyễn Thái Ngọc Duy84b50892019-02-21 18:16:10 +07004674 BUG_ON_OPT_NEG(unset);
Jonathan Nieder4d7f7a42010-08-05 10:22:53 +02004675
Nguyễn Thái Ngọc Duy84b50892019-02-21 18:16:10 +07004676 if (!strcmp(opt->long_name, "stat")) {
4677 if (value) {
4678 width = strtoul(value, &end, 10);
4679 if (*end == ',')
4680 name_width = strtoul(end+1, &end, 10);
4681 if (*end == ',')
4682 count = strtoul(end+1, &end, 10);
4683 if (*end)
4684 return error(_("invalid --stat value: %s"), value);
Matthieu Moy1e572082010-08-05 10:22:54 +02004685 }
Nguyễn Thái Ngọc Duy84b50892019-02-21 18:16:10 +07004686 } else if (!strcmp(opt->long_name, "stat-width")) {
4687 width = strtoul(value, &end, 10);
4688 if (*end)
4689 return error(_("%s expects a numerical value"),
4690 opt->long_name);
4691 } else if (!strcmp(opt->long_name, "stat-name-width")) {
4692 name_width = strtoul(value, &end, 10);
4693 if (*end)
4694 return error(_("%s expects a numerical value"),
4695 opt->long_name);
4696 } else if (!strcmp(opt->long_name, "stat-graph-width")) {
4697 graph_width = strtoul(value, &end, 10);
4698 if (*end)
4699 return error(_("%s expects a numerical value"),
4700 opt->long_name);
4701 } else if (!strcmp(opt->long_name, "stat-count")) {
4702 count = strtoul(value, &end, 10);
4703 if (*end)
4704 return error(_("%s expects a numerical value"),
4705 opt->long_name);
4706 } else
4707 BUG("%s should not get here", opt->long_name);
Jonathan Nieder4d7f7a42010-08-05 10:22:53 +02004708
Jonathan Nieder4d7f7a42010-08-05 10:22:53 +02004709 options->output_format |= DIFF_FORMAT_DIFFSTAT;
4710 options->stat_name_width = name_width;
Zbigniew Jędrzejewski-Szmek969fe572012-03-01 13:26:45 +01004711 options->stat_graph_width = graph_width;
Jonathan Nieder4d7f7a42010-08-05 10:22:53 +02004712 options->stat_width = width;
Michael J Gruber808e1db2011-05-27 14:36:41 +02004713 options->stat_count = count;
Nguyễn Thái Ngọc Duy84b50892019-02-21 18:16:10 +07004714 return 0;
Jonathan Nieder4d7f7a42010-08-05 10:22:53 +02004715}
4716
Johan Herland333f3fb2011-04-29 11:36:18 +02004717static int parse_dirstat_opt(struct diff_options *options, const char *params)
4718{
Johan Herland51670fc2011-04-29 11:36:22 +02004719 struct strbuf errmsg = STRBUF_INIT;
4720 if (parse_dirstat_params(options, params, &errmsg))
Johan Herland7478ac52011-04-29 11:36:23 +02004721 die(_("Failed to parse --dirstat/-X option parameter:\n%s"),
Johan Herland51670fc2011-04-29 11:36:22 +02004722 errmsg.buf);
4723 strbuf_release(&errmsg);
Johan Herland333f3fb2011-04-29 11:36:18 +02004724 /*
4725 * The caller knows a dirstat-related option is given from the command
4726 * line; allow it to say "return this_function();"
4727 */
4728 options->output_format |= DIFF_FORMAT_DIRSTAT;
4729 return 1;
4730}
4731
Junio C Hamano1ecc1cb2013-07-17 15:05:46 -07004732static const char diff_status_letters[] = {
4733 DIFF_STATUS_ADDED,
4734 DIFF_STATUS_COPIED,
4735 DIFF_STATUS_DELETED,
4736 DIFF_STATUS_MODIFIED,
4737 DIFF_STATUS_RENAMED,
4738 DIFF_STATUS_TYPE_CHANGED,
4739 DIFF_STATUS_UNKNOWN,
4740 DIFF_STATUS_UNMERGED,
4741 DIFF_STATUS_FILTER_AON,
4742 DIFF_STATUS_FILTER_BROKEN,
4743 '\0',
4744};
4745
4746static unsigned int filter_bit['Z' + 1];
4747
4748static void prepare_filter_bits(void)
4749{
4750 int i;
4751
4752 if (!filter_bit[DIFF_STATUS_ADDED]) {
4753 for (i = 0; diff_status_letters[i]; i++)
4754 filter_bit[(int) diff_status_letters[i]] = (1 << i);
4755 }
4756}
4757
4758static unsigned filter_bit_tst(char status, const struct diff_options *opt)
4759{
4760 return opt->filter & filter_bit[(int) status];
4761}
4762
Nguyễn Thái Ngọc Duycdb53302019-03-24 15:20:14 +07004763unsigned diff_filter_bit(char status)
Junio C Hamano1ecc1cb2013-07-17 15:05:46 -07004764{
Nguyễn Thái Ngọc Duycdb53302019-03-24 15:20:14 +07004765 prepare_filter_bits();
4766 return filter_bit[(int) status];
4767}
4768
Nguyễn Thái Ngọc Duyd2d3f272019-03-24 15:20:03 +07004769static int diff_opt_diff_filter(const struct option *option,
4770 const char *optarg, int unset)
Junio C Hamano1ecc1cb2013-07-17 15:05:46 -07004771{
Nguyễn Thái Ngọc Duyd2d3f272019-03-24 15:20:03 +07004772 struct diff_options *opt = option->value;
Junio C Hamano1ecc1cb2013-07-17 15:05:46 -07004773 int i, optch;
4774
Nguyễn Thái Ngọc Duyd2d3f272019-03-24 15:20:03 +07004775 BUG_ON_OPT_NEG(unset);
Junio C Hamano1ecc1cb2013-07-17 15:05:46 -07004776 prepare_filter_bits();
Junio C Hamano7f2ea5f2013-07-17 16:19:19 -07004777
4778 /*
4779 * If there is a negation e.g. 'd' in the input, and we haven't
4780 * initialized the filter field with another --diff-filter, start
4781 * from full set of bits, except for AON.
4782 */
4783 if (!opt->filter) {
4784 for (i = 0; (optch = optarg[i]) != '\0'; i++) {
4785 if (optch < 'a' || 'z' < optch)
4786 continue;
4787 opt->filter = (1 << (ARRAY_SIZE(diff_status_letters) - 1)) - 1;
4788 opt->filter &= ~filter_bit[DIFF_STATUS_FILTER_AON];
4789 break;
4790 }
4791 }
4792
Junio C Hamano1ecc1cb2013-07-17 15:05:46 -07004793 for (i = 0; (optch = optarg[i]) != '\0'; i++) {
4794 unsigned int bit;
Junio C Hamano7f2ea5f2013-07-17 16:19:19 -07004795 int negate;
4796
4797 if ('a' <= optch && optch <= 'z') {
4798 negate = 1;
4799 optch = toupper(optch);
4800 } else {
4801 negate = 0;
4802 }
Junio C Hamano1ecc1cb2013-07-17 15:05:46 -07004803
4804 bit = (0 <= optch && optch <= 'Z') ? filter_bit[optch] : 0;
4805 if (!bit)
Nguyễn Thái Ngọc Duyd2d3f272019-03-24 15:20:03 +07004806 return error(_("unknown change class '%c' in --diff-filter=%s"),
4807 optarg[i], optarg);
Junio C Hamano7f2ea5f2013-07-17 16:19:19 -07004808 if (negate)
4809 opt->filter &= ~bit;
4810 else
4811 opt->filter |= bit;
Junio C Hamano1ecc1cb2013-07-17 15:05:46 -07004812 }
4813 return 0;
4814}
4815
Nguyễn Thái Ngọc Duy3b335762018-12-09 11:25:21 +01004816static void enable_patch_output(int *fmt)
4817{
Matthieu Moy71482d32013-07-16 10:05:37 +02004818 *fmt &= ~DIFF_FORMAT_NO_OUTPUT;
4819 *fmt |= DIFF_FORMAT_PATCH;
4820}
4821
Nguyễn Thái Ngọc Duy5a749d92019-03-24 15:19:55 +07004822static int diff_opt_ws_error_highlight(const struct option *option,
4823 const char *arg, int unset)
Junio C Hamanob8767f72015-05-26 10:11:28 -07004824{
Nguyễn Thái Ngọc Duy5a749d92019-03-24 15:19:55 +07004825 struct diff_options *opt = option->value;
Junio C Hamano077965f2016-10-04 15:03:33 -07004826 int val = parse_ws_error_highlight(arg);
Junio C Hamanob8767f72015-05-26 10:11:28 -07004827
Nguyễn Thái Ngọc Duy5a749d92019-03-24 15:19:55 +07004828 BUG_ON_OPT_NEG(unset);
4829 if (val < 0)
4830 return error(_("unknown value after ws-error-highlight=%.*s"),
4831 -1 - val, arg);
Junio C Hamanob8767f72015-05-26 10:11:28 -07004832 opt->ws_error_highlight = val;
Nguyễn Thái Ngọc Duy5a749d92019-03-24 15:19:55 +07004833 return 0;
Junio C Hamanob8767f72015-05-26 10:11:28 -07004834}
4835
Nguyễn Thái Ngọc Duya75f28c2019-03-24 15:20:02 +07004836static int diff_opt_find_object(const struct option *option,
4837 const char *arg, int unset)
Stefan Beller15af58c2018-01-04 14:50:42 -08004838{
Nguyễn Thái Ngọc Duya75f28c2019-03-24 15:20:02 +07004839 struct diff_options *opt = option->value;
Stefan Beller15af58c2018-01-04 14:50:42 -08004840 struct object_id oid;
4841
Nguyễn Thái Ngọc Duya75f28c2019-03-24 15:20:02 +07004842 BUG_ON_OPT_NEG(unset);
Stefan Beller15af58c2018-01-04 14:50:42 -08004843 if (get_oid(arg, &oid))
Nguyễn Thái Ngọc Duya75f28c2019-03-24 15:20:02 +07004844 return error(_("unable to resolve '%s'"), arg);
Stefan Beller15af58c2018-01-04 14:50:42 -08004845
4846 if (!opt->objfind)
4847 opt->objfind = xcalloc(1, sizeof(*opt->objfind));
4848
4849 opt->pickaxe_opts |= DIFF_PICKAXE_KIND_OBJFIND;
4850 opt->flags.recursive = 1;
4851 opt->flags.tree_in_recursive = 1;
4852 oidset_insert(opt->objfind, &oid);
Nguyễn Thái Ngọc Duya75f28c2019-03-24 15:20:02 +07004853 return 0;
Stefan Beller15af58c2018-01-04 14:50:42 -08004854}
4855
Nguyễn Thái Ngọc Duydf84a432019-03-05 19:30:11 +07004856static int diff_opt_anchored(const struct option *opt,
4857 const char *arg, int unset)
4858{
4859 struct diff_options *options = opt->value;
4860
4861 BUG_ON_OPT_NEG(unset);
4862 options->xdl_opts = DIFF_WITH_ALG(options, PATIENCE_DIFF);
4863 ALLOC_GROW(options->anchors, options->anchors_nr + 1,
4864 options->anchors_alloc);
4865 options->anchors[options->anchors_nr++] = xstrdup(arg);
4866 return 0;
4867}
4868
Nguyễn Thái Ngọc Duy6d9af6f2019-03-05 19:30:12 +07004869static int diff_opt_binary(const struct option *opt,
4870 const char *arg, int unset)
4871{
4872 struct diff_options *options = opt->value;
4873
4874 BUG_ON_OPT_NEG(unset);
4875 BUG_ON_OPT_ARG(arg);
4876 enable_patch_output(&options->output_format);
4877 options->flags.binary = 1;
4878 return 0;
4879}
4880
Nguyễn Thái Ngọc Duyced4e172019-02-21 18:16:13 +07004881static int diff_opt_break_rewrites(const struct option *opt,
4882 const char *arg, int unset)
4883{
4884 int *break_opt = opt->value;
4885 int opt1, opt2;
4886
4887 BUG_ON_OPT_NEG(unset);
4888 if (!arg)
4889 arg = "";
4890 opt1 = parse_rename_score(&arg);
4891 if (*arg == 0)
4892 opt2 = 0;
4893 else if (*arg != '/')
4894 return error(_("%s expects <n>/<m> form"), opt->long_name);
4895 else {
4896 arg++;
4897 opt2 = parse_rename_score(&arg);
4898 }
4899 if (*arg != 0)
4900 return error(_("%s expects <n>/<m> form"), opt->long_name);
4901 *break_opt = opt1 | (opt2 << 16);
4902 return 0;
4903}
4904
Nguyễn Thái Ngọc Duyaf2f3682019-02-21 18:16:12 +07004905static int diff_opt_char(const struct option *opt,
4906 const char *arg, int unset)
4907{
4908 char *value = opt->value;
4909
4910 BUG_ON_OPT_NEG(unset);
4911 if (arg[1])
4912 return error(_("%s expects a character, got '%s'"),
4913 opt->long_name, arg);
4914 *value = arg[0];
4915 return 0;
4916}
4917
Nguyễn Thái Ngọc Duy59311a92019-03-24 15:20:09 +07004918static int diff_opt_color_moved(const struct option *opt,
4919 const char *arg, int unset)
4920{
4921 struct diff_options *options = opt->value;
4922
4923 if (unset) {
4924 options->color_moved = COLOR_MOVED_NO;
4925 } else if (!arg) {
4926 if (diff_color_moved_default)
4927 options->color_moved = diff_color_moved_default;
4928 if (options->color_moved == COLOR_MOVED_NO)
4929 options->color_moved = COLOR_MOVED_DEFAULT;
4930 } else {
4931 int cm = parse_color_moved(arg);
4932 if (cm < 0)
4933 return error(_("bad --color-moved argument: %s"), arg);
4934 options->color_moved = cm;
4935 }
4936 return 0;
4937}
4938
Nguyễn Thái Ngọc Duy8ce20202019-03-24 15:20:10 +07004939static int diff_opt_color_moved_ws(const struct option *opt,
4940 const char *arg, int unset)
4941{
4942 struct diff_options *options = opt->value;
4943 unsigned cm;
4944
Nguyễn Thái Ngọc Duybb987292019-03-24 15:20:11 +07004945 if (unset) {
4946 options->color_moved_ws_handling = 0;
4947 return 0;
4948 }
4949
Nguyễn Thái Ngọc Duy8ce20202019-03-24 15:20:10 +07004950 cm = parse_color_moved_ws(arg);
4951 if (cm & COLOR_MOVED_WS_ERROR)
4952 return error(_("invalid mode '%s' in --color-moved-ws"), arg);
4953 options->color_moved_ws_handling = cm;
4954 return 0;
4955}
4956
Nguyễn Thái Ngọc Duy212db692019-03-05 19:30:20 +07004957static int diff_opt_color_words(const struct option *opt,
4958 const char *arg, int unset)
4959{
4960 struct diff_options *options = opt->value;
4961
4962 BUG_ON_OPT_NEG(unset);
4963 options->use_color = 1;
4964 options->word_diff = DIFF_WORDS_COLOR;
4965 options->word_regex = arg;
4966 return 0;
4967}
4968
Nguyễn Thái Ngọc Duy7d7942b2019-02-21 18:16:11 +07004969static int diff_opt_compact_summary(const struct option *opt,
4970 const char *arg, int unset)
4971{
4972 struct diff_options *options = opt->value;
4973
4974 BUG_ON_OPT_ARG(arg);
4975 if (unset) {
4976 options->flags.stat_with_summary = 0;
4977 } else {
4978 options->flags.stat_with_summary = 1;
4979 options->output_format |= DIFF_FORMAT_DIFFSTAT;
4980 }
4981 return 0;
4982}
4983
Nguyễn Thái Ngọc Duy10f35b12019-03-05 19:30:10 +07004984static int diff_opt_diff_algorithm(const struct option *opt,
4985 const char *arg, int unset)
4986{
4987 struct diff_options *options = opt->value;
4988 long value = parse_algorithm_value(arg);
4989
4990 BUG_ON_OPT_NEG(unset);
4991 if (value < 0)
4992 return error(_("option diff-algorithm accepts \"myers\", "
4993 "\"minimal\", \"patience\" and \"histogram\""));
4994
4995 /* clear out previous settings */
4996 DIFF_XDL_CLR(options, NEED_MINIMAL);
4997 options->xdl_opts &= ~XDF_DIFF_ALGORITHM_MASK;
4998 options->xdl_opts |= value;
4999 return 0;
5000}
5001
Nguyễn Thái Ngọc Duy4ce7aab2019-02-21 18:16:03 +07005002static int diff_opt_dirstat(const struct option *opt,
5003 const char *arg, int unset)
5004{
5005 struct diff_options *options = opt->value;
5006
5007 BUG_ON_OPT_NEG(unset);
5008 if (!strcmp(opt->long_name, "cumulative")) {
5009 if (arg)
5010 BUG("how come --cumulative take a value?");
5011 arg = "cumulative";
5012 } else if (!strcmp(opt->long_name, "dirstat-by-file"))
5013 parse_dirstat_opt(options, "files");
5014 parse_dirstat_opt(options, arg ? arg : "");
5015 return 0;
5016}
5017
Nguyễn Thái Ngọc Duy7f648502019-02-21 18:16:16 +07005018static int diff_opt_find_copies(const struct option *opt,
5019 const char *arg, int unset)
5020{
5021 struct diff_options *options = opt->value;
5022
5023 BUG_ON_OPT_NEG(unset);
5024 if (!arg)
5025 arg = "";
5026 options->rename_score = parse_rename_score(&arg);
5027 if (*arg != 0)
5028 return error(_("invalid argument to %s"), opt->long_name);
5029
5030 if (options->detect_rename == DIFF_DETECT_COPY)
5031 options->flags.find_copies_harder = 1;
5032 else
5033 options->detect_rename = DIFF_DETECT_COPY;
5034
5035 return 0;
5036}
5037
Nguyễn Thái Ngọc Duyf4763082019-02-21 18:16:14 +07005038static int diff_opt_find_renames(const struct option *opt,
5039 const char *arg, int unset)
5040{
5041 struct diff_options *options = opt->value;
5042
5043 BUG_ON_OPT_NEG(unset);
5044 if (!arg)
5045 arg = "";
5046 options->rename_score = parse_rename_score(&arg);
5047 if (*arg != 0)
5048 return error(_("invalid argument to %s"), opt->long_name);
5049
5050 options->detect_rename = DIFF_DETECT_RENAME;
5051 return 0;
5052}
5053
Nguyễn Thái Ngọc Duy1e9250b2019-03-05 19:30:16 +07005054static int diff_opt_follow(const struct option *opt,
5055 const char *arg, int unset)
5056{
5057 struct diff_options *options = opt->value;
5058
5059 BUG_ON_OPT_ARG(arg);
5060 if (unset) {
5061 options->flags.follow_renames = 0;
5062 options->flags.default_follow_renames = 0;
5063 } else {
5064 options->flags.follow_renames = 1;
5065 }
5066 return 0;
5067}
5068
Nguyễn Thái Ngọc Duyb680ee12019-03-05 19:30:25 +07005069static int diff_opt_ignore_submodules(const struct option *opt,
5070 const char *arg, int unset)
5071{
5072 struct diff_options *options = opt->value;
5073
5074 BUG_ON_OPT_NEG(unset);
5075 if (!arg)
5076 arg = "all";
5077 options->flags.override_submodule_config = 1;
5078 handle_ignore_submodules_arg(options, arg);
5079 return 0;
5080}
5081
Nguyễn Thái Ngọc Duy2f81cf92019-03-24 15:20:06 +07005082static int diff_opt_line_prefix(const struct option *opt,
5083 const char *optarg, int unset)
5084{
5085 struct diff_options *options = opt->value;
5086
5087 BUG_ON_OPT_NEG(unset);
5088 options->line_prefix = optarg;
5089 options->line_prefix_length = strlen(options->line_prefix);
5090 graph_setup_line_prefix(options);
5091 return 0;
5092}
5093
Nguyễn Thái Ngọc Duy11c659d2019-03-24 15:20:07 +07005094static int diff_opt_no_prefix(const struct option *opt,
5095 const char *optarg, int unset)
5096{
5097 struct diff_options *options = opt->value;
5098
5099 BUG_ON_OPT_NEG(unset);
5100 BUG_ON_OPT_ARG(optarg);
5101 options->a_prefix = "";
5102 options->b_prefix = "";
5103 return 0;
5104}
5105
Nguyễn Thái Ngọc Duyaf2f3682019-02-21 18:16:12 +07005106static enum parse_opt_result diff_opt_output(struct parse_opt_ctx_t *ctx,
5107 const struct option *opt,
5108 const char *arg, int unset)
5109{
5110 struct diff_options *options = opt->value;
5111 char *path;
5112
5113 BUG_ON_OPT_NEG(unset);
5114 path = prefix_filename(ctx->prefix, arg);
5115 options->file = xfopen(path, "w");
5116 options->close_file = 1;
5117 if (options->use_color != GIT_COLOR_ALWAYS)
5118 options->use_color = GIT_COLOR_NEVER;
5119 free(path);
5120 return 0;
5121}
5122
Nguyễn Thái Ngọc Duy31fd6402019-03-05 19:30:08 +07005123static int diff_opt_patience(const struct option *opt,
5124 const char *arg, int unset)
5125{
5126 struct diff_options *options = opt->value;
5127 int i;
5128
5129 BUG_ON_OPT_NEG(unset);
5130 BUG_ON_OPT_ARG(arg);
5131 options->xdl_opts = DIFF_WITH_ALG(options, PATIENCE_DIFF);
5132 /*
5133 * Both --patience and --anchored use PATIENCE_DIFF
5134 * internally, so remove any anchors previously
5135 * specified.
5136 */
5137 for (i = 0; i < options->anchors_nr; i++)
5138 free(options->anchors[i]);
5139 options->anchors_nr = 0;
5140 return 0;
5141}
5142
Nguyễn Thái Ngọc Duya41cfb32019-03-24 15:19:59 +07005143static int diff_opt_pickaxe_regex(const struct option *opt,
5144 const char *arg, int unset)
5145{
5146 struct diff_options *options = opt->value;
5147
5148 BUG_ON_OPT_NEG(unset);
5149 options->pickaxe = arg;
5150 options->pickaxe_opts |= DIFF_PICKAXE_KIND_G;
5151 return 0;
5152}
5153
5154static int diff_opt_pickaxe_string(const struct option *opt,
5155 const char *arg, int unset)
5156{
5157 struct diff_options *options = opt->value;
5158
5159 BUG_ON_OPT_NEG(unset);
5160 options->pickaxe = arg;
5161 options->pickaxe_opts |= DIFF_PICKAXE_KIND_S;
5162 return 0;
5163}
5164
Nguyễn Thái Ngọc Duy0b1c5b52019-02-21 18:16:19 +07005165static int diff_opt_relative(const struct option *opt,
5166 const char *arg, int unset)
5167{
5168 struct diff_options *options = opt->value;
5169
5170 BUG_ON_OPT_NEG(unset);
5171 options->flags.relative_name = 1;
5172 if (arg)
5173 options->prefix = arg;
5174 return 0;
5175}
5176
Nguyễn Thái Ngọc Duy125dcea2019-03-05 19:30:26 +07005177static int diff_opt_submodule(const struct option *opt,
5178 const char *arg, int unset)
5179{
5180 struct diff_options *options = opt->value;
5181
5182 BUG_ON_OPT_NEG(unset);
5183 if (!arg)
5184 arg = "log";
5185 if (parse_submodule_params(options, arg))
5186 return error(_("failed to parse --submodule option parameter: '%s'"),
5187 arg);
5188 return 0;
5189}
5190
Nguyễn Thái Ngọc Duy8ab76972019-03-05 19:30:24 +07005191static int diff_opt_textconv(const struct option *opt,
5192 const char *arg, int unset)
5193{
5194 struct diff_options *options = opt->value;
5195
5196 BUG_ON_OPT_ARG(arg);
5197 if (unset) {
5198 options->flags.allow_textconv = 0;
5199 } else {
5200 options->flags.allow_textconv = 1;
5201 options->flags.textconv_set_via_cmdline = 1;
5202 }
5203 return 0;
5204}
5205
Nguyễn Thái Ngọc Duyd473e2e2019-01-27 07:35:33 +07005206static int diff_opt_unified(const struct option *opt,
5207 const char *arg, int unset)
5208{
5209 struct diff_options *options = opt->value;
5210 char *s;
5211
5212 BUG_ON_OPT_NEG(unset);
5213
5214 options->context = strtol(arg, &s, 10);
5215 if (*s)
5216 return error(_("%s expects a numerical value"), "--unified");
5217 enable_patch_output(&options->output_format);
5218
5219 return 0;
5220}
5221
Nguyễn Thái Ngọc Duye9fb39b2019-03-05 19:30:18 +07005222static int diff_opt_word_diff(const struct option *opt,
5223 const char *arg, int unset)
5224{
5225 struct diff_options *options = opt->value;
5226
5227 BUG_ON_OPT_NEG(unset);
5228 if (arg) {
5229 if (!strcmp(arg, "plain"))
5230 options->word_diff = DIFF_WORDS_PLAIN;
5231 else if (!strcmp(arg, "color")) {
5232 options->use_color = 1;
5233 options->word_diff = DIFF_WORDS_COLOR;
5234 }
5235 else if (!strcmp(arg, "porcelain"))
5236 options->word_diff = DIFF_WORDS_PORCELAIN;
5237 else if (!strcmp(arg, "none"))
5238 options->word_diff = DIFF_WORDS_NONE;
5239 else
5240 return error(_("bad --word-diff argument: %s"), arg);
5241 } else {
5242 if (options->word_diff == DIFF_WORDS_NONE)
5243 options->word_diff = DIFF_WORDS_PLAIN;
5244 }
5245 return 0;
5246}
5247
Nguyễn Thái Ngọc Duy797df112019-03-05 19:30:19 +07005248static int diff_opt_word_diff_regex(const struct option *opt,
5249 const char *arg, int unset)
5250{
5251 struct diff_options *options = opt->value;
5252
5253 BUG_ON_OPT_NEG(unset);
5254 if (options->word_diff == DIFF_WORDS_NONE)
5255 options->word_diff = DIFF_WORDS_PLAIN;
5256 options->word_regex = arg;
5257 return 0;
5258}
5259
Nguyễn Thái Ngọc Duy4a288472019-01-27 07:35:31 +07005260static void prep_parse_options(struct diff_options *options)
5261{
5262 struct option parseopts[] = {
Nguyễn Thái Ngọc Duycc013c22019-01-27 07:35:32 +07005263 OPT_GROUP(N_("Diff output format options")),
5264 OPT_BITOP('p', "patch", &options->output_format,
5265 N_("generate patch"),
5266 DIFF_FORMAT_PATCH, DIFF_FORMAT_NO_OUTPUT),
Nguyễn Thái Ngọc Duye01df7a2019-02-21 18:16:09 +07005267 OPT_BIT_F('s', "no-patch", &options->output_format,
5268 N_("suppress diff output"),
5269 DIFF_FORMAT_NO_OUTPUT, PARSE_OPT_NONEG),
Nguyễn Thái Ngọc Duycc013c22019-01-27 07:35:32 +07005270 OPT_BITOP('u', NULL, &options->output_format,
5271 N_("generate patch"),
5272 DIFF_FORMAT_PATCH, DIFF_FORMAT_NO_OUTPUT),
Nguyễn Thái Ngọc Duyd473e2e2019-01-27 07:35:33 +07005273 OPT_CALLBACK_F('U', "unified", options, N_("<n>"),
5274 N_("generate diffs with <n> lines context"),
5275 PARSE_OPT_NONEG, diff_opt_unified),
Nguyễn Thái Ngọc Duy7fd9a1b2019-01-27 07:35:34 +07005276 OPT_BOOL('W', "function-context", &options->flags.funccontext,
5277 N_("generate diffs with <n> lines context")),
Nguyễn Thái Ngọc Duyed881482019-01-27 07:35:35 +07005278 OPT_BIT_F(0, "raw", &options->output_format,
5279 N_("generate the diff in raw format"),
5280 DIFF_FORMAT_RAW, PARSE_OPT_NONEG),
Nguyễn Thái Ngọc Duyc659f302019-02-16 18:36:35 +07005281 OPT_BITOP(0, "patch-with-raw", &options->output_format,
5282 N_("synonym for '-p --raw'"),
5283 DIFF_FORMAT_PATCH | DIFF_FORMAT_RAW,
5284 DIFF_FORMAT_NO_OUTPUT),
Nguyễn Thái Ngọc Duye550f582019-02-21 18:16:06 +07005285 OPT_BITOP(0, "patch-with-stat", &options->output_format,
5286 N_("synonym for '-p --stat'"),
5287 DIFF_FORMAT_PATCH | DIFF_FORMAT_DIFFSTAT,
5288 DIFF_FORMAT_NO_OUTPUT),
Nguyễn Thái Ngọc Duye5673622019-02-16 18:36:36 +07005289 OPT_BIT_F(0, "numstat", &options->output_format,
5290 N_("machine friendly --stat"),
5291 DIFF_FORMAT_NUMSTAT, PARSE_OPT_NONEG),
5292 OPT_BIT_F(0, "shortstat", &options->output_format,
5293 N_("output only the last line of --stat"),
5294 DIFF_FORMAT_SHORTSTAT, PARSE_OPT_NONEG),
Nguyễn Thái Ngọc Duy4ce7aab2019-02-21 18:16:03 +07005295 OPT_CALLBACK_F('X', "dirstat", options, N_("<param1,param2>..."),
5296 N_("output the distribution of relative amount of changes for each sub-directory"),
5297 PARSE_OPT_NONEG | PARSE_OPT_OPTARG,
5298 diff_opt_dirstat),
5299 OPT_CALLBACK_F(0, "cumulative", options, NULL,
5300 N_("synonym for --dirstat=cumulative"),
5301 PARSE_OPT_NONEG | PARSE_OPT_NOARG,
5302 diff_opt_dirstat),
5303 OPT_CALLBACK_F(0, "dirstat-by-file", options, N_("<param1,param2>..."),
5304 N_("synonym for --dirstat=files,param1,param2..."),
5305 PARSE_OPT_NONEG | PARSE_OPT_OPTARG,
5306 diff_opt_dirstat),
Nguyễn Thái Ngọc Duyfc6af3e2019-02-21 18:16:04 +07005307 OPT_BIT_F(0, "check", &options->output_format,
5308 N_("warn if changes introduce conflict markers or whitespace errors"),
5309 DIFF_FORMAT_CHECKDIFF, PARSE_OPT_NONEG),
Nguyễn Thái Ngọc Duy70a30412019-02-21 18:16:05 +07005310 OPT_BIT_F(0, "summary", &options->output_format,
5311 N_("condensed summary such as creations, renames and mode changes"),
5312 DIFF_FORMAT_SUMMARY, PARSE_OPT_NONEG),
Nguyễn Thái Ngọc Duy0e840e22019-02-21 18:16:07 +07005313 OPT_BIT_F(0, "name-only", &options->output_format,
5314 N_("show only names of changed files"),
5315 DIFF_FORMAT_NAME, PARSE_OPT_NONEG),
Nguyễn Thái Ngọc Duya2387472019-02-21 18:16:08 +07005316 OPT_BIT_F(0, "name-status", &options->output_format,
5317 N_("show only names and status of changed files"),
5318 DIFF_FORMAT_NAME_STATUS, PARSE_OPT_NONEG),
Nguyễn Thái Ngọc Duy84b50892019-02-21 18:16:10 +07005319 OPT_CALLBACK_F(0, "stat", options, N_("<width>[,<name-width>[,<count>]]"),
5320 N_("generate diffstat"),
5321 PARSE_OPT_NONEG | PARSE_OPT_OPTARG, diff_opt_stat),
5322 OPT_CALLBACK_F(0, "stat-width", options, N_("<width>"),
5323 N_("generate diffstat with a given width"),
5324 PARSE_OPT_NONEG, diff_opt_stat),
5325 OPT_CALLBACK_F(0, "stat-name-width", options, N_("<width>"),
5326 N_("generate diffstat with a given name width"),
5327 PARSE_OPT_NONEG, diff_opt_stat),
5328 OPT_CALLBACK_F(0, "stat-graph-width", options, N_("<width>"),
5329 N_("generate diffstat with a given graph width"),
5330 PARSE_OPT_NONEG, diff_opt_stat),
5331 OPT_CALLBACK_F(0, "stat-count", options, N_("<count>"),
5332 N_("generate diffstat with limited lines"),
5333 PARSE_OPT_NONEG, diff_opt_stat),
Nguyễn Thái Ngọc Duy7d7942b2019-02-21 18:16:11 +07005334 OPT_CALLBACK_F(0, "compact-summary", options, NULL,
5335 N_("generate compact summary in diffstat"),
5336 PARSE_OPT_NOARG, diff_opt_compact_summary),
Nguyễn Thái Ngọc Duy6d9af6f2019-03-05 19:30:12 +07005337 OPT_CALLBACK_F(0, "binary", options, NULL,
5338 N_("output a binary diff that can be applied"),
5339 PARSE_OPT_NONEG | PARSE_OPT_NOARG, diff_opt_binary),
Nguyễn Thái Ngọc Duy4fe01672019-03-05 19:30:13 +07005340 OPT_BOOL(0, "full-index", &options->flags.full_index,
5341 N_("show full pre- and post-image object names on the \"index\" lines")),
Nguyễn Thái Ngọc Duy8b81c262019-03-05 19:30:17 +07005342 OPT_COLOR_FLAG(0, "color", &options->use_color,
5343 N_("show colored diff")),
Nguyễn Thái Ngọc Duy5a749d92019-03-24 15:19:55 +07005344 OPT_CALLBACK_F(0, "ws-error-highlight", options, N_("<kind>"),
5345 N_("highlight whitespace errors in the 'context', 'old' or 'new' lines in the diff"),
5346 PARSE_OPT_NONEG, diff_opt_ws_error_highlight),
Nguyễn Thái Ngọc Duy1a1eb162019-03-24 15:19:57 +07005347 OPT_SET_INT('z', NULL, &options->line_termination,
5348 N_("do not munge pathnames and use NULs as output field terminators in --raw or --numstat"),
5349 0),
Nguyễn Thái Ngọc Duyd8774182019-03-24 15:20:04 +07005350 OPT__ABBREV(&options->abbrev),
Nguyễn Thái Ngọc Duy31fba9d2019-03-24 15:20:05 +07005351 OPT_STRING_F(0, "src-prefix", &options->a_prefix, N_("<prefix>"),
5352 N_("show the given source prefix instead of \"a/\""),
5353 PARSE_OPT_NONEG),
5354 OPT_STRING_F(0, "dst-prefix", &options->b_prefix, N_("<prefix>"),
5355 N_("show the given source prefix instead of \"b/\""),
5356 PARSE_OPT_NONEG),
Nguyễn Thái Ngọc Duy2f81cf92019-03-24 15:20:06 +07005357 OPT_CALLBACK_F(0, "line-prefix", options, N_("<prefix>"),
5358 N_("prepend an additional prefix to every line of output"),
5359 PARSE_OPT_NONEG, diff_opt_line_prefix),
Nguyễn Thái Ngọc Duy11c659d2019-03-24 15:20:07 +07005360 OPT_CALLBACK_F(0, "no-prefix", options, NULL,
5361 N_("do not show any source or destination prefix"),
5362 PARSE_OPT_NONEG | PARSE_OPT_NOARG, diff_opt_no_prefix),
Nguyễn Thái Ngọc Duy16ed6c92019-03-24 15:20:08 +07005363 OPT_INTEGER_F(0, "inter-hunk-context", &options->interhunkcontext,
5364 N_("show context between diff hunks up to the specified number of lines"),
5365 PARSE_OPT_NONEG),
Nguyễn Thái Ngọc Duyaf2f3682019-02-21 18:16:12 +07005366 OPT_CALLBACK_F(0, "output-indicator-new",
5367 &options->output_indicators[OUTPUT_INDICATOR_NEW],
5368 N_("<char>"),
5369 N_("specify the character to indicate a new line instead of '+'"),
5370 PARSE_OPT_NONEG, diff_opt_char),
5371 OPT_CALLBACK_F(0, "output-indicator-old",
5372 &options->output_indicators[OUTPUT_INDICATOR_OLD],
5373 N_("<char>"),
5374 N_("specify the character to indicate an old line instead of '-'"),
5375 PARSE_OPT_NONEG, diff_opt_char),
5376 OPT_CALLBACK_F(0, "output-indicator-context",
5377 &options->output_indicators[OUTPUT_INDICATOR_CONTEXT],
5378 N_("<char>"),
5379 N_("specify the character to indicate a context instead of ' '"),
5380 PARSE_OPT_NONEG, diff_opt_char),
5381
Nguyễn Thái Ngọc Duyced4e172019-02-21 18:16:13 +07005382 OPT_GROUP(N_("Diff rename options")),
5383 OPT_CALLBACK_F('B', "break-rewrites", &options->break_opt, N_("<n>[/<m>]"),
5384 N_("break complete rewrite changes into pairs of delete and create"),
5385 PARSE_OPT_NONEG | PARSE_OPT_OPTARG,
5386 diff_opt_break_rewrites),
Nguyễn Thái Ngọc Duyf4763082019-02-21 18:16:14 +07005387 OPT_CALLBACK_F('M', "find-renames", options, N_("<n>"),
5388 N_("detect renames"),
5389 PARSE_OPT_NONEG | PARSE_OPT_OPTARG,
5390 diff_opt_find_renames),
Nguyễn Thái Ngọc Duy1e533292019-02-21 18:16:15 +07005391 OPT_SET_INT_F('D', "irreversible-delete", &options->irreversible_delete,
5392 N_("omit the preimage for deletes"),
5393 1, PARSE_OPT_NONEG),
Nguyễn Thái Ngọc Duy7f648502019-02-21 18:16:16 +07005394 OPT_CALLBACK_F('C', "find-copies", options, N_("<n>"),
5395 N_("detect copies"),
5396 PARSE_OPT_NONEG | PARSE_OPT_OPTARG,
5397 diff_opt_find_copies),
Nguyễn Thái Ngọc Duybdd47412019-02-21 18:16:17 +07005398 OPT_BOOL(0, "find-copies-harder", &options->flags.find_copies_harder,
5399 N_("use unmodified files as source to find copies")),
Nguyễn Thái Ngọc Duycdc43eb2019-02-21 18:16:18 +07005400 OPT_SET_INT_F(0, "no-renames", &options->detect_rename,
5401 N_("disable rename detection"),
5402 0, PARSE_OPT_NONEG),
5403 OPT_BOOL(0, "rename-empty", &options->flags.rename_empty,
5404 N_("use empty blobs as rename source")),
Nguyễn Thái Ngọc Duy1e9250b2019-03-05 19:30:16 +07005405 OPT_CALLBACK_F(0, "follow", options, NULL,
5406 N_("continue listing the history of a file beyond renames"),
5407 PARSE_OPT_NOARG, diff_opt_follow),
Nguyễn Thái Ngọc Duybffee742019-03-24 15:19:58 +07005408 OPT_INTEGER('l', NULL, &options->rename_limit,
5409 N_("prevent rename/copy detection if the number of rename/copy targets exceeds given limit")),
Nguyễn Thái Ngọc Duyced4e172019-02-21 18:16:13 +07005410
Nguyễn Thái Ngọc Duy2e75f922019-02-21 18:16:20 +07005411 OPT_GROUP(N_("Diff algorithm options")),
5412 OPT_BIT(0, "minimal", &options->xdl_opts,
5413 N_("produce the smallest possible diff"),
5414 XDF_NEED_MINIMAL),
Nguyễn Thái Ngọc Duy87649a12019-02-21 18:16:21 +07005415 OPT_BIT_F('w', "ignore-all-space", &options->xdl_opts,
5416 N_("ignore whitespace when comparing lines"),
5417 XDF_IGNORE_WHITESPACE, PARSE_OPT_NONEG),
5418 OPT_BIT_F('b', "ignore-space-change", &options->xdl_opts,
5419 N_("ignore changes in amount of whitespace"),
5420 XDF_IGNORE_WHITESPACE_CHANGE, PARSE_OPT_NONEG),
5421 OPT_BIT_F(0, "ignore-space-at-eol", &options->xdl_opts,
5422 N_("ignore changes in whitespace at EOL"),
5423 XDF_IGNORE_WHITESPACE_AT_EOL, PARSE_OPT_NONEG),
5424 OPT_BIT_F(0, "ignore-cr-at-eol", &options->xdl_opts,
5425 N_("ignore carrier-return at the end of line"),
5426 XDF_IGNORE_CR_AT_EOL, PARSE_OPT_NONEG),
5427 OPT_BIT_F(0, "ignore-blank-lines", &options->xdl_opts,
5428 N_("ignore changes whose lines are all blank"),
5429 XDF_IGNORE_BLANK_LINES, PARSE_OPT_NONEG),
Nguyễn Thái Ngọc Duy06f77512019-03-05 19:30:07 +07005430 OPT_BIT(0, "indent-heuristic", &options->xdl_opts,
5431 N_("heuristic to shift diff hunk boundaries for easy reading"),
5432 XDF_INDENT_HEURISTIC),
Nguyễn Thái Ngọc Duy31fd6402019-03-05 19:30:08 +07005433 OPT_CALLBACK_F(0, "patience", options, NULL,
5434 N_("generate diff using the \"patience diff\" algorithm"),
5435 PARSE_OPT_NONEG | PARSE_OPT_NOARG,
5436 diff_opt_patience),
Nguyễn Thái Ngọc Duyf1e68ef2019-03-05 19:30:09 +07005437 OPT_BITOP(0, "histogram", &options->xdl_opts,
5438 N_("generate diff using the \"histogram diff\" algorithm"),
5439 XDF_HISTOGRAM_DIFF, XDF_DIFF_ALGORITHM_MASK),
Nguyễn Thái Ngọc Duy10f35b12019-03-05 19:30:10 +07005440 OPT_CALLBACK_F(0, "diff-algorithm", options, N_("<algorithm>"),
5441 N_("choose a diff algorithm"),
5442 PARSE_OPT_NONEG, diff_opt_diff_algorithm),
Nguyễn Thái Ngọc Duydf84a432019-03-05 19:30:11 +07005443 OPT_CALLBACK_F(0, "anchored", options, N_("<text>"),
5444 N_("generate diff using the \"anchored diff\" algorithm"),
5445 PARSE_OPT_NONEG, diff_opt_anchored),
Nguyễn Thái Ngọc Duye9fb39b2019-03-05 19:30:18 +07005446 OPT_CALLBACK_F(0, "word-diff", options, N_("<mode>"),
5447 N_("show word diff, using <mode> to delimit changed words"),
5448 PARSE_OPT_NONEG | PARSE_OPT_OPTARG, diff_opt_word_diff),
Nguyễn Thái Ngọc Duy797df112019-03-05 19:30:19 +07005449 OPT_CALLBACK_F(0, "word-diff-regex", options, N_("<regex>"),
5450 N_("use <regex> to decide what a word is"),
5451 PARSE_OPT_NONEG, diff_opt_word_diff_regex),
Nguyễn Thái Ngọc Duy212db692019-03-05 19:30:20 +07005452 OPT_CALLBACK_F(0, "color-words", options, N_("<regex>"),
5453 N_("equivalent to --word-diff=color --word-diff-regex=<regex>"),
5454 PARSE_OPT_NONEG | PARSE_OPT_OPTARG, diff_opt_color_words),
Nguyễn Thái Ngọc Duy59311a92019-03-24 15:20:09 +07005455 OPT_CALLBACK_F(0, "color-moved", options, N_("<mode>"),
5456 N_("move lines of code are colored differently"),
5457 PARSE_OPT_OPTARG, diff_opt_color_moved),
Nguyễn Thái Ngọc Duy8ce20202019-03-24 15:20:10 +07005458 OPT_CALLBACK_F(0, "color-moved-ws", options, N_("<mode>"),
5459 N_("how white spaces are ignored in --color-moved"),
Nguyễn Thái Ngọc Duybb987292019-03-24 15:20:11 +07005460 0, diff_opt_color_moved_ws),
Nguyễn Thái Ngọc Duy2e75f922019-02-21 18:16:20 +07005461
Nguyễn Thái Ngọc Duyaf2f3682019-02-21 18:16:12 +07005462 OPT_GROUP(N_("Diff other options")),
Nguyễn Thái Ngọc Duy0b1c5b52019-02-21 18:16:19 +07005463 OPT_CALLBACK_F(0, "relative", options, N_("<prefix>"),
5464 N_("when run from subdir, exclude changes outside and show relative paths"),
5465 PARSE_OPT_NONEG | PARSE_OPT_OPTARG,
5466 diff_opt_relative),
Nguyễn Thái Ngọc Duyc37d4c02019-03-05 19:30:14 +07005467 OPT_BOOL('a', "text", &options->flags.text,
5468 N_("treat all files as text")),
Nguyễn Thái Ngọc Duy4f99f292019-03-05 19:30:15 +07005469 OPT_BOOL('R', NULL, &options->flags.reverse_diff,
5470 N_("swap two inputs, reverse the diff")),
Nguyễn Thái Ngọc Duy1086ea02019-03-05 19:30:21 +07005471 OPT_BOOL(0, "exit-code", &options->flags.exit_with_status,
5472 N_("exit with 1 if there were differences, 0 otherwise")),
Nguyễn Thái Ngọc Duy9bbaf1c2019-03-05 19:30:22 +07005473 OPT_BOOL(0, "quiet", &options->flags.quick,
5474 N_("disable all output of the program")),
Nguyễn Thái Ngọc Duy0cda1002019-03-05 19:30:23 +07005475 OPT_BOOL(0, "ext-diff", &options->flags.allow_external,
5476 N_("allow an external diff helper to be executed")),
Nguyễn Thái Ngọc Duy8ab76972019-03-05 19:30:24 +07005477 OPT_CALLBACK_F(0, "textconv", options, NULL,
5478 N_("run external text conversion filters when comparing binary files"),
5479 PARSE_OPT_NOARG, diff_opt_textconv),
Nguyễn Thái Ngọc Duyb680ee12019-03-05 19:30:25 +07005480 OPT_CALLBACK_F(0, "ignore-submodules", options, N_("<when>"),
5481 N_("ignore changes to submodules in the diff generation"),
5482 PARSE_OPT_NONEG | PARSE_OPT_OPTARG,
5483 diff_opt_ignore_submodules),
Nguyễn Thái Ngọc Duy125dcea2019-03-05 19:30:26 +07005484 OPT_CALLBACK_F(0, "submodule", options, N_("<format>"),
5485 N_("specify how differences in submodules are shown"),
5486 PARSE_OPT_NONEG | PARSE_OPT_OPTARG,
5487 diff_opt_submodule),
Nguyễn Thái Ngọc Duy96860e42019-03-24 15:19:56 +07005488 OPT_SET_INT_F(0, "ita-invisible-in-index", &options->ita_invisible_in_index,
5489 N_("hide 'git add -N' entries from the index"),
5490 1, PARSE_OPT_NONEG),
5491 OPT_SET_INT_F(0, "ita-visible-in-index", &options->ita_invisible_in_index,
5492 N_("treat 'git add -N' entries as real in the index"),
5493 0, PARSE_OPT_NONEG),
Nguyễn Thái Ngọc Duya41cfb32019-03-24 15:19:59 +07005494 OPT_CALLBACK_F('S', NULL, options, N_("<string>"),
5495 N_("look for differences that change the number of occurrences of the specified string"),
5496 0, diff_opt_pickaxe_string),
5497 OPT_CALLBACK_F('G', NULL, options, N_("<regex>"),
5498 N_("look for differences that change the number of occurrences of the specified regex"),
5499 0, diff_opt_pickaxe_regex),
Nguyễn Thái Ngọc Duy85f8e882019-03-24 15:20:00 +07005500 OPT_BIT_F(0, "pickaxe-all", &options->pickaxe_opts,
5501 N_("show all changes in the changeset with -S or -G"),
5502 DIFF_PICKAXE_ALL, PARSE_OPT_NONEG),
5503 OPT_BIT_F(0, "pickaxe-regex", &options->pickaxe_opts,
5504 N_("treat <string> in -S as extended POSIX regular expression"),
5505 DIFF_PICKAXE_REGEX, PARSE_OPT_NONEG),
Nguyễn Thái Ngọc Duyf7318142019-03-24 15:20:01 +07005506 OPT_FILENAME('O', NULL, &options->orderfile,
5507 N_("control the order in which files appear in the output")),
Nguyễn Thái Ngọc Duya75f28c2019-03-24 15:20:02 +07005508 OPT_CALLBACK_F(0, "find-object", options, N_("<object-id>"),
5509 N_("look for differences that change the number of occurrences of the specified object"),
5510 PARSE_OPT_NONEG, diff_opt_find_object),
Nguyễn Thái Ngọc Duyd2d3f272019-03-24 15:20:03 +07005511 OPT_CALLBACK_F(0, "diff-filter", options, N_("[(A|C|D|M|R|T|U|X|B)...[*]]"),
5512 N_("select files by diff type"),
5513 PARSE_OPT_NONEG, diff_opt_diff_filter),
Nguyễn Thái Ngọc Duyaf2f3682019-02-21 18:16:12 +07005514 { OPTION_CALLBACK, 0, "output", options, N_("<file>"),
5515 N_("Output to a specific file"),
5516 PARSE_OPT_NONEG, NULL, 0, diff_opt_output },
5517
Nguyễn Thái Ngọc Duy4a288472019-01-27 07:35:31 +07005518 OPT_END()
5519 };
5520
5521 ALLOC_ARRAY(options->parseopts, ARRAY_SIZE(parseopts));
5522 memcpy(options->parseopts, parseopts, sizeof(parseopts));
5523}
5524
Duy Nguyena97262c2016-01-21 18:48:44 +07005525int diff_opt_parse(struct diff_options *options,
5526 const char **av, int ac, const char *prefix)
Junio C Hamano6973dca2006-04-21 23:57:45 -07005527{
Duy Nguyena97262c2016-01-21 18:48:44 +07005528 if (!prefix)
5529 prefix = "";
5530
Nguyễn Thái Ngọc Duy4a288472019-01-27 07:35:31 +07005531 ac = parse_options(ac, av, prefix, options->parseopts, NULL,
5532 PARSE_OPT_KEEP_DASHDASH |
5533 PARSE_OPT_KEEP_UNKNOWN |
5534 PARSE_OPT_NO_INTERNAL_HELP |
5535 PARSE_OPT_ONE_SHOT |
5536 PARSE_OPT_STOP_AT_NON_OPTION);
5537
Nguyễn Thái Ngọc Duy8ce20202019-03-24 15:20:10 +07005538 return ac;
Junio C Hamano6973dca2006-04-21 23:57:45 -07005539}
5540
Kevin Ballard10ae7522010-09-27 16:58:25 -07005541int parse_rename_score(const char **cp_p)
Junio C Hamano6973dca2006-04-21 23:57:45 -07005542{
5543 unsigned long num, scale;
5544 int ch, dot;
5545 const char *cp = *cp_p;
5546
5547 num = 0;
5548 scale = 1;
5549 dot = 0;
Brian Gianforcaroeeefa7c2009-09-01 01:35:10 -04005550 for (;;) {
Junio C Hamano6973dca2006-04-21 23:57:45 -07005551 ch = *cp;
5552 if ( !dot && ch == '.' ) {
5553 scale = 1;
5554 dot = 1;
5555 } else if ( ch == '%' ) {
5556 scale = dot ? scale*100 : 100;
5557 cp++; /* % is always at the end */
5558 break;
5559 } else if ( ch >= '0' && ch <= '9' ) {
5560 if ( scale < 100000 ) {
5561 scale *= 10;
5562 num = (num*10) + (ch-'0');
5563 }
5564 } else {
5565 break;
5566 }
5567 cp++;
5568 }
5569 *cp_p = cp;
5570
5571 /* user says num divided by scale and we say internally that
5572 * is MAX_SCORE * num / scale.
5573 */
Shawn O. Pearcedc49cd72007-03-06 20:44:37 -05005574 return (int)((num >= scale) ? MAX_SCORE : (MAX_SCORE * num / scale));
Junio C Hamano6973dca2006-04-21 23:57:45 -07005575}
5576
Junio C Hamano6973dca2006-04-21 23:57:45 -07005577struct diff_queue_struct diff_queued_diff;
5578
5579void diff_q(struct diff_queue_struct *queue, struct diff_filepair *dp)
5580{
Dmitry S. Dolzhenko4c960a42014-03-04 02:31:53 +04005581 ALLOC_GROW(queue->queue, queue->nr + 1, queue->alloc);
Junio C Hamano6973dca2006-04-21 23:57:45 -07005582 queue->queue[queue->nr++] = dp;
5583}
5584
5585struct diff_filepair *diff_queue(struct diff_queue_struct *queue,
5586 struct diff_filespec *one,
5587 struct diff_filespec *two)
5588{
Junio C Hamanoef677682006-08-03 12:01:01 -07005589 struct diff_filepair *dp = xcalloc(1, sizeof(*dp));
Junio C Hamano6973dca2006-04-21 23:57:45 -07005590 dp->one = one;
5591 dp->two = two;
Junio C Hamano6973dca2006-04-21 23:57:45 -07005592 if (queue)
5593 diff_q(queue, dp);
5594 return dp;
5595}
5596
5597void diff_free_filepair(struct diff_filepair *p)
5598{
Linus Torvalds9fb88412007-10-25 11:19:10 -07005599 free_filespec(p->one);
5600 free_filespec(p->two);
Junio C Hamano6973dca2006-04-21 23:57:45 -07005601 free(p);
5602}
5603
Jeff Kingd6cece52016-10-20 02:20:07 -04005604const char *diff_aligned_abbrev(const struct object_id *oid, int len)
Junio C Hamano6973dca2006-04-21 23:57:45 -07005605{
5606 int abblen;
5607 const char *abbrev;
Junio C Hamano6973dca2006-04-21 23:57:45 -07005608
Ann T Ropea7cb6ac12017-12-03 22:27:42 +01005609 /* Do we want all 40 hex characters? */
brian m. carlson02afca12018-07-16 01:28:05 +00005610 if (len == the_hash_algo->hexsz)
Jeff Kingd6cece52016-10-20 02:20:07 -04005611 return oid_to_hex(oid);
5612
Ann T Ropea7cb6ac12017-12-03 22:27:42 +01005613 /* An abbreviated value is fine, possibly followed by an ellipsis. */
Jeff King4f036662016-10-20 02:21:25 -04005614 abbrev = diff_abbrev_oid(oid, len);
Ann T Ropea7cb6ac12017-12-03 22:27:42 +01005615
5616 if (!print_sha1_ellipsis())
5617 return abbrev;
5618
Junio C Hamano6973dca2006-04-21 23:57:45 -07005619 abblen = strlen(abbrev);
Junio C Hamanod709f1f2016-09-30 10:42:05 -07005620
5621 /*
Ann T Ropea7cb6ac12017-12-03 22:27:42 +01005622 * In well-behaved cases, where the abbreviated result is the
Junio C Hamanod709f1f2016-09-30 10:42:05 -07005623 * same as the requested length, append three dots after the
5624 * abbreviation (hence the whole logic is limited to the case
5625 * where abblen < 37); when the actual abbreviated result is a
5626 * bit longer than the requested length, we reduce the number
5627 * of dots so that they match the well-behaved ones. However,
5628 * if the actual abbreviation is longer than the requested
5629 * length by more than three, we give up on aligning, and add
5630 * three dots anyway, to indicate that the output is not the
5631 * full object name. Yes, this may be suboptimal, but this
5632 * appears only in "diff --raw --abbrev" output and it is not
5633 * worth the effort to change it now. Note that this would
5634 * likely to work fine when the automatic sizing of default
5635 * abbreviation length is used--we would be fed -1 in "len" in
5636 * that case, and will end up always appending three-dots, but
5637 * the automatic sizing is supposed to give abblen that ensures
5638 * uniqueness across all objects (statistically speaking).
5639 */
brian m. carlson02afca12018-07-16 01:28:05 +00005640 if (abblen < the_hash_algo->hexsz - 3) {
brian m. carlsondc015052017-03-26 16:01:24 +00005641 static char hex[GIT_MAX_HEXSZ + 1];
Junio C Hamano6973dca2006-04-21 23:57:45 -07005642 if (len < abblen && abblen <= len + 2)
Jeff King5096d492015-09-24 17:06:08 -04005643 xsnprintf(hex, sizeof(hex), "%s%.*s", abbrev, len+3-abblen, "..");
Junio C Hamano6973dca2006-04-21 23:57:45 -07005644 else
Jeff King5096d492015-09-24 17:06:08 -04005645 xsnprintf(hex, sizeof(hex), "%s...", abbrev);
Junio C Hamano6973dca2006-04-21 23:57:45 -07005646 return hex;
5647 }
Jeff Kingd6cece52016-10-20 02:20:07 -04005648
5649 return oid_to_hex(oid);
Junio C Hamano6973dca2006-04-21 23:57:45 -07005650}
5651
Pierre Habouzit663af342007-09-20 00:42:15 +02005652static void diff_flush_raw(struct diff_filepair *p, struct diff_options *opt)
Junio C Hamano6973dca2006-04-21 23:57:45 -07005653{
Pierre Habouzit663af342007-09-20 00:42:15 +02005654 int line_termination = opt->line_termination;
5655 int inter_name_termination = line_termination ? '\t' : '\0';
Timo Hirvonenc6744342006-06-24 20:21:53 +03005656
John Keeping30997bb2013-02-07 20:15:27 +00005657 fprintf(opt->file, "%s", diff_line_prefix(opt));
Pierre Habouzit663af342007-09-20 00:42:15 +02005658 if (!(opt->output_format & DIFF_FORMAT_NAME_STATUS)) {
Daniel Barkalowc0c77732008-03-09 22:43:39 -04005659 fprintf(opt->file, ":%06o %06o %s ", p->one->mode, p->two->mode,
Jeff Kingd6cece52016-10-20 02:20:07 -04005660 diff_aligned_abbrev(&p->one->oid, opt->abbrev));
brian m. carlsona0d12c42016-06-24 23:09:23 +00005661 fprintf(opt->file, "%s ",
Jeff Kingd6cece52016-10-20 02:20:07 -04005662 diff_aligned_abbrev(&p->two->oid, opt->abbrev));
Pierre Habouzit663af342007-09-20 00:42:15 +02005663 }
5664 if (p->score) {
Daniel Barkalowc0c77732008-03-09 22:43:39 -04005665 fprintf(opt->file, "%c%03d%c", p->status, similarity_index(p),
5666 inter_name_termination);
Pierre Habouzit663af342007-09-20 00:42:15 +02005667 } else {
Daniel Barkalowc0c77732008-03-09 22:43:39 -04005668 fprintf(opt->file, "%c%c", p->status, inter_name_termination);
Junio C Hamano6973dca2006-04-21 23:57:45 -07005669 }
5670
Junio C Hamanocd676a52008-02-12 14:26:02 -08005671 if (p->status == DIFF_STATUS_COPIED ||
5672 p->status == DIFF_STATUS_RENAMED) {
5673 const char *name_a, *name_b;
5674 name_a = p->one->path;
5675 name_b = p->two->path;
5676 strip_prefix(opt->prefix_length, &name_a, &name_b);
Daniel Barkalowc0c77732008-03-09 22:43:39 -04005677 write_name_quoted(name_a, opt->file, inter_name_termination);
5678 write_name_quoted(name_b, opt->file, line_termination);
Pierre Habouzit663af342007-09-20 00:42:15 +02005679 } else {
Junio C Hamanocd676a52008-02-12 14:26:02 -08005680 const char *name_a, *name_b;
5681 name_a = p->one->mode ? p->one->path : p->two->path;
5682 name_b = NULL;
5683 strip_prefix(opt->prefix_length, &name_a, &name_b);
Daniel Barkalowc0c77732008-03-09 22:43:39 -04005684 write_name_quoted(name_a, opt->file, line_termination);
Junio C Hamano6973dca2006-04-21 23:57:45 -07005685 }
Junio C Hamano6973dca2006-04-21 23:57:45 -07005686}
5687
5688int diff_unmodified_pair(struct diff_filepair *p)
5689{
5690 /* This function is written stricter than necessary to support
5691 * the currently implemented transformers, but the idea is to
5692 * let transformers to produce diff_filepairs any way they want,
5693 * and filter and clean them up here before producing the output.
5694 */
Pierre Habouzit663af342007-09-20 00:42:15 +02005695 struct diff_filespec *one = p->one, *two = p->two;
Junio C Hamano6973dca2006-04-21 23:57:45 -07005696
5697 if (DIFF_PAIR_UNMERGED(p))
5698 return 0; /* unmerged is interesting */
5699
Junio C Hamano6973dca2006-04-21 23:57:45 -07005700 /* deletion, addition, mode or type change
5701 * and rename are all interesting.
5702 */
5703 if (DIFF_FILE_VALID(one) != DIFF_FILE_VALID(two) ||
5704 DIFF_PAIR_MODE_CHANGED(p) ||
5705 strcmp(one->path, two->path))
5706 return 0;
5707
5708 /* both are valid and point at the same path. that is, we are
5709 * dealing with a change.
5710 */
brian m. carlson41c95602016-06-24 23:09:24 +00005711 if (one->oid_valid && two->oid_valid &&
Jeff King4a7e27e2018-08-28 17:22:40 -04005712 oideq(&one->oid, &two->oid) &&
Jens Lehmann85adbf22010-03-12 22:23:52 +01005713 !one->dirty_submodule && !two->dirty_submodule)
Junio C Hamano6973dca2006-04-21 23:57:45 -07005714 return 1; /* no change */
brian m. carlson41c95602016-06-24 23:09:24 +00005715 if (!one->oid_valid && !two->oid_valid)
Junio C Hamano6973dca2006-04-21 23:57:45 -07005716 return 1; /* both look at the same file on the filesystem. */
5717 return 0;
5718}
5719
5720static void diff_flush_patch(struct diff_filepair *p, struct diff_options *o)
5721{
5722 if (diff_unmodified_pair(p))
5723 return;
5724
5725 if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) ||
5726 (DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode)))
5727 return; /* no tree diffs in patch format */
5728
5729 run_diff(p, o);
5730}
5731
5732static void diff_flush_stat(struct diff_filepair *p, struct diff_options *o,
5733 struct diffstat_t *diffstat)
5734{
5735 if (diff_unmodified_pair(p))
5736 return;
5737
5738 if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) ||
5739 (DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode)))
Yann Dirsonc3fced62010-10-24 23:03:10 +02005740 return; /* no useful stat for tree diffs */
Junio C Hamano6973dca2006-04-21 23:57:45 -07005741
5742 run_diffstat(p, o, diffstat);
5743}
5744
Johannes Schindelin88246892006-05-20 23:43:13 +02005745static void diff_flush_checkdiff(struct diff_filepair *p,
5746 struct diff_options *o)
5747{
5748 if (diff_unmodified_pair(p))
5749 return;
5750
5751 if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) ||
5752 (DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode)))
Yann Dirsonc3fced62010-10-24 23:03:10 +02005753 return; /* nothing to check in tree diffs */
Johannes Schindelin88246892006-05-20 23:43:13 +02005754
5755 run_checkdiff(p, o);
5756}
5757
Junio C Hamano6973dca2006-04-21 23:57:45 -07005758int diff_queue_is_empty(void)
5759{
5760 struct diff_queue_struct *q = &diff_queued_diff;
5761 int i;
5762 for (i = 0; i < q->nr; i++)
5763 if (!diff_unmodified_pair(q->queue[i]))
5764 return 0;
5765 return 1;
5766}
5767
5768#if DIFF_DEBUG
5769void diff_debug_filespec(struct diff_filespec *s, int x, const char *one)
5770{
5771 fprintf(stderr, "queue[%d] %s (%s) %s %06o %s\n",
5772 x, one ? one : "",
5773 s->path,
5774 DIFF_FILE_VALID(s) ? "valid" : "invalid",
5775 s->mode,
brian m. carlson41c95602016-06-24 23:09:24 +00005776 s->oid_valid ? oid_to_hex(&s->oid) : "");
Jeff King428d52a2014-01-16 20:21:59 -05005777 fprintf(stderr, "queue[%d] %s size %lu\n",
Junio C Hamano6973dca2006-04-21 23:57:45 -07005778 x, one ? one : "",
Jeff King428d52a2014-01-16 20:21:59 -05005779 s->size);
Junio C Hamano6973dca2006-04-21 23:57:45 -07005780}
5781
5782void diff_debug_filepair(const struct diff_filepair *p, int i)
5783{
5784 diff_debug_filespec(p->one, i, "one");
5785 diff_debug_filespec(p->two, i, "two");
Linus Torvalds64479712007-10-25 11:20:56 -07005786 fprintf(stderr, "score %d, status %c rename_used %d broken %d\n",
Junio C Hamano6973dca2006-04-21 23:57:45 -07005787 p->score, p->status ? p->status : '?',
Linus Torvalds64479712007-10-25 11:20:56 -07005788 p->one->rename_used, p->broken_pair);
Junio C Hamano6973dca2006-04-21 23:57:45 -07005789}
5790
5791void diff_debug_queue(const char *msg, struct diff_queue_struct *q)
5792{
5793 int i;
5794 if (msg)
5795 fprintf(stderr, "%s\n", msg);
5796 fprintf(stderr, "q->nr = %d\n", q->nr);
5797 for (i = 0; i < q->nr; i++) {
5798 struct diff_filepair *p = q->queue[i];
5799 diff_debug_filepair(p, i);
5800 }
5801}
5802#endif
5803
5804static void diff_resolve_rename_copy(void)
5805{
Linus Torvalds64479712007-10-25 11:20:56 -07005806 int i;
5807 struct diff_filepair *p;
Junio C Hamano6973dca2006-04-21 23:57:45 -07005808 struct diff_queue_struct *q = &diff_queued_diff;
5809
5810 diff_debug_queue("resolve-rename-copy", q);
5811
5812 for (i = 0; i < q->nr; i++) {
5813 p = q->queue[i];
5814 p->status = 0; /* undecided */
5815 if (DIFF_PAIR_UNMERGED(p))
5816 p->status = DIFF_STATUS_UNMERGED;
5817 else if (!DIFF_FILE_VALID(p->one))
5818 p->status = DIFF_STATUS_ADDED;
5819 else if (!DIFF_FILE_VALID(p->two))
5820 p->status = DIFF_STATUS_DELETED;
5821 else if (DIFF_PAIR_TYPE_CHANGED(p))
5822 p->status = DIFF_STATUS_TYPE_CHANGED;
5823
5824 /* from this point on, we are dealing with a pair
5825 * whose both sides are valid and of the same type, i.e.
5826 * either in-place edit or rename/copy edit.
5827 */
5828 else if (DIFF_PAIR_RENAME(p)) {
Linus Torvalds64479712007-10-25 11:20:56 -07005829 /*
5830 * A rename might have re-connected a broken
5831 * pair up, causing the pathnames to be the
5832 * same again. If so, that's not a rename at
5833 * all, just a modification..
5834 *
5835 * Otherwise, see if this source was used for
5836 * multiple renames, in which case we decrement
5837 * the count, and call it a copy.
Junio C Hamano6973dca2006-04-21 23:57:45 -07005838 */
Linus Torvalds64479712007-10-25 11:20:56 -07005839 if (!strcmp(p->one->path, p->two->path))
5840 p->status = DIFF_STATUS_MODIFIED;
5841 else if (--p->one->rename_used > 0)
Junio C Hamano6973dca2006-04-21 23:57:45 -07005842 p->status = DIFF_STATUS_COPIED;
Linus Torvalds64479712007-10-25 11:20:56 -07005843 else
Junio C Hamano6973dca2006-04-21 23:57:45 -07005844 p->status = DIFF_STATUS_RENAMED;
5845 }
Jeff King9001dc22018-08-28 17:22:48 -04005846 else if (!oideq(&p->one->oid, &p->two->oid) ||
Johannes Schindelind516c2d2007-02-22 21:50:10 +01005847 p->one->mode != p->two->mode ||
Jens Lehmann85adbf22010-03-12 22:23:52 +01005848 p->one->dirty_submodule ||
5849 p->two->dirty_submodule ||
brian m. carlsona0d12c42016-06-24 23:09:23 +00005850 is_null_oid(&p->one->oid))
Junio C Hamano6973dca2006-04-21 23:57:45 -07005851 p->status = DIFF_STATUS_MODIFIED;
5852 else {
5853 /* This is a "no-change" entry and should not
5854 * happen anymore, but prepare for broken callers.
5855 */
5856 error("feeding unmodified %s to diffcore",
5857 p->one->path);
5858 p->status = DIFF_STATUS_UNKNOWN;
5859 }
5860 }
5861 diff_debug_queue("resolve-rename-copy done", q);
5862}
5863
Timo Hirvonenc6744342006-06-24 20:21:53 +03005864static int check_pair_status(struct diff_filepair *p)
Junio C Hamano6973dca2006-04-21 23:57:45 -07005865{
Junio C Hamano6973dca2006-04-21 23:57:45 -07005866 switch (p->status) {
5867 case DIFF_STATUS_UNKNOWN:
Timo Hirvonenc6744342006-06-24 20:21:53 +03005868 return 0;
Junio C Hamano6973dca2006-04-21 23:57:45 -07005869 case 0:
5870 die("internal error in diff-resolve-rename-copy");
Junio C Hamano6973dca2006-04-21 23:57:45 -07005871 default:
Timo Hirvonenc6744342006-06-24 20:21:53 +03005872 return 1;
Junio C Hamano6973dca2006-04-21 23:57:45 -07005873 }
5874}
5875
Timo Hirvonenc6744342006-06-24 20:21:53 +03005876static void flush_one_pair(struct diff_filepair *p, struct diff_options *opt)
5877{
5878 int fmt = opt->output_format;
5879
5880 if (fmt & DIFF_FORMAT_CHECKDIFF)
5881 diff_flush_checkdiff(p, opt);
5882 else if (fmt & (DIFF_FORMAT_RAW | DIFF_FORMAT_NAME_STATUS))
5883 diff_flush_raw(p, opt);
Junio C Hamanocd676a52008-02-12 14:26:02 -08005884 else if (fmt & DIFF_FORMAT_NAME) {
5885 const char *name_a, *name_b;
5886 name_a = p->two->path;
5887 name_b = NULL;
5888 strip_prefix(opt->prefix_length, &name_a, &name_b);
Jeff Kingf5022b52017-02-08 15:31:15 -05005889 fprintf(opt->file, "%s", diff_line_prefix(opt));
Daniel Barkalowc0c77732008-03-09 22:43:39 -04005890 write_name_quoted(name_a, opt->file, opt->line_termination);
Junio C Hamanocd676a52008-02-12 14:26:02 -08005891 }
Timo Hirvonenc6744342006-06-24 20:21:53 +03005892}
5893
Stefan Beller146fdb02017-06-29 17:07:05 -07005894static void show_file_mode_name(struct diff_options *opt, const char *newdelete, struct diff_filespec *fs)
Sean4bbd2612006-05-14 08:13:49 -04005895{
Stefan Beller146fdb02017-06-29 17:07:05 -07005896 struct strbuf sb = STRBUF_INIT;
Sean4bbd2612006-05-14 08:13:49 -04005897 if (fs->mode)
Stefan Beller146fdb02017-06-29 17:07:05 -07005898 strbuf_addf(&sb, " %s mode %06o ", newdelete, fs->mode);
Sean4bbd2612006-05-14 08:13:49 -04005899 else
Stefan Beller146fdb02017-06-29 17:07:05 -07005900 strbuf_addf(&sb, " %s ", newdelete);
5901
5902 quote_c_style(fs->path, &sb, NULL, 0);
5903 strbuf_addch(&sb, '\n');
5904 emit_diff_symbol(opt, DIFF_SYMBOL_SUMMARY,
5905 sb.buf, sb.len, 0);
5906 strbuf_release(&sb);
Sean4bbd2612006-05-14 08:13:49 -04005907}
5908
Stefan Beller146fdb02017-06-29 17:07:05 -07005909static void show_mode_change(struct diff_options *opt, struct diff_filepair *p,
5910 int show_name)
Sean4bbd2612006-05-14 08:13:49 -04005911{
5912 if (p->one->mode && p->two->mode && p->one->mode != p->two->mode) {
Stefan Beller146fdb02017-06-29 17:07:05 -07005913 struct strbuf sb = STRBUF_INIT;
5914 strbuf_addf(&sb, " mode change %06o => %06o",
5915 p->one->mode, p->two->mode);
Alexandre Julliard0d26a642007-02-10 15:37:48 +01005916 if (show_name) {
Stefan Beller146fdb02017-06-29 17:07:05 -07005917 strbuf_addch(&sb, ' ');
5918 quote_c_style(p->two->path, &sb, NULL, 0);
Alexandre Julliard0d26a642007-02-10 15:37:48 +01005919 }
Stefan Beller58aaced2017-09-27 15:51:26 -07005920 strbuf_addch(&sb, '\n');
Stefan Beller146fdb02017-06-29 17:07:05 -07005921 emit_diff_symbol(opt, DIFF_SYMBOL_SUMMARY,
5922 sb.buf, sb.len, 0);
5923 strbuf_release(&sb);
Sean4bbd2612006-05-14 08:13:49 -04005924 }
5925}
5926
Stefan Beller146fdb02017-06-29 17:07:05 -07005927static void show_rename_copy(struct diff_options *opt, const char *renamecopy,
5928 struct diff_filepair *p)
Sean4bbd2612006-05-14 08:13:49 -04005929{
Stefan Beller146fdb02017-06-29 17:07:05 -07005930 struct strbuf sb = STRBUF_INIT;
Nguyễn Thái Ngọc Duyc905cbc2018-02-01 20:02:20 +07005931 struct strbuf names = STRBUF_INIT;
5932
5933 pprint_rename(&names, p->one->path, p->two->path);
Stefan Beller146fdb02017-06-29 17:07:05 -07005934 strbuf_addf(&sb, " %s %s (%d%%)\n",
Nguyễn Thái Ngọc Duyc905cbc2018-02-01 20:02:20 +07005935 renamecopy, names.buf, similarity_index(p));
5936 strbuf_release(&names);
Stefan Beller146fdb02017-06-29 17:07:05 -07005937 emit_diff_symbol(opt, DIFF_SYMBOL_SUMMARY,
5938 sb.buf, sb.len, 0);
5939 show_mode_change(opt, p, 0);
Rene Scharfe348eda22017-08-30 19:49:42 +02005940 strbuf_release(&sb);
Sean4bbd2612006-05-14 08:13:49 -04005941}
5942
Bo Yang7be57612010-05-26 15:23:54 +08005943static void diff_summary(struct diff_options *opt, struct diff_filepair *p)
Sean4bbd2612006-05-14 08:13:49 -04005944{
5945 switch(p->status) {
5946 case DIFF_STATUS_DELETED:
Stefan Beller146fdb02017-06-29 17:07:05 -07005947 show_file_mode_name(opt, "delete", p->one);
Sean4bbd2612006-05-14 08:13:49 -04005948 break;
5949 case DIFF_STATUS_ADDED:
Stefan Beller146fdb02017-06-29 17:07:05 -07005950 show_file_mode_name(opt, "create", p->two);
Sean4bbd2612006-05-14 08:13:49 -04005951 break;
5952 case DIFF_STATUS_COPIED:
Stefan Beller146fdb02017-06-29 17:07:05 -07005953 show_rename_copy(opt, "copy", p);
Sean4bbd2612006-05-14 08:13:49 -04005954 break;
5955 case DIFF_STATUS_RENAMED:
Stefan Beller146fdb02017-06-29 17:07:05 -07005956 show_rename_copy(opt, "rename", p);
Sean4bbd2612006-05-14 08:13:49 -04005957 break;
5958 default:
5959 if (p->score) {
Stefan Beller146fdb02017-06-29 17:07:05 -07005960 struct strbuf sb = STRBUF_INIT;
5961 strbuf_addstr(&sb, " rewrite ");
5962 quote_c_style(p->two->path, &sb, NULL, 0);
5963 strbuf_addf(&sb, " (%d%%)\n", similarity_index(p));
5964 emit_diff_symbol(opt, DIFF_SYMBOL_SUMMARY,
5965 sb.buf, sb.len, 0);
Rene Scharfefa842d82017-08-30 19:49:41 +02005966 strbuf_release(&sb);
Pierre Habouzit663af342007-09-20 00:42:15 +02005967 }
Stefan Beller146fdb02017-06-29 17:07:05 -07005968 show_mode_change(opt, p, !p->score);
Sean4bbd2612006-05-14 08:13:49 -04005969 break;
5970 }
5971}
5972
Johannes Schindelinfcb3d0a2006-06-25 03:51:08 +02005973struct patch_id_t {
Nicolas Pitre9126f002008-10-01 14:05:20 -04005974 git_SHA_CTX *ctx;
Johannes Schindelinfcb3d0a2006-06-25 03:51:08 +02005975 int patchlen;
5976};
5977
5978static int remove_space(char *line, int len)
5979{
5980 int i;
Pierre Habouzit663af342007-09-20 00:42:15 +02005981 char *dst = line;
5982 unsigned char c;
Johannes Schindelinfcb3d0a2006-06-25 03:51:08 +02005983
Pierre Habouzit663af342007-09-20 00:42:15 +02005984 for (i = 0; i < len; i++)
5985 if (!isspace((c = line[i])))
5986 *dst++ = c;
Johannes Schindelinfcb3d0a2006-06-25 03:51:08 +02005987
Pierre Habouzit663af342007-09-20 00:42:15 +02005988 return dst - line;
Johannes Schindelinfcb3d0a2006-06-25 03:51:08 +02005989}
5990
5991static void patch_id_consume(void *priv, char *line, unsigned long len)
5992{
5993 struct patch_id_t *data = priv;
5994 int new_len;
5995
Johannes Schindelinfcb3d0a2006-06-25 03:51:08 +02005996 new_len = remove_space(line, len);
5997
Nicolas Pitre9126f002008-10-01 14:05:20 -04005998 git_SHA1_Update(data->ctx, line, new_len);
Johannes Schindelinfcb3d0a2006-06-25 03:51:08 +02005999 data->patchlen += new_len;
6000}
6001
Jeff King977db6b2017-03-30 14:26:05 -04006002static void patch_id_add_string(git_SHA_CTX *ctx, const char *str)
6003{
6004 git_SHA1_Update(ctx, str, strlen(str));
6005}
6006
6007static void patch_id_add_mode(git_SHA_CTX *ctx, unsigned mode)
6008{
6009 /* large enough for 2^32 in octal */
6010 char buf[12];
6011 int len = xsnprintf(buf, sizeof(buf), "%06o", mode);
6012 git_SHA1_Update(ctx, buf, len);
6013}
6014
Johannes Schindelinfcb3d0a2006-06-25 03:51:08 +02006015/* returns 0 upon success, and writes result into sha1 */
Brandon Williamsbd25f282017-05-30 10:30:54 -07006016static int diff_get_patch_id(struct diff_options *options, struct object_id *oid, int diff_header_only)
Johannes Schindelinfcb3d0a2006-06-25 03:51:08 +02006017{
6018 struct diff_queue_struct *q = &diff_queued_diff;
6019 int i;
Nicolas Pitre9126f002008-10-01 14:05:20 -04006020 git_SHA_CTX ctx;
Johannes Schindelinfcb3d0a2006-06-25 03:51:08 +02006021 struct patch_id_t data;
Johannes Schindelinfcb3d0a2006-06-25 03:51:08 +02006022
Nicolas Pitre9126f002008-10-01 14:05:20 -04006023 git_SHA1_Init(&ctx);
Johannes Schindelinfcb3d0a2006-06-25 03:51:08 +02006024 memset(&data, 0, sizeof(struct patch_id_t));
6025 data.ctx = &ctx;
Johannes Schindelinfcb3d0a2006-06-25 03:51:08 +02006026
6027 for (i = 0; i < q->nr; i++) {
6028 xpparam_t xpp;
6029 xdemitconf_t xecfg;
Johannes Schindelinfcb3d0a2006-06-25 03:51:08 +02006030 mmfile_t mf1, mf2;
6031 struct diff_filepair *p = q->queue[i];
6032 int len1, len2;
6033
Brian Downing9ccd0a82008-10-25 15:30:37 +02006034 memset(&xpp, 0, sizeof(xpp));
Johannes Schindelin30b25012007-07-04 19:05:46 +01006035 memset(&xecfg, 0, sizeof(xecfg));
Johannes Schindelinfcb3d0a2006-06-25 03:51:08 +02006036 if (p->status == 0)
6037 return error("internal diff status error");
6038 if (p->status == DIFF_STATUS_UNKNOWN)
6039 continue;
6040 if (diff_unmodified_pair(p))
6041 continue;
6042 if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) ||
6043 (DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode)))
6044 continue;
6045 if (DIFF_PAIR_UNMERGED(p))
6046 continue;
6047
Nguyễn Thái Ngọc Duy58bf2a42018-09-21 17:57:31 +02006048 diff_fill_oid_info(p->one, options->repo->index);
6049 diff_fill_oid_info(p->two, options->repo->index);
Johannes Schindelinfcb3d0a2006-06-25 03:51:08 +02006050
Johannes Schindelinfcb3d0a2006-06-25 03:51:08 +02006051 len1 = remove_space(p->one->path, strlen(p->one->path));
6052 len2 = remove_space(p->two->path, strlen(p->two->path));
Jeff King977db6b2017-03-30 14:26:05 -04006053 patch_id_add_string(&ctx, "diff--git");
6054 patch_id_add_string(&ctx, "a/");
6055 git_SHA1_Update(&ctx, p->one->path, len1);
6056 patch_id_add_string(&ctx, "b/");
6057 git_SHA1_Update(&ctx, p->two->path, len2);
6058
6059 if (p->one->mode == 0) {
6060 patch_id_add_string(&ctx, "newfilemode");
6061 patch_id_add_mode(&ctx, p->two->mode);
6062 patch_id_add_string(&ctx, "---/dev/null");
6063 patch_id_add_string(&ctx, "+++b/");
6064 git_SHA1_Update(&ctx, p->two->path, len2);
6065 } else if (p->two->mode == 0) {
6066 patch_id_add_string(&ctx, "deletedfilemode");
6067 patch_id_add_mode(&ctx, p->one->mode);
6068 patch_id_add_string(&ctx, "---a/");
6069 git_SHA1_Update(&ctx, p->one->path, len1);
6070 patch_id_add_string(&ctx, "+++/dev/null");
6071 } else {
6072 patch_id_add_string(&ctx, "---a/");
6073 git_SHA1_Update(&ctx, p->one->path, len1);
6074 patch_id_add_string(&ctx, "+++b/");
6075 git_SHA1_Update(&ctx, p->two->path, len2);
6076 }
Johannes Schindelinfcb3d0a2006-06-25 03:51:08 +02006077
Kevin Willford3e8e32c2016-07-29 12:19:19 -04006078 if (diff_header_only)
6079 continue;
6080
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +02006081 if (fill_mmfile(options->repo, &mf1, p->one) < 0 ||
6082 fill_mmfile(options->repo, &mf2, p->two) < 0)
Kevin Willford3e8e32c2016-07-29 12:19:19 -04006083 return error("unable to read files to diff");
6084
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +02006085 if (diff_filespec_is_binary(options->repo, p->one) ||
6086 diff_filespec_is_binary(options->repo, p->two)) {
brian m. carlsona0d12c42016-06-24 23:09:23 +00006087 git_SHA1_Update(&ctx, oid_to_hex(&p->one->oid),
Brandon Williamsbd25f282017-05-30 10:30:54 -07006088 GIT_SHA1_HEXSZ);
brian m. carlsona0d12c42016-06-24 23:09:23 +00006089 git_SHA1_Update(&ctx, oid_to_hex(&p->two->oid),
Brandon Williamsbd25f282017-05-30 10:30:54 -07006090 GIT_SHA1_HEXSZ);
Clemens Buchacher34597c12010-08-15 09:20:43 +02006091 continue;
6092 }
6093
René Scharfe582aa002010-05-02 15:04:41 +02006094 xpp.flags = 0;
Johannes Schindelinfcb3d0a2006-06-25 03:51:08 +02006095 xecfg.ctxlen = 3;
Clemens Buchacherad14b452010-09-19 11:59:28 +02006096 xecfg.flags = 0;
Jeff Kingb1357392018-11-02 02:36:36 -04006097 if (xdi_diff_outf(&mf1, &mf2, discard_hunk_line,
6098 patch_id_consume, &data, &xpp, &xecfg))
Jeff King3efb9882015-09-24 19:12:23 -04006099 return error("unable to generate patch-id diff for %s",
6100 p->one->path);
Johannes Schindelinfcb3d0a2006-06-25 03:51:08 +02006101 }
6102
Brandon Williamsbd25f282017-05-30 10:30:54 -07006103 git_SHA1_Final(oid->hash, &ctx);
Johannes Schindelinfcb3d0a2006-06-25 03:51:08 +02006104 return 0;
6105}
6106
Brandon Williamsbd25f282017-05-30 10:30:54 -07006107int diff_flush_patch_id(struct diff_options *options, struct object_id *oid, int diff_header_only)
Johannes Schindelinfcb3d0a2006-06-25 03:51:08 +02006108{
6109 struct diff_queue_struct *q = &diff_queued_diff;
6110 int i;
Brandon Williamsbd25f282017-05-30 10:30:54 -07006111 int result = diff_get_patch_id(options, oid, diff_header_only);
Johannes Schindelinfcb3d0a2006-06-25 03:51:08 +02006112
6113 for (i = 0; i < q->nr; i++)
6114 diff_free_filepair(q->queue[i]);
6115
6116 free(q->queue);
Bo Yang9ca5df92010-05-06 21:52:27 -07006117 DIFF_QUEUE_CLEAR(q);
Johannes Schindelinfcb3d0a2006-06-25 03:51:08 +02006118
6119 return result;
6120}
6121
Timo Hirvonen946c3782006-06-27 15:09:17 +03006122static int is_summary_empty(const struct diff_queue_struct *q)
6123{
6124 int i;
6125
6126 for (i = 0; i < q->nr; i++) {
6127 const struct diff_filepair *p = q->queue[i];
6128
6129 switch (p->status) {
6130 case DIFF_STATUS_DELETED:
6131 case DIFF_STATUS_ADDED:
6132 case DIFF_STATUS_COPIED:
6133 case DIFF_STATUS_RENAMED:
6134 return 0;
6135 default:
6136 if (p->score)
6137 return 0;
6138 if (p->one->mode && p->two->mode &&
6139 p->one->mode != p->two->mode)
6140 return 0;
6141 break;
6142 }
6143 }
6144 return 1;
6145}
6146
Junio C Hamanof31027c2011-01-06 13:50:06 -08006147static const char rename_limit_warning[] =
Vasco Almeidadb424972016-10-17 13:15:29 +00006148N_("inexact rename detection was skipped due to too many files.");
Junio C Hamanof31027c2011-01-06 13:50:06 -08006149
6150static const char degrade_cc_to_c_warning[] =
Vasco Almeidadb424972016-10-17 13:15:29 +00006151N_("only found copies from modified paths due to too many files.");
Junio C Hamanof31027c2011-01-06 13:50:06 -08006152
6153static const char rename_limit_advice[] =
Vasco Almeidadb424972016-10-17 13:15:29 +00006154N_("you may want to set your %s variable to at least "
6155 "%d and retry the command.");
Junio C Hamanof31027c2011-01-06 13:50:06 -08006156
6157void diff_warn_rename_limit(const char *varname, int needed, int degraded_cc)
6158{
Nguyễn Thái Ngọc Duy4e056c92018-01-16 16:23:49 +07006159 fflush(stdout);
Junio C Hamanof31027c2011-01-06 13:50:06 -08006160 if (degraded_cc)
Vasco Almeidadb424972016-10-17 13:15:29 +00006161 warning(_(degrade_cc_to_c_warning));
Junio C Hamanof31027c2011-01-06 13:50:06 -08006162 else if (needed)
Vasco Almeidadb424972016-10-17 13:15:29 +00006163 warning(_(rename_limit_warning));
Junio C Hamanof31027c2011-01-06 13:50:06 -08006164 else
6165 return;
Elijah Newren9f7e4bf2017-11-13 12:15:59 -08006166 if (0 < needed)
Vasco Almeidadb424972016-10-17 13:15:29 +00006167 warning(_(rename_limit_advice), varname, needed);
Junio C Hamanof31027c2011-01-06 13:50:06 -08006168}
6169
Stefan Bellerec331502017-06-29 17:06:48 -07006170static void diff_flush_patch_all_file_pairs(struct diff_options *o)
6171{
6172 int i;
Stefan Bellere6e045f2017-06-29 17:07:06 -07006173 static struct emitted_diff_symbols esm = EMITTED_DIFF_SYMBOLS_INIT;
Stefan Bellerec331502017-06-29 17:06:48 -07006174 struct diff_queue_struct *q = &diff_queued_diff;
Stefan Beller091f8e22017-06-29 17:06:53 -07006175
6176 if (WSEH_NEW & WS_RULE_MASK)
Johannes Schindelin033abf92018-05-02 11:38:39 +02006177 BUG("WS rules bit mask overlaps with diff symbol flags");
Stefan Beller091f8e22017-06-29 17:06:53 -07006178
Stefan Beller2e2d5ac2017-06-30 13:53:07 -07006179 if (o->color_moved)
6180 o->emitted_symbols = &esm;
Stefan Bellere6e045f2017-06-29 17:07:06 -07006181
Stefan Bellerec331502017-06-29 17:06:48 -07006182 for (i = 0; i < q->nr; i++) {
6183 struct diff_filepair *p = q->queue[i];
6184 if (check_pair_status(p))
6185 diff_flush_patch(p, o);
6186 }
Stefan Bellere6e045f2017-06-29 17:07:06 -07006187
6188 if (o->emitted_symbols) {
Stefan Beller2e2d5ac2017-06-30 13:53:07 -07006189 if (o->color_moved) {
6190 struct hashmap add_lines, del_lines;
6191
Stefan Bellerca1f4ae2018-07-18 12:31:55 -07006192 if (o->color_moved_ws_handling &
6193 COLOR_MOVED_WS_ALLOW_INDENTATION_CHANGE)
6194 o->color_moved_ws_handling |= XDF_IGNORE_WHITESPACE;
6195
Stefan Belleree1df662018-07-16 16:05:38 -07006196 hashmap_init(&del_lines, moved_entry_cmp, o, 0);
6197 hashmap_init(&add_lines, moved_entry_cmp, o, 0);
Stefan Beller2e2d5ac2017-06-30 13:53:07 -07006198
6199 add_lines_to_move_detection(o, &add_lines, &del_lines);
6200 mark_color_as_moved(o, &add_lines, &del_lines);
Stefan Beller86b452e2017-06-30 13:53:09 -07006201 if (o->color_moved == COLOR_MOVED_ZEBRA_DIM)
6202 dim_moved_lines(o);
Stefan Beller2e2d5ac2017-06-30 13:53:07 -07006203
Phillip Wood47cb16a2018-10-04 11:07:45 +01006204 hashmap_free(&add_lines, 1);
6205 hashmap_free(&del_lines, 1);
Stefan Beller2e2d5ac2017-06-30 13:53:07 -07006206 }
6207
Stefan Bellere6e045f2017-06-29 17:07:06 -07006208 for (i = 0; i < esm.nr; i++)
6209 emit_diff_symbol_from_struct(o, &esm.buf[i]);
6210
6211 for (i = 0; i < esm.nr; i++)
6212 free((void *)esm.buf[i].line);
Jeff King48edf3a2019-01-24 07:32:41 -05006213 esm.nr = 0;
6214
6215 o->emitted_symbols = NULL;
Stefan Bellere6e045f2017-06-29 17:07:06 -07006216 }
Stefan Bellerec331502017-06-29 17:06:48 -07006217}
6218
Junio C Hamano6973dca2006-04-21 23:57:45 -07006219void diff_flush(struct diff_options *options)
6220{
6221 struct diff_queue_struct *q = &diff_queued_diff;
Timo Hirvonenc6744342006-06-24 20:21:53 +03006222 int i, output_format = options->output_format;
Timo Hirvonen946c3782006-06-27 15:09:17 +03006223 int separator = 0;
Johan Herland1c57a622011-04-29 11:36:21 +02006224 int dirstat_by_line = 0;
Junio C Hamano6973dca2006-04-21 23:57:45 -07006225
Timo Hirvonenc6744342006-06-24 20:21:53 +03006226 /*
6227 * Order: raw, stat, summary, patch
6228 * or: name/name-status/checkdiff (other bits clear)
6229 */
Timo Hirvonen946c3782006-06-27 15:09:17 +03006230 if (!q->nr)
6231 goto free_queue;
Junio C Hamano6973dca2006-04-21 23:57:45 -07006232
Timo Hirvonenc6744342006-06-24 20:21:53 +03006233 if (output_format & (DIFF_FORMAT_RAW |
6234 DIFF_FORMAT_NAME |
6235 DIFF_FORMAT_NAME_STATUS |
6236 DIFF_FORMAT_CHECKDIFF)) {
Junio C Hamano6973dca2006-04-21 23:57:45 -07006237 for (i = 0; i < q->nr; i++) {
6238 struct diff_filepair *p = q->queue[i];
Timo Hirvonenc6744342006-06-24 20:21:53 +03006239 if (check_pair_status(p))
6240 flush_one_pair(p, options);
Junio C Hamano6973dca2006-04-21 23:57:45 -07006241 }
Timo Hirvonen946c3782006-06-27 15:09:17 +03006242 separator++;
Junio C Hamano6973dca2006-04-21 23:57:45 -07006243 }
Timo Hirvonenc6744342006-06-24 20:21:53 +03006244
Brandon Williams0d1e0e72017-10-31 11:19:11 -07006245 if (output_format & DIFF_FORMAT_DIRSTAT && options->flags.dirstat_by_line)
Johan Herland1c57a622011-04-29 11:36:21 +02006246 dirstat_by_line = 1;
6247
6248 if (output_format & (DIFF_FORMAT_DIFFSTAT|DIFF_FORMAT_SHORTSTAT|DIFF_FORMAT_NUMSTAT) ||
6249 dirstat_by_line) {
Timo Hirvonen5e2b0632006-06-25 14:28:19 +03006250 struct diffstat_t diffstat;
Timo Hirvonenc6744342006-06-24 20:21:53 +03006251
Timo Hirvonen5e2b0632006-06-25 14:28:19 +03006252 memset(&diffstat, 0, sizeof(struct diffstat_t));
Junio C Hamano6973dca2006-04-21 23:57:45 -07006253 for (i = 0; i < q->nr; i++) {
6254 struct diff_filepair *p = q->queue[i];
Timo Hirvonenc6744342006-06-24 20:21:53 +03006255 if (check_pair_status(p))
Timo Hirvonen5e2b0632006-06-25 14:28:19 +03006256 diff_flush_stat(p, options, &diffstat);
Junio C Hamano6973dca2006-04-21 23:57:45 -07006257 }
Junio C Hamano74e2abe2006-10-12 03:01:00 -07006258 if (output_format & DIFF_FORMAT_NUMSTAT)
6259 show_numstat(&diffstat, options);
6260 if (output_format & DIFF_FORMAT_DIFFSTAT)
6261 show_stats(&diffstat, options);
Junio C Hamanof6046522007-12-11 23:46:30 -08006262 if (output_format & DIFF_FORMAT_SHORTSTAT)
Daniel Barkalowc0c77732008-03-09 22:43:39 -04006263 show_shortstats(&diffstat, options);
Mårten Kongstadab273892015-03-02 16:05:39 +01006264 if (output_format & DIFF_FORMAT_DIRSTAT && dirstat_by_line)
Johan Herland1c57a622011-04-29 11:36:21 +02006265 show_dirstat_by_line(&diffstat, options);
Junio C Hamanof6046522007-12-11 23:46:30 -08006266 free_diffstat_info(&diffstat);
Junio C Hamano3969cf72006-06-27 15:08:19 -07006267 separator++;
Junio C Hamano6973dca2006-04-21 23:57:45 -07006268 }
Johan Herland1c57a622011-04-29 11:36:21 +02006269 if ((output_format & DIFF_FORMAT_DIRSTAT) && !dirstat_by_line)
Junio C Hamanoc04a7152008-02-12 17:06:58 -08006270 show_dirstat(options);
Junio C Hamano6973dca2006-04-21 23:57:45 -07006271
Timo Hirvonen946c3782006-06-27 15:09:17 +03006272 if (output_format & DIFF_FORMAT_SUMMARY && !is_summary_empty(q)) {
Bo Yang7be57612010-05-26 15:23:54 +08006273 for (i = 0; i < q->nr; i++) {
6274 diff_summary(options, q->queue[i]);
6275 }
Junio C Hamano3969cf72006-06-27 15:08:19 -07006276 separator++;
Sean4bbd2612006-05-14 08:13:49 -04006277 }
6278
Larry D'Anna6977c252010-02-16 01:55:21 -05006279 if (output_format & DIFF_FORMAT_NO_OUTPUT &&
Brandon Williams0d1e0e72017-10-31 11:19:11 -07006280 options->flags.exit_with_status &&
6281 options->flags.diff_from_contents) {
Larry D'Anna6977c252010-02-16 01:55:21 -05006282 /*
6283 * run diff_flush_patch for the exit status. setting
Ondřej Bílka749f7632013-07-22 23:02:23 +02006284 * options->file to /dev/null should be safe, because we
Larry D'Anna6977c252010-02-16 01:55:21 -05006285 * aren't supposed to produce any output anyway.
6286 */
6287 if (options->close_file)
6288 fclose(options->file);
Nguyễn Thái Ngọc Duy23a9e072017-05-03 17:16:46 +07006289 options->file = xfopen("/dev/null", "w");
Larry D'Anna6977c252010-02-16 01:55:21 -05006290 options->close_file = 1;
Stefan Beller2e2d5ac2017-06-30 13:53:07 -07006291 options->color_moved = 0;
Larry D'Anna6977c252010-02-16 01:55:21 -05006292 for (i = 0; i < q->nr; i++) {
6293 struct diff_filepair *p = q->queue[i];
6294 if (check_pair_status(p))
6295 diff_flush_patch(p, options);
6296 if (options->found_changes)
6297 break;
6298 }
6299 }
6300
Timo Hirvonenc6744342006-06-24 20:21:53 +03006301 if (output_format & DIFF_FORMAT_PATCH) {
Timo Hirvonen946c3782006-06-27 15:09:17 +03006302 if (separator) {
Stefan Beller091f8e22017-06-29 17:06:53 -07006303 emit_diff_symbol(options, DIFF_SYMBOL_SEPARATOR, NULL, 0, 0);
Stefan Beller30b7e1e2017-06-29 17:07:04 -07006304 if (options->stat_sep)
Timo Hirvonen946c3782006-06-27 15:09:17 +03006305 /* attach patch instead of inline */
Stefan Beller30b7e1e2017-06-29 17:07:04 -07006306 emit_diff_symbol(options, DIFF_SYMBOL_STAT_SEP,
6307 NULL, 0, 0);
Timo Hirvonenc6744342006-06-24 20:21:53 +03006308 }
6309
Stefan Bellerec331502017-06-29 17:06:48 -07006310 diff_flush_patch_all_file_pairs(options);
Timo Hirvonenc6744342006-06-24 20:21:53 +03006311 }
6312
Jeff King04245582006-09-07 02:35:42 -04006313 if (output_format & DIFF_FORMAT_CALLBACK)
6314 options->format_callback(q, options, options->format_callback_data);
6315
Timo Hirvonenc6744342006-06-24 20:21:53 +03006316 for (i = 0; i < q->nr; i++)
6317 diff_free_filepair(q->queue[i]);
Timo Hirvonen946c3782006-06-27 15:09:17 +03006318free_queue:
Junio C Hamano6973dca2006-04-21 23:57:45 -07006319 free(q->queue);
Bo Yang9ca5df92010-05-06 21:52:27 -07006320 DIFF_QUEUE_CLEAR(q);
Daniel Barkalowc0c77732008-03-09 22:43:39 -04006321 if (options->close_file)
6322 fclose(options->file);
Junio C Hamanof2451942009-05-22 12:45:29 -07006323
6324 /*
Jim Meyering97bf2a02009-08-30 22:27:02 +02006325 * Report the content-level differences with HAS_CHANGES;
Junio C Hamanof2451942009-05-22 12:45:29 -07006326 * diff_addremove/diff_change does not set the bit when
6327 * DIFF_FROM_CONTENTS is in effect (e.g. with -w).
6328 */
Brandon Williams0d1e0e72017-10-31 11:19:11 -07006329 if (options->flags.diff_from_contents) {
Junio C Hamanof2451942009-05-22 12:45:29 -07006330 if (options->found_changes)
Brandon Williams0d1e0e72017-10-31 11:19:11 -07006331 options->flags.has_changes = 1;
Junio C Hamanof2451942009-05-22 12:45:29 -07006332 else
Brandon Williams0d1e0e72017-10-31 11:19:11 -07006333 options->flags.has_changes = 0;
Junio C Hamanof2451942009-05-22 12:45:29 -07006334 }
Junio C Hamano6973dca2006-04-21 23:57:45 -07006335}
6336
Junio C Hamano08578fa2013-07-17 15:09:34 -07006337static int match_filter(const struct diff_options *options, const struct diff_filepair *p)
6338{
6339 return (((p->status == DIFF_STATUS_MODIFIED) &&
6340 ((p->score &&
Junio C Hamano1ecc1cb2013-07-17 15:05:46 -07006341 filter_bit_tst(DIFF_STATUS_FILTER_BROKEN, options)) ||
Junio C Hamano08578fa2013-07-17 15:09:34 -07006342 (!p->score &&
Junio C Hamano1ecc1cb2013-07-17 15:05:46 -07006343 filter_bit_tst(DIFF_STATUS_MODIFIED, options)))) ||
Junio C Hamano08578fa2013-07-17 15:09:34 -07006344 ((p->status != DIFF_STATUS_MODIFIED) &&
Junio C Hamano1ecc1cb2013-07-17 15:05:46 -07006345 filter_bit_tst(p->status, options)));
Junio C Hamano08578fa2013-07-17 15:09:34 -07006346}
6347
Junio C Hamano949226f2013-07-17 14:19:24 -07006348static void diffcore_apply_filter(struct diff_options *options)
Junio C Hamano6973dca2006-04-21 23:57:45 -07006349{
6350 int i;
6351 struct diff_queue_struct *q = &diff_queued_diff;
6352 struct diff_queue_struct outq;
Junio C Hamano949226f2013-07-17 14:19:24 -07006353
Bo Yang9ca5df92010-05-06 21:52:27 -07006354 DIFF_QUEUE_CLEAR(&outq);
Junio C Hamano6973dca2006-04-21 23:57:45 -07006355
Junio C Hamano1ecc1cb2013-07-17 15:05:46 -07006356 if (!options->filter)
Junio C Hamano6973dca2006-04-21 23:57:45 -07006357 return;
6358
Junio C Hamano1ecc1cb2013-07-17 15:05:46 -07006359 if (filter_bit_tst(DIFF_STATUS_FILTER_AON, options)) {
Junio C Hamano6973dca2006-04-21 23:57:45 -07006360 int found;
6361 for (i = found = 0; !found && i < q->nr; i++) {
Junio C Hamano08578fa2013-07-17 15:09:34 -07006362 if (match_filter(options, q->queue[i]))
Junio C Hamano6973dca2006-04-21 23:57:45 -07006363 found++;
6364 }
6365 if (found)
6366 return;
6367
6368 /* otherwise we will clear the whole queue
6369 * by copying the empty outq at the end of this
6370 * function, but first clear the current entries
6371 * in the queue.
6372 */
6373 for (i = 0; i < q->nr; i++)
6374 diff_free_filepair(q->queue[i]);
6375 }
6376 else {
6377 /* Only the matching ones */
6378 for (i = 0; i < q->nr; i++) {
6379 struct diff_filepair *p = q->queue[i];
Junio C Hamano08578fa2013-07-17 15:09:34 -07006380 if (match_filter(options, p))
Junio C Hamano6973dca2006-04-21 23:57:45 -07006381 diff_q(&outq, p);
6382 else
6383 diff_free_filepair(p);
6384 }
6385 }
6386 free(q->queue);
6387 *q = outq;
6388}
6389
Sven Verdoolaege57011152007-09-08 12:30:22 +02006390/* Check whether two filespecs with the same mode and size are identical */
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +02006391static int diff_filespec_is_identical(struct repository *r,
6392 struct diff_filespec *one,
Sven Verdoolaege57011152007-09-08 12:30:22 +02006393 struct diff_filespec *two)
6394{
Junio C Hamano2b459b42008-03-02 00:07:59 -08006395 if (S_ISGITLINK(one->mode))
6396 return 0;
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +02006397 if (diff_populate_filespec(r, one, 0))
Sven Verdoolaege57011152007-09-08 12:30:22 +02006398 return 0;
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +02006399 if (diff_populate_filespec(r, two, 0))
Sven Verdoolaege57011152007-09-08 12:30:22 +02006400 return 0;
6401 return !memcmp(one->data, two->data, one->size);
6402}
6403
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +02006404static int diff_filespec_check_stat_unmatch(struct repository *r,
6405 struct diff_filepair *p)
Nguyễn Thái Ngọc Duyfceb9072014-01-25 13:46:49 +07006406{
Nguyễn Thái Ngọc Duyf34b2052014-01-25 13:46:50 +07006407 if (p->done_skip_stat_unmatch)
6408 return p->skip_stat_unmatch_result;
6409
6410 p->done_skip_stat_unmatch = 1;
6411 p->skip_stat_unmatch_result = 0;
Nguyễn Thái Ngọc Duyfceb9072014-01-25 13:46:49 +07006412 /*
6413 * 1. Entries that come from stat info dirtiness
6414 * always have both sides (iow, not create/delete),
6415 * one side of the object name is unknown, with
6416 * the same mode and size. Keep the ones that
6417 * do not match these criteria. They have real
6418 * differences.
6419 *
6420 * 2. At this point, the file is known to be modified,
6421 * with the same mode and size, and the object
6422 * name of one side is unknown. Need to inspect
6423 * the identical contents.
6424 */
6425 if (!DIFF_FILE_VALID(p->one) || /* (1) */
6426 !DIFF_FILE_VALID(p->two) ||
brian m. carlson41c95602016-06-24 23:09:24 +00006427 (p->one->oid_valid && p->two->oid_valid) ||
Nguyễn Thái Ngọc Duyfceb9072014-01-25 13:46:49 +07006428 (p->one->mode != p->two->mode) ||
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +02006429 diff_populate_filespec(r, p->one, CHECK_SIZE_ONLY) ||
6430 diff_populate_filespec(r, p->two, CHECK_SIZE_ONLY) ||
Nguyễn Thái Ngọc Duyfceb9072014-01-25 13:46:49 +07006431 (p->one->size != p->two->size) ||
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +02006432 !diff_filespec_is_identical(r, p->one, p->two)) /* (2) */
Nguyễn Thái Ngọc Duyf34b2052014-01-25 13:46:50 +07006433 p->skip_stat_unmatch_result = 1;
6434 return p->skip_stat_unmatch_result;
Nguyễn Thái Ngọc Duyfceb9072014-01-25 13:46:49 +07006435}
6436
Junio C Hamanofb132272007-08-03 13:33:31 -07006437static void diffcore_skip_stat_unmatch(struct diff_options *diffopt)
6438{
6439 int i;
6440 struct diff_queue_struct *q = &diff_queued_diff;
6441 struct diff_queue_struct outq;
Bo Yang9ca5df92010-05-06 21:52:27 -07006442 DIFF_QUEUE_CLEAR(&outq);
Junio C Hamanofb132272007-08-03 13:33:31 -07006443
6444 for (i = 0; i < q->nr; i++) {
6445 struct diff_filepair *p = q->queue[i];
6446
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +02006447 if (diff_filespec_check_stat_unmatch(diffopt->repo, p))
Junio C Hamanofb132272007-08-03 13:33:31 -07006448 diff_q(&outq, p);
6449 else {
6450 /*
6451 * The caller can subtract 1 from skip_stat_unmatch
6452 * to determine how many paths were dirty only
6453 * due to stat info mismatch.
6454 */
Brandon Williams0d1e0e72017-10-31 11:19:11 -07006455 if (!diffopt->flags.no_index)
René Scharfe6d2d9e82007-08-15 00:41:00 +02006456 diffopt->skip_stat_unmatch++;
Junio C Hamanofb132272007-08-03 13:33:31 -07006457 diff_free_filepair(p);
6458 }
6459 }
6460 free(q->queue);
6461 *q = outq;
6462}
6463
Junio C Hamano730f7282009-09-20 00:03:39 -07006464static int diffnamecmp(const void *a_, const void *b_)
6465{
6466 const struct diff_filepair *a = *((const struct diff_filepair **)a_);
6467 const struct diff_filepair *b = *((const struct diff_filepair **)b_);
6468 const char *name_a, *name_b;
6469
6470 name_a = a->one ? a->one->path : a->two->path;
6471 name_b = b->one ? b->one->path : b->two->path;
6472 return strcmp(name_a, name_b);
6473}
6474
Jeff King784c0da2019-02-14 00:48:03 -05006475void diffcore_fix_diff_index(void)
Junio C Hamano730f7282009-09-20 00:03:39 -07006476{
6477 struct diff_queue_struct *q = &diff_queued_diff;
René Scharfe9ed0d8d2016-09-29 17:27:31 +02006478 QSORT(q->queue, q->nr, diffnamecmp);
Junio C Hamano730f7282009-09-20 00:03:39 -07006479}
6480
Jonathan Tan7fbbcb22019-04-05 10:09:34 -07006481static void add_if_missing(struct repository *r,
6482 struct oid_array *to_fetch,
6483 const struct diff_filespec *filespec)
6484{
6485 if (filespec && filespec->oid_valid &&
6486 oid_object_info_extended(r, &filespec->oid, NULL,
6487 OBJECT_INFO_FOR_PREFETCH))
6488 oid_array_append(to_fetch, &filespec->oid);
6489}
6490
Junio C Hamano6973dca2006-04-21 23:57:45 -07006491void diffcore_std(struct diff_options *options)
6492{
Jonathan Tan7fbbcb22019-04-05 10:09:34 -07006493 if (options->repo == the_repository &&
6494 repository_format_partial_clone) {
6495 /*
6496 * Prefetch the diff pairs that are about to be flushed.
6497 */
6498 int i;
6499 struct diff_queue_struct *q = &diff_queued_diff;
6500 struct oid_array to_fetch = OID_ARRAY_INIT;
6501
6502 for (i = 0; i < q->nr; i++) {
6503 struct diff_filepair *p = q->queue[i];
6504 add_if_missing(options->repo, &to_fetch, p->one);
6505 add_if_missing(options->repo, &to_fetch, p->two);
6506 }
6507 if (to_fetch.nr)
6508 /*
6509 * NEEDSWORK: Consider deduplicating the OIDs sent.
6510 */
6511 fetch_objects(repository_format_partial_clone,
6512 to_fetch.oid, to_fetch.nr);
6513 oid_array_clear(&to_fetch);
6514 }
6515
Kirill Smelkov7195fbf2014-02-24 20:21:51 +04006516 /* NOTE please keep the following in sync with diff_tree_combined() */
Junio C Hamano9d865352008-09-06 19:09:16 -07006517 if (options->skip_stat_unmatch)
Junio C Hamanofb132272007-08-03 13:33:31 -07006518 diffcore_skip_stat_unmatch(options);
Junio C Hamano44c48a92010-08-13 12:17:45 -07006519 if (!options->found_follow) {
6520 /* See try_to_follow_renames() in tree-diff.c */
6521 if (options->break_opt != -1)
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +02006522 diffcore_break(options->repo,
6523 options->break_opt);
Junio C Hamano44c48a92010-08-13 12:17:45 -07006524 if (options->detect_rename)
6525 diffcore_rename(options);
6526 if (options->break_opt != -1)
6527 diffcore_merge_broken();
6528 }
Stefan Bellercf630512018-01-04 14:50:41 -08006529 if (options->pickaxe_opts & DIFF_PICKAXE_KINDS_MASK)
Junio C Hamano382f0132010-08-31 13:44:39 -07006530 diffcore_pickaxe(options);
Junio C Hamano6973dca2006-04-21 23:57:45 -07006531 if (options->orderfile)
6532 diffcore_order(options->orderfile);
Junio C Hamano44c48a92010-08-13 12:17:45 -07006533 if (!options->found_follow)
6534 /* See try_to_follow_renames() in tree-diff.c */
6535 diff_resolve_rename_copy();
Junio C Hamano949226f2013-07-17 14:19:24 -07006536 diffcore_apply_filter(options);
Junio C Hamano68aacb22007-03-14 11:12:13 -07006537
Brandon Williams0d1e0e72017-10-31 11:19:11 -07006538 if (diff_queued_diff.nr && !options->flags.diff_from_contents)
6539 options->flags.has_changes = 1;
Pierre Habouzit8f67f8a2007-11-10 20:05:14 +01006540 else
Brandon Williams0d1e0e72017-10-31 11:19:11 -07006541 options->flags.has_changes = 0;
Bo Yang1da61752010-05-06 21:52:28 -07006542
Junio C Hamano44c48a92010-08-13 12:17:45 -07006543 options->found_follow = 0;
Junio C Hamano6973dca2006-04-21 23:57:45 -07006544}
6545
Junio C Hamanoda31b352007-12-13 23:40:27 -08006546int diff_result_code(struct diff_options *opt, int status)
6547{
6548 int result = 0;
Junio C Hamanof31027c2011-01-06 13:50:06 -08006549
Max Nanasyc9fc4412013-03-21 12:53:38 -07006550 diff_warn_rename_limit("diff.renameLimit",
Junio C Hamanof31027c2011-01-06 13:50:06 -08006551 opt->needed_rename_limit,
6552 opt->degraded_cc_to_c);
Brandon Williams0d1e0e72017-10-31 11:19:11 -07006553 if (!opt->flags.exit_with_status &&
Junio C Hamanoda31b352007-12-13 23:40:27 -08006554 !(opt->output_format & DIFF_FORMAT_CHECKDIFF))
6555 return status;
Brandon Williams0d1e0e72017-10-31 11:19:11 -07006556 if (opt->flags.exit_with_status &&
6557 opt->flags.has_changes)
Junio C Hamanoda31b352007-12-13 23:40:27 -08006558 result |= 01;
6559 if ((opt->output_format & DIFF_FORMAT_CHECKDIFF) &&
Brandon Williams0d1e0e72017-10-31 11:19:11 -07006560 opt->flags.check_failed)
Junio C Hamanoda31b352007-12-13 23:40:27 -08006561 result |= 02;
6562 return result;
6563}
Junio C Hamano6973dca2006-04-21 23:57:45 -07006564
Junio C Hamano28b92642011-05-31 09:14:17 -07006565int diff_can_quit_early(struct diff_options *opt)
6566{
Brandon Williams0d1e0e72017-10-31 11:19:11 -07006567 return (opt->flags.quick &&
Junio C Hamano28b92642011-05-31 09:14:17 -07006568 !opt->filter &&
Brandon Williams0d1e0e72017-10-31 11:19:11 -07006569 opt->flags.has_changes);
Junio C Hamano28b92642011-05-31 09:14:17 -07006570}
6571
Jens Lehmannaee9c7d2010-08-06 00:39:25 +02006572/*
6573 * Shall changes to this submodule be ignored?
6574 *
6575 * Submodule changes can be configured to be ignored separately for each path,
6576 * but that configuration can be overridden from the command line.
6577 */
6578static int is_submodule_ignored(const char *path, struct diff_options *options)
6579{
6580 int ignored = 0;
Brandon Williams02f2f562017-10-31 11:19:05 -07006581 struct diff_flags orig_flags = options->flags;
Brandon Williams0d1e0e72017-10-31 11:19:11 -07006582 if (!options->flags.override_submodule_config)
Jens Lehmannaee9c7d2010-08-06 00:39:25 +02006583 set_diffopt_flags_from_submodule_config(options, path);
Brandon Williams0d1e0e72017-10-31 11:19:11 -07006584 if (options->flags.ignore_submodules)
Jens Lehmannaee9c7d2010-08-06 00:39:25 +02006585 ignored = 1;
6586 options->flags = orig_flags;
6587 return ignored;
6588}
6589
Junio C Hamano6973dca2006-04-21 23:57:45 -07006590void diff_addremove(struct diff_options *options,
6591 int addremove, unsigned mode,
Brandon Williamsc26022e2017-05-30 10:30:47 -07006592 const struct object_id *oid,
6593 int oid_valid,
Jens Lehmanne3d42c42010-01-18 21:26:18 +01006594 const char *concatpath, unsigned dirty_submodule)
Junio C Hamano6973dca2006-04-21 23:57:45 -07006595{
Junio C Hamano6973dca2006-04-21 23:57:45 -07006596 struct diff_filespec *one, *two;
6597
Jens Lehmannaee9c7d2010-08-06 00:39:25 +02006598 if (S_ISGITLINK(mode) && is_submodule_ignored(concatpath, options))
Johannes Schindelin50fd9bd2008-05-14 18:03:31 +01006599 return;
6600
Junio C Hamano6973dca2006-04-21 23:57:45 -07006601 /* This may look odd, but it is a preparation for
6602 * feeding "there are unchanged files which should
6603 * not produce diffs, but when you are doing copy
6604 * detection you would need them, so here they are"
6605 * entries to the diff-core. They will be prefixed
6606 * with something like '=' or '*' (I haven't decided
6607 * which but should not make any difference).
Junio C Hamanoa6080a02007-06-07 00:04:01 -07006608 * Feeding the same new and old to diff_change()
Junio C Hamano6973dca2006-04-21 23:57:45 -07006609 * also has the same effect.
6610 * Before the final output happens, they are pruned after
6611 * merged into rename/copy pairs as appropriate.
6612 */
Brandon Williams0d1e0e72017-10-31 11:19:11 -07006613 if (options->flags.reverse_diff)
Junio C Hamano6973dca2006-04-21 23:57:45 -07006614 addremove = (addremove == '+' ? '-' :
6615 addremove == '-' ? '+' : addremove);
6616
Junio C Hamanocd676a52008-02-12 14:26:02 -08006617 if (options->prefix &&
6618 strncmp(concatpath, options->prefix, options->prefix_length))
6619 return;
6620
Junio C Hamano6973dca2006-04-21 23:57:45 -07006621 one = alloc_filespec(concatpath);
6622 two = alloc_filespec(concatpath);
6623
6624 if (addremove != '+')
Brandon Williamsf9704c22017-05-30 10:30:50 -07006625 fill_filespec(one, oid, oid_valid, mode);
Jens Lehmanne3d42c42010-01-18 21:26:18 +01006626 if (addremove != '-') {
Brandon Williamsf9704c22017-05-30 10:30:50 -07006627 fill_filespec(two, oid, oid_valid, mode);
Jens Lehmanne3d42c42010-01-18 21:26:18 +01006628 two->dirty_submodule = dirty_submodule;
6629 }
Junio C Hamano6973dca2006-04-21 23:57:45 -07006630
6631 diff_queue(&diff_queued_diff, one, two);
Brandon Williams0d1e0e72017-10-31 11:19:11 -07006632 if (!options->flags.diff_from_contents)
6633 options->flags.has_changes = 1;
Junio C Hamano6973dca2006-04-21 23:57:45 -07006634}
6635
6636void diff_change(struct diff_options *options,
6637 unsigned old_mode, unsigned new_mode,
Brandon Williams94a00972017-05-30 10:30:49 -07006638 const struct object_id *old_oid,
6639 const struct object_id *new_oid,
6640 int old_oid_valid, int new_oid_valid,
Jens Lehmanne3d42c42010-01-18 21:26:18 +01006641 const char *concatpath,
6642 unsigned old_dirty_submodule, unsigned new_dirty_submodule)
Junio C Hamano6973dca2006-04-21 23:57:45 -07006643{
Junio C Hamano6973dca2006-04-21 23:57:45 -07006644 struct diff_filespec *one, *two;
Nguyễn Thái Ngọc Duyf34b2052014-01-25 13:46:50 +07006645 struct diff_filepair *p;
Junio C Hamano6973dca2006-04-21 23:57:45 -07006646
Jens Lehmannaee9c7d2010-08-06 00:39:25 +02006647 if (S_ISGITLINK(old_mode) && S_ISGITLINK(new_mode) &&
6648 is_submodule_ignored(concatpath, options))
Johannes Schindelin50fd9bd2008-05-14 18:03:31 +01006649 return;
6650
Brandon Williams0d1e0e72017-10-31 11:19:11 -07006651 if (options->flags.reverse_diff) {
René Scharfe35d803b2017-01-28 22:40:58 +01006652 SWAP(old_mode, new_mode);
Brandon Williams94a00972017-05-30 10:30:49 -07006653 SWAP(old_oid, new_oid);
6654 SWAP(old_oid_valid, new_oid_valid);
René Scharfe35d803b2017-01-28 22:40:58 +01006655 SWAP(old_dirty_submodule, new_dirty_submodule);
Junio C Hamano6973dca2006-04-21 23:57:45 -07006656 }
Junio C Hamanocd676a52008-02-12 14:26:02 -08006657
6658 if (options->prefix &&
6659 strncmp(concatpath, options->prefix, options->prefix_length))
6660 return;
6661
Junio C Hamano6973dca2006-04-21 23:57:45 -07006662 one = alloc_filespec(concatpath);
6663 two = alloc_filespec(concatpath);
Brandon Williamsf9704c22017-05-30 10:30:50 -07006664 fill_filespec(one, old_oid, old_oid_valid, old_mode);
6665 fill_filespec(two, new_oid, new_oid_valid, new_mode);
Jens Lehmanne3d42c42010-01-18 21:26:18 +01006666 one->dirty_submodule = old_dirty_submodule;
6667 two->dirty_submodule = new_dirty_submodule;
Nguyễn Thái Ngọc Duyf34b2052014-01-25 13:46:50 +07006668 p = diff_queue(&diff_queued_diff, one, two);
Junio C Hamano6973dca2006-04-21 23:57:45 -07006669
Brandon Williams0d1e0e72017-10-31 11:19:11 -07006670 if (options->flags.diff_from_contents)
Nguyễn Thái Ngọc Duyf34b2052014-01-25 13:46:50 +07006671 return;
6672
Brandon Williams0d1e0e72017-10-31 11:19:11 -07006673 if (options->flags.quick && options->skip_stat_unmatch &&
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +02006674 !diff_filespec_check_stat_unmatch(options->repo, p))
Nguyễn Thái Ngọc Duyf34b2052014-01-25 13:46:50 +07006675 return;
6676
Brandon Williams0d1e0e72017-10-31 11:19:11 -07006677 options->flags.has_changes = 1;
Junio C Hamano6973dca2006-04-21 23:57:45 -07006678}
6679
Junio C Hamanofa7b2902011-04-22 16:05:58 -07006680struct diff_filepair *diff_unmerge(struct diff_options *options, const char *path)
Junio C Hamano6973dca2006-04-21 23:57:45 -07006681{
Junio C Hamano76399c02011-04-22 15:55:55 -07006682 struct diff_filepair *pair;
Junio C Hamano6973dca2006-04-21 23:57:45 -07006683 struct diff_filespec *one, *two;
Junio C Hamanocd676a52008-02-12 14:26:02 -08006684
6685 if (options->prefix &&
6686 strncmp(path, options->prefix, options->prefix_length))
Junio C Hamano76399c02011-04-22 15:55:55 -07006687 return NULL;
Junio C Hamanocd676a52008-02-12 14:26:02 -08006688
Junio C Hamano6973dca2006-04-21 23:57:45 -07006689 one = alloc_filespec(path);
6690 two = alloc_filespec(path);
Junio C Hamano76399c02011-04-22 15:55:55 -07006691 pair = diff_queue(&diff_queued_diff, one, two);
6692 pair->is_unmerged = 1;
6693 return pair;
Junio C Hamano6973dca2006-04-21 23:57:45 -07006694}
Jeff King9cb92c32008-10-05 17:43:45 -04006695
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +02006696static char *run_textconv(struct repository *r,
6697 const char *pgm,
6698 struct diff_filespec *spec,
6699 size_t *outsize)
Jeff King9cb92c32008-10-05 17:43:45 -04006700{
Jeff King479b0ae2009-01-22 00:59:56 -05006701 struct diff_tempfile *temp;
Jeff King9cb92c32008-10-05 17:43:45 -04006702 const char *argv[3];
6703 const char **arg = argv;
René Scharfed3180272014-08-19 21:09:35 +02006704 struct child_process child = CHILD_PROCESS_INIT;
Jeff King9cb92c32008-10-05 17:43:45 -04006705 struct strbuf buf = STRBUF_INIT;
Johannes Sixtda1fbed2010-03-30 19:36:03 +02006706 int err = 0;
Jeff King9cb92c32008-10-05 17:43:45 -04006707
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +02006708 temp = prepare_temp_file(r, spec->path, spec);
Jeff King9cb92c32008-10-05 17:43:45 -04006709 *arg++ = pgm;
Jeff King479b0ae2009-01-22 00:59:56 -05006710 *arg++ = temp->name;
Jeff King9cb92c32008-10-05 17:43:45 -04006711 *arg = NULL;
6712
Jeff King41a457e2009-12-30 06:01:09 -05006713 child.use_shell = 1;
Jeff King9cb92c32008-10-05 17:43:45 -04006714 child.argv = argv;
6715 child.out = -1;
Johannes Sixtda1fbed2010-03-30 19:36:03 +02006716 if (start_command(&child)) {
Jeff King479b0ae2009-01-22 00:59:56 -05006717 remove_tempfile();
Jeff King9cb92c32008-10-05 17:43:45 -04006718 return NULL;
6719 }
Johannes Sixtda1fbed2010-03-30 19:36:03 +02006720
6721 if (strbuf_read(&buf, child.out, 0) < 0)
6722 err = error("error reading from textconv command '%s'", pgm);
Jeff King70d70992009-12-30 04:02:53 -05006723 close(child.out);
Johannes Sixtda1fbed2010-03-30 19:36:03 +02006724
6725 if (finish_command(&child) || err) {
6726 strbuf_release(&buf);
6727 remove_tempfile();
6728 return NULL;
6729 }
Jeff King479b0ae2009-01-22 00:59:56 -05006730 remove_tempfile();
Jeff King9cb92c32008-10-05 17:43:45 -04006731
6732 return strbuf_detach(&buf, outsize);
6733}
Jeff King840383b2010-04-01 20:09:26 -04006734
Nguyễn Thái Ngọc Duy6afaf802018-09-21 17:57:22 +02006735size_t fill_textconv(struct repository *r,
6736 struct userdiff_driver *driver,
Axel Bonneta788d7d2010-06-07 17:23:36 +02006737 struct diff_filespec *df,
6738 char **outbuf)
Jeff King840383b2010-04-01 20:09:26 -04006739{
6740 size_t size;
6741
Jeff Kinga64e6a42016-02-22 13:28:54 -05006742 if (!driver) {
Jeff King840383b2010-04-01 20:09:26 -04006743 if (!DIFF_FILE_VALID(df)) {
6744 *outbuf = "";
6745 return 0;
6746 }
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +02006747 if (diff_populate_filespec(r, df, 0))
Jeff King840383b2010-04-01 20:09:26 -04006748 die("unable to read files to diff");
6749 *outbuf = df->data;
6750 return df->size;
6751 }
6752
Jeff Kinga64e6a42016-02-22 13:28:54 -05006753 if (!driver->textconv)
Johannes Schindelin033abf92018-05-02 11:38:39 +02006754 BUG("fill_textconv called with non-textconv driver");
Jeff Kinga64e6a42016-02-22 13:28:54 -05006755
brian m. carlson41c95602016-06-24 23:09:24 +00006756 if (driver->textconv_cache && df->oid_valid) {
brian m. carlsona0d12c42016-06-24 23:09:23 +00006757 *outbuf = notes_cache_get(driver->textconv_cache,
brian m. carlson569aa372017-05-06 22:09:58 +00006758 &df->oid,
Jeff Kingd9bae1a2010-04-01 20:12:15 -04006759 &size);
6760 if (*outbuf)
6761 return size;
6762 }
6763
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +02006764 *outbuf = run_textconv(r, driver->textconv, df, &size);
Jeff King840383b2010-04-01 20:09:26 -04006765 if (!*outbuf)
6766 die("unable to read files to diff");
Jeff Kingd9bae1a2010-04-01 20:12:15 -04006767
brian m. carlson41c95602016-06-24 23:09:24 +00006768 if (driver->textconv_cache && df->oid_valid) {
Jeff Kingd9bae1a2010-04-01 20:12:15 -04006769 /* ignore errors, as we might be in a readonly repository */
brian m. carlson569aa372017-05-06 22:09:58 +00006770 notes_cache_put(driver->textconv_cache, &df->oid, *outbuf,
Jeff Kingd9bae1a2010-04-01 20:12:15 -04006771 size);
6772 /*
6773 * we could save up changes and flush them all at the end,
6774 * but we would need an extra call after all diffing is done.
6775 * Since generating a cache entry is the slow path anyway,
6776 * this extra overhead probably isn't a big deal.
6777 */
6778 notes_cache_write(driver->textconv_cache);
6779 }
6780
Jeff King840383b2010-04-01 20:09:26 -04006781 return size;
6782}
Nguyễn Thái Ngọc Duy4914c962012-10-26 22:53:52 +07006783
Nguyễn Thái Ngọc Duy6afaf802018-09-21 17:57:22 +02006784int textconv_object(struct repository *r,
6785 const char *path,
Jeff Smith3a35cb22017-05-24 00:15:10 -05006786 unsigned mode,
6787 const struct object_id *oid,
6788 int oid_valid,
6789 char **buf,
6790 unsigned long *buf_size)
6791{
6792 struct diff_filespec *df;
6793 struct userdiff_driver *textconv;
6794
6795 df = alloc_filespec(path);
Junio C Hamanoa6f38c12017-06-19 12:38:44 -07006796 fill_filespec(df, oid, oid_valid, mode);
Nguyễn Thái Ngọc Duybd7ad452018-11-10 06:49:06 +01006797 textconv = get_textconv(r, df);
Jeff Smith3a35cb22017-05-24 00:15:10 -05006798 if (!textconv) {
6799 free_filespec(df);
6800 return 0;
6801 }
6802
Nguyễn Thái Ngọc Duy6afaf802018-09-21 17:57:22 +02006803 *buf_size = fill_textconv(r, textconv, df, buf);
Jeff Smith3a35cb22017-05-24 00:15:10 -05006804 free_filespec(df);
6805 return 1;
6806}
6807
Nguyễn Thái Ngọc Duy4914c962012-10-26 22:53:52 +07006808void setup_diff_pager(struct diff_options *opt)
6809{
6810 /*
6811 * If the user asked for our exit code, then either they want --quiet
6812 * or --exit-code. We should definitely not bother with a pager in the
6813 * former case, as we will generate no output. Since we still properly
6814 * report our exit code even when a pager is run, we _could_ run a
6815 * pager with --exit-code. But since we have not done so historically,
6816 * and because it is easy to find people oneline advising "git diff
6817 * --exit-code" in hooks and other scripts, we do not do so.
6818 */
Brandon Williams0d1e0e72017-10-31 11:19:11 -07006819 if (!opt->flags.exit_with_status &&
Nguyễn Thái Ngọc Duy4914c962012-10-26 22:53:52 +07006820 check_pager_config("diff") != 0)
6821 setup_pager();
6822}