Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 1 | /* |
| 2 | * Copyright (C) 2005 Junio C Hamano |
| 3 | */ |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 4 | #include "cache.h" |
Brandon Williams | b2141fc | 2017-06-14 11:07:36 -0700 | [diff] [blame] | 5 | #include "config.h" |
Michael Haggerty | 284098f | 2015-08-12 19:12:01 +0200 | [diff] [blame] | 6 | #include "tempfile.h" |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 7 | #include "quote.h" |
| 8 | #include "diff.h" |
| 9 | #include "diffcore.h" |
Junio C Hamano | 051308f | 2006-05-04 16:51:44 -0700 | [diff] [blame] | 10 | #include "delta.h" |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 11 | #include "xdiff-interface.h" |
Jeff King | 7c92fe0 | 2006-09-08 04:03:18 -0400 | [diff] [blame] | 12 | #include "color.h" |
Junio C Hamano | 8c70124 | 2007-04-12 23:05:29 -0700 | [diff] [blame] | 13 | #include "attr.h" |
Johannes Sixt | d5535ec | 2007-10-19 21:47:56 +0200 | [diff] [blame] | 14 | #include "run-command.h" |
Junio C Hamano | 2370781 | 2008-01-02 01:50:11 -0800 | [diff] [blame] | 15 | #include "utf8.h" |
Stefan Beller | cbd53a2 | 2018-05-15 16:42:15 -0700 | [diff] [blame] | 16 | #include "object-store.h" |
Jeff King | be58e70 | 2008-10-05 17:43:21 -0400 | [diff] [blame] | 17 | #include "userdiff.h" |
Heiko Voigt | 851e18c | 2015-08-17 17:21:59 -0700 | [diff] [blame] | 18 | #include "submodule-config.h" |
Johannes Schindelin | 752c0c2 | 2009-10-19 14:38:32 +0200 | [diff] [blame] | 19 | #include "submodule.h" |
Stefan Beller | 2e2d5ac | 2017-06-30 13:53:07 -0700 | [diff] [blame] | 20 | #include "hashmap.h" |
Junio C Hamano | a757c64 | 2010-03-24 19:21:32 -0700 | [diff] [blame] | 21 | #include "ll-merge.h" |
Michael Haggerty | 02e8ca0 | 2012-10-28 17:50:54 +0100 | [diff] [blame] | 22 | #include "string-list.h" |
Jeff King | 82fbf26 | 2014-04-19 15:17:06 -0400 | [diff] [blame] | 23 | #include "argv-array.h" |
Jacob Keller | 660e113 | 2016-08-31 16:27:20 -0700 | [diff] [blame] | 24 | #include "graph.h" |
Jonathan Tan | 150e300 | 2017-08-18 15:20:36 -0700 | [diff] [blame] | 25 | #include "packfile.h" |
Nguyễn Thái Ngọc Duy | 4a28847 | 2019-01-27 07:35:31 +0700 | [diff] [blame] | 26 | #include "parse-options.h" |
Nguyễn Thái Ngọc Duy | 3ac68a9 | 2018-05-26 15:55:24 +0200 | [diff] [blame] | 27 | #include "help.h" |
Jonathan Tan | 7fbbcb2 | 2019-04-05 10:09:34 -0700 | [diff] [blame] | 28 | #include "fetch-object.h" |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 29 | |
Shawn O. Pearce | 1510fea | 2006-12-14 06:15:57 -0500 | [diff] [blame] | 30 | #ifdef NO_FAST_WORKING_DIRECTORY |
| 31 | #define FAST_WORKING_DIRECTORY 0 |
| 32 | #else |
| 33 | #define FAST_WORKING_DIRECTORY 1 |
| 34 | #endif |
| 35 | |
David Rientjes | 96f1e58 | 2006-08-15 10:23:48 -0700 | [diff] [blame] | 36 | static int diff_detect_rename_default; |
Stefan Beller | 33de716 | 2017-05-08 12:03:38 -0400 | [diff] [blame] | 37 | static int diff_indent_heuristic = 1; |
Jeff King | 92c57e5 | 2011-02-19 05:21:28 -0500 | [diff] [blame] | 38 | static int diff_rename_limit_default = 400; |
Jim Meyering | a624eaa | 2008-08-15 13:39:26 +0200 | [diff] [blame] | 39 | static int diff_suppress_blank_empty; |
Junio C Hamano | d2aea13 | 2012-09-15 13:59:59 -0700 | [diff] [blame] | 40 | static int diff_use_color_default = -1; |
Stefan Beller | 2e2d5ac | 2017-06-30 13:53:07 -0700 | [diff] [blame] | 41 | static int diff_color_moved_default; |
Stefan Beller | 626c0b5 | 2018-07-18 12:31:56 -0700 | [diff] [blame] | 42 | static int diff_color_moved_ws_default; |
Jeff Muizelaar | 6468a4e | 2012-09-27 15:12:52 -0400 | [diff] [blame] | 43 | static int diff_context_default = 3; |
Vegard Nossum | c488867 | 2017-01-12 13:21:11 +0100 | [diff] [blame] | 44 | static int diff_interhunk_context_default; |
Boyd Stephen Smith Jr | 98a4d87 | 2009-01-20 21:46:57 -0600 | [diff] [blame] | 45 | static const char *diff_word_regex_cfg; |
Johannes Schindelin | cbe0210 | 2007-12-17 13:42:20 +0000 | [diff] [blame] | 46 | static const char *external_diff_cmd_cfg; |
Samuel Bronson | 6d8940b | 2013-12-18 19:08:12 -0500 | [diff] [blame] | 47 | static const char *diff_order_file_cfg; |
Junio C Hamano | aecbf91 | 2007-08-31 13:13:42 -0700 | [diff] [blame] | 48 | int diff_auto_refresh_index = 1; |
Junio C Hamano | a5a818e | 2008-08-18 20:08:09 -0700 | [diff] [blame] | 49 | static int diff_mnemonic_prefix; |
Eli Collins | f89504d | 2010-05-02 19:03:41 -0700 | [diff] [blame] | 50 | static int diff_no_prefix; |
Zbigniew Jędrzejewski-Szmek | df44483 | 2012-03-01 13:26:46 +0100 | [diff] [blame] | 51 | static int diff_stat_graph_width; |
Johan Herland | 712d2c7 | 2011-04-29 11:36:20 +0200 | [diff] [blame] | 52 | static int diff_dirstat_permille_default = 30; |
Johannes Schindelin | be4f2b4 | 2010-08-05 10:49:55 +0200 | [diff] [blame] | 53 | static struct diff_options default_diff_options; |
Michal Privoznik | 07ab4de | 2013-01-16 08:51:57 +0100 | [diff] [blame] | 54 | static long diff_algorithm; |
Junio C Hamano | a17505f | 2016-10-04 15:26:27 -0700 | [diff] [blame] | 55 | static unsigned ws_error_highlight_default = WSEH_NEW; |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 56 | |
Jeff King | 7c92fe0 | 2006-09-08 04:03:18 -0400 | [diff] [blame] | 57 | static char diff_colors[][COLOR_MAXLEN] = { |
Arjen Laarhoven | dc6ebd4 | 2009-02-13 22:53:40 +0100 | [diff] [blame] | 58 | GIT_COLOR_RESET, |
Jeff King | 8dbf3eb | 2015-05-27 16:48:46 -0400 | [diff] [blame] | 59 | GIT_COLOR_NORMAL, /* CONTEXT */ |
Arjen Laarhoven | dc6ebd4 | 2009-02-13 22:53:40 +0100 | [diff] [blame] | 60 | 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 Wesarg | 89cb73a | 2009-11-27 07:55:18 +0100 | [diff] [blame] | 66 | GIT_COLOR_NORMAL, /* FUNCINFO */ |
Stefan Beller | 86b452e | 2017-06-30 13:53:09 -0700 | [diff] [blame] | 67 | 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 Schindelin | a7be92a | 2018-08-13 04:33:32 -0700 | [diff] [blame] | 75 | 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 Schindelin | cd112ce | 2006-06-13 18:45:44 +0200 | [diff] [blame] | 81 | }; |
| 82 | |
Nguyễn Thái Ngọc Duy | a73b368 | 2018-05-26 15:55:21 +0200 | [diff] [blame] | 83 | static 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 Schindelin | a7be92a | 2018-08-13 04:33:32 -0700 | [diff] [blame] | 100 | [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 Duy | a73b368 | 2018-05-26 15:55:21 +0200 | [diff] [blame] | 106 | }; |
| 107 | |
Nguyễn Thái Ngọc Duy | 3ac68a9 | 2018-05-26 15:55:24 +0200 | [diff] [blame] | 108 | define_list_config_array_extra(color_diff_slots, {"plain"}); |
| 109 | |
Jeff King | 9e1a5eb | 2014-06-18 15:41:50 -0400 | [diff] [blame] | 110 | static int parse_diff_color_slot(const char *var) |
Junio C Hamano | 801235c | 2006-06-24 04:06:23 -0700 | [diff] [blame] | 111 | { |
Nguyễn Thái Ngọc Duy | a73b368 | 2018-05-26 15:55:21 +0200 | [diff] [blame] | 112 | if (!strcasecmp(var, "plain")) |
Jeff King | 8dbf3eb | 2015-05-27 16:48:46 -0400 | [diff] [blame] | 113 | return DIFF_CONTEXT; |
Nguyễn Thái Ngọc Duy | a73b368 | 2018-05-26 15:55:21 +0200 | [diff] [blame] | 114 | return LOOKUP_CONFIG(color_diff_slots, var); |
Junio C Hamano | 801235c | 2006-06-24 04:06:23 -0700 | [diff] [blame] | 115 | } |
| 116 | |
Michael Haggerty | 02e8ca0 | 2012-10-28 17:50:54 +0100 | [diff] [blame] | 117 | static int parse_dirstat_params(struct diff_options *options, const char *params_string, |
Johan Herland | 51670fc | 2011-04-29 11:36:22 +0200 | [diff] [blame] | 118 | struct strbuf *errmsg) |
Johan Herland | 333f3fb | 2011-04-29 11:36:18 +0200 | [diff] [blame] | 119 | { |
Michael Haggerty | 02e8ca0 | 2012-10-28 17:50:54 +0100 | [diff] [blame] | 120 | char *params_copy = xstrdup(params_string); |
| 121 | struct string_list params = STRING_LIST_INIT_NODUP; |
| 122 | int ret = 0; |
| 123 | int i; |
Johan Herland | 51670fc | 2011-04-29 11:36:22 +0200 | [diff] [blame] | 124 | |
Michael Haggerty | 02e8ca0 | 2012-10-28 17:50:54 +0100 | [diff] [blame] | 125 | if (*params_copy) |
| 126 | string_list_split_in_place(¶ms, 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 Williams | 0d1e0e7 | 2017-10-31 11:19:11 -0700 | [diff] [blame] | 130 | options->flags.dirstat_by_line = 0; |
| 131 | options->flags.dirstat_by_file = 0; |
Michael Haggerty | 02e8ca0 | 2012-10-28 17:50:54 +0100 | [diff] [blame] | 132 | } else if (!strcmp(p, "lines")) { |
Brandon Williams | 0d1e0e7 | 2017-10-31 11:19:11 -0700 | [diff] [blame] | 133 | options->flags.dirstat_by_line = 1; |
| 134 | options->flags.dirstat_by_file = 0; |
Michael Haggerty | 02e8ca0 | 2012-10-28 17:50:54 +0100 | [diff] [blame] | 135 | } else if (!strcmp(p, "files")) { |
Brandon Williams | 0d1e0e7 | 2017-10-31 11:19:11 -0700 | [diff] [blame] | 136 | options->flags.dirstat_by_line = 0; |
| 137 | options->flags.dirstat_by_file = 1; |
Michael Haggerty | 02e8ca0 | 2012-10-28 17:50:54 +0100 | [diff] [blame] | 138 | } else if (!strcmp(p, "noncumulative")) { |
Brandon Williams | 0d1e0e7 | 2017-10-31 11:19:11 -0700 | [diff] [blame] | 139 | options->flags.dirstat_cumulative = 0; |
Michael Haggerty | 02e8ca0 | 2012-10-28 17:50:54 +0100 | [diff] [blame] | 140 | } else if (!strcmp(p, "cumulative")) { |
Brandon Williams | 0d1e0e7 | 2017-10-31 11:19:11 -0700 | [diff] [blame] | 141 | options->flags.dirstat_cumulative = 1; |
Johan Herland | 333f3fb | 2011-04-29 11:36:18 +0200 | [diff] [blame] | 142 | } else if (isdigit(*p)) { |
| 143 | char *end; |
Johan Herland | 51670fc | 2011-04-29 11:36:22 +0200 | [diff] [blame] | 144 | int permille = strtoul(p, &end, 10) * 10; |
| 145 | if (*end == '.' && isdigit(*++end)) { |
Johan Herland | 712d2c7 | 2011-04-29 11:36:20 +0200 | [diff] [blame] | 146 | /* only use first digit */ |
Johan Herland | 51670fc | 2011-04-29 11:36:22 +0200 | [diff] [blame] | 147 | permille += *end - '0'; |
Johan Herland | 712d2c7 | 2011-04-29 11:36:20 +0200 | [diff] [blame] | 148 | /* .. and ignore any further digits */ |
Johan Herland | 51670fc | 2011-04-29 11:36:22 +0200 | [diff] [blame] | 149 | while (isdigit(*++end)) |
Johan Herland | 712d2c7 | 2011-04-29 11:36:20 +0200 | [diff] [blame] | 150 | ; /* nothing */ |
| 151 | } |
Michael Haggerty | 02e8ca0 | 2012-10-28 17:50:54 +0100 | [diff] [blame] | 152 | if (!*end) |
Johan Herland | 51670fc | 2011-04-29 11:36:22 +0200 | [diff] [blame] | 153 | options->dirstat_permille = permille; |
| 154 | else { |
Michael Haggerty | 02e8ca0 | 2012-10-28 17:50:54 +0100 | [diff] [blame] | 155 | strbuf_addf(errmsg, _(" Failed to parse dirstat cut-off percentage '%s'\n"), |
| 156 | p); |
Johan Herland | 51670fc | 2011-04-29 11:36:22 +0200 | [diff] [blame] | 157 | ret++; |
| 158 | } |
| 159 | } else { |
Michael Haggerty | 02e8ca0 | 2012-10-28 17:50:54 +0100 | [diff] [blame] | 160 | strbuf_addf(errmsg, _(" Unknown dirstat parameter '%s'\n"), p); |
Johan Herland | 51670fc | 2011-04-29 11:36:22 +0200 | [diff] [blame] | 161 | ret++; |
Johan Herland | 333f3fb | 2011-04-29 11:36:18 +0200 | [diff] [blame] | 162 | } |
Johan Herland | 51670fc | 2011-04-29 11:36:22 +0200 | [diff] [blame] | 163 | |
Johan Herland | 333f3fb | 2011-04-29 11:36:18 +0200 | [diff] [blame] | 164 | } |
Michael Haggerty | 02e8ca0 | 2012-10-28 17:50:54 +0100 | [diff] [blame] | 165 | string_list_clear(¶ms, 0); |
| 166 | free(params_copy); |
Johan Herland | 51670fc | 2011-04-29 11:36:22 +0200 | [diff] [blame] | 167 | return ret; |
Johan Herland | 333f3fb | 2011-04-29 11:36:18 +0200 | [diff] [blame] | 168 | } |
| 169 | |
Ramkumar Ramachandra | c47ef57 | 2012-11-13 21:12:45 +0530 | [diff] [blame] | 170 | static int parse_submodule_params(struct diff_options *options, const char *value) |
| 171 | { |
| 172 | if (!strcmp(value, "log")) |
Jacob Keller | 61cfbc0 | 2016-08-31 16:27:21 -0700 | [diff] [blame] | 173 | options->submodule_format = DIFF_SUBMODULE_LOG; |
Ramkumar Ramachandra | c47ef57 | 2012-11-13 21:12:45 +0530 | [diff] [blame] | 174 | else if (!strcmp(value, "short")) |
Jacob Keller | 61cfbc0 | 2016-08-31 16:27:21 -0700 | [diff] [blame] | 175 | options->submodule_format = DIFF_SUBMODULE_SHORT; |
Jacob Keller | fd47ae6 | 2016-08-31 16:27:25 -0700 | [diff] [blame] | 176 | else if (!strcmp(value, "diff")) |
| 177 | options->submodule_format = DIFF_SUBMODULE_INLINE_DIFF; |
Nguyễn Thái Ngọc Duy | 5a59a23 | 2019-02-16 18:24:41 +0700 | [diff] [blame] | 178 | /* |
| 179 | * Please update $__git_diff_submodule_formats in |
| 180 | * git-completion.bash when you add new formats. |
| 181 | */ |
Ramkumar Ramachandra | c47ef57 | 2012-11-13 21:12:45 +0530 | [diff] [blame] | 182 | else |
| 183 | return -1; |
| 184 | return 0; |
| 185 | } |
| 186 | |
Ben Peart | 85b4603 | 2018-05-02 16:01:14 +0000 | [diff] [blame] | 187 | int git_config_rename(const char *var, const char *value) |
Linus Torvalds | cced5fb | 2009-04-09 11:46:15 -0700 | [diff] [blame] | 188 | { |
| 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 Privoznik | 07924d4 | 2013-01-16 08:51:58 +0100 | [diff] [blame] | 196 | long parse_algorithm_value(const char *value) |
Michal Privoznik | 07ab4de | 2013-01-16 08:51:57 +0100 | [diff] [blame] | 197 | { |
| 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 Duy | 5a59a23 | 2019-02-16 18:24:41 +0700 | [diff] [blame] | 208 | /* |
| 209 | * Please update $__git_diff_algorithms in git-completion.bash |
| 210 | * when you add new algorithms. |
| 211 | */ |
Michal Privoznik | 07ab4de | 2013-01-16 08:51:57 +0100 | [diff] [blame] | 212 | return -1; |
| 213 | } |
| 214 | |
Junio C Hamano | 0b4b42e | 2016-10-04 15:09:18 -0700 | [diff] [blame] | 215 | static 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 | |
| 225 | static 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 Hamano | e0e324a | 2007-07-07 01:49:58 -0700 | [diff] [blame] | 252 | /* |
Junio C Hamano | 83ad63c | 2006-07-08 01:05:16 -0700 | [diff] [blame] | 253 | * 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 Moy | 5404c11 | 2016-02-25 09:59:21 +0100 | [diff] [blame] | 258 | void init_diff_ui_defaults(void) |
| 259 | { |
Nguyễn Thái Ngọc Duy | 06dba2b | 2017-12-27 17:18:35 +0700 | [diff] [blame] | 260 | diff_detect_rename_default = DIFF_DETECT_RENAME; |
Matthieu Moy | 5404c11 | 2016-02-25 09:59:21 +0100 | [diff] [blame] | 261 | } |
| 262 | |
Michael Haggerty | 5b16287 | 2016-09-05 11:44:53 +0200 | [diff] [blame] | 263 | int git_diff_heuristic_config(const char *var, const char *value, void *cb) |
| 264 | { |
Junio C Hamano | 3cde4e0 | 2016-12-23 12:32:22 -0800 | [diff] [blame] | 265 | if (!strcmp(var, "diff.indentheuristic")) |
Michael Haggerty | 5b16287 | 2016-09-05 11:44:53 +0200 | [diff] [blame] | 266 | diff_indent_heuristic = git_config_bool(var, value); |
Michael Haggerty | 5b16287 | 2016-09-05 11:44:53 +0200 | [diff] [blame] | 267 | return 0; |
| 268 | } |
| 269 | |
Stefan Beller | 2e2d5ac | 2017-06-30 13:53:07 -0700 | [diff] [blame] | 270 | static 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 Beller | 176841f | 2017-06-30 13:53:08 -0700 | [diff] [blame] | 283 | else if (!strcmp(arg, "plain")) |
| 284 | return COLOR_MOVED_PLAIN; |
Stefan Beller | 51da15e | 2018-07-16 16:05:39 -0700 | [diff] [blame] | 285 | else if (!strcmp(arg, "blocks")) |
| 286 | return COLOR_MOVED_BLOCKS; |
Stefan Beller | 2e2d5ac | 2017-06-30 13:53:07 -0700 | [diff] [blame] | 287 | else if (!strcmp(arg, "zebra")) |
| 288 | return COLOR_MOVED_ZEBRA; |
| 289 | else if (!strcmp(arg, "default")) |
| 290 | return COLOR_MOVED_DEFAULT; |
Eric Sunshine | e3f2f5f | 2018-07-24 17:58:45 -0400 | [diff] [blame] | 291 | else if (!strcmp(arg, "dimmed-zebra")) |
| 292 | return COLOR_MOVED_ZEBRA_DIM; |
Stefan Beller | 86b452e | 2017-06-30 13:53:09 -0700 | [diff] [blame] | 293 | else if (!strcmp(arg, "dimmed_zebra")) |
| 294 | return COLOR_MOVED_ZEBRA_DIM; |
Stefan Beller | 2e2d5ac | 2017-06-30 13:53:07 -0700 | [diff] [blame] | 295 | else |
Junio C Hamano | 706b0b5 | 2018-08-15 15:08:22 -0700 | [diff] [blame] | 296 | return error(_("color moved setting must be one of 'no', 'default', 'blocks', 'zebra', 'dimmed-zebra', 'plain'")); |
Stefan Beller | 2e2d5ac | 2017-06-30 13:53:07 -0700 | [diff] [blame] | 297 | } |
| 298 | |
Stefan Beller | d173e79 | 2018-11-13 13:33:57 -0800 | [diff] [blame] | 299 | static unsigned parse_color_moved_ws(const char *arg) |
Stefan Beller | b309571 | 2018-07-16 16:05:40 -0700 | [diff] [blame] | 300 | { |
| 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 Wood | b73bcba | 2018-11-23 11:16:52 +0000 | [diff] [blame] | 312 | if (!strcmp(sb.buf, "no")) |
| 313 | ret = 0; |
| 314 | else if (!strcmp(sb.buf, "ignore-space-change")) |
Stefan Beller | b309571 | 2018-07-16 16:05:40 -0700 | [diff] [blame] | 315 | 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 Beller | ca1f4ae | 2018-07-18 12:31:55 -0700 | [diff] [blame] | 320 | else if (!strcmp(sb.buf, "allow-indentation-change")) |
| 321 | ret |= COLOR_MOVED_WS_ALLOW_INDENTATION_CHANGE; |
Stefan Beller | d173e79 | 2018-11-13 13:33:57 -0800 | [diff] [blame] | 322 | 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 Beller | b309571 | 2018-07-16 16:05:40 -0700 | [diff] [blame] | 326 | |
| 327 | strbuf_release(&sb); |
| 328 | } |
| 329 | |
Stefan Beller | ca1f4ae | 2018-07-18 12:31:55 -0700 | [diff] [blame] | 330 | if ((ret & COLOR_MOVED_WS_ALLOW_INDENTATION_CHANGE) && |
Stefan Beller | d173e79 | 2018-11-13 13:33:57 -0800 | [diff] [blame] | 331 | (ret & XDF_WHITESPACE_FLAGS)) { |
Junio C Hamano | 15b07cb | 2019-01-29 12:47:53 -0800 | [diff] [blame] | 332 | error(_("color-moved-ws: allow-indentation-change cannot be combined with other whitespace modes")); |
Stefan Beller | d173e79 | 2018-11-13 13:33:57 -0800 | [diff] [blame] | 333 | ret |= COLOR_MOVED_WS_ERROR; |
| 334 | } |
Stefan Beller | ca1f4ae | 2018-07-18 12:31:55 -0700 | [diff] [blame] | 335 | |
Stefan Beller | b309571 | 2018-07-16 16:05:40 -0700 | [diff] [blame] | 336 | string_list_clear(&l, 0); |
| 337 | |
| 338 | return ret; |
Jeff King | e269eb7 | 2011-08-17 22:03:48 -0700 | [diff] [blame] | 339 | } |
Junio C Hamano | 801235c | 2006-06-24 04:06:23 -0700 | [diff] [blame] | 340 | |
| 341 | int git_diff_ui_config(const char *var, const char *value, void *cb) |
Jeff Muizelaar | 6468a4e | 2012-09-27 15:12:52 -0400 | [diff] [blame] | 342 | { |
| 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 Beller | 2e2d5ac | 2017-06-30 13:53:07 -0700 | [diff] [blame] | 347 | 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 Beller | 626c0b5 | 2018-07-18 12:31:56 -0700 | [diff] [blame] | 354 | if (!strcmp(var, "diff.colormovedws")) { |
Stefan Beller | d173e79 | 2018-11-13 13:33:57 -0800 | [diff] [blame] | 355 | unsigned cm = parse_color_moved_ws(value); |
| 356 | if (cm & COLOR_MOVED_WS_ERROR) |
Stefan Beller | 626c0b5 | 2018-07-18 12:31:56 -0700 | [diff] [blame] | 357 | return -1; |
| 358 | diff_color_moved_ws_default = cm; |
| 359 | return 0; |
| 360 | } |
Jeff Muizelaar | 6468a4e | 2012-09-27 15:12:52 -0400 | [diff] [blame] | 361 | 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 Nossum | c488867 | 2017-01-12 13:21:11 +0100 | [diff] [blame] | 367 | 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 Wong | b68ea12 | 2006-07-07 04:01:23 -0700 | [diff] [blame] | 373 | if (!strcmp(var, "diff.renames")) { |
Linus Torvalds | cced5fb | 2009-04-09 11:46:15 -0700 | [diff] [blame] | 374 | diff_detect_rename_default = git_config_rename(var, value); |
Eric Wong | b68ea12 | 2006-07-07 04:01:23 -0700 | [diff] [blame] | 375 | return 0; |
| 376 | } |
Junio C Hamano | aecbf91 | 2007-08-31 13:13:42 -0700 | [diff] [blame] | 377 | if (!strcmp(var, "diff.autorefreshindex")) { |
| 378 | diff_auto_refresh_index = git_config_bool(var, value); |
| 379 | return 0; |
| 380 | } |
Junio C Hamano | a5a818e | 2008-08-18 20:08:09 -0700 | [diff] [blame] | 381 | if (!strcmp(var, "diff.mnemonicprefix")) { |
| 382 | diff_mnemonic_prefix = git_config_bool(var, value); |
| 383 | return 0; |
| 384 | } |
Eli Collins | f89504d | 2010-05-02 19:03:41 -0700 | [diff] [blame] | 385 | if (!strcmp(var, "diff.noprefix")) { |
| 386 | diff_no_prefix = git_config_bool(var, value); |
| 387 | return 0; |
| 388 | } |
Zbigniew Jędrzejewski-Szmek | df44483 | 2012-03-01 13:26:46 +0100 | [diff] [blame] | 389 | if (!strcmp(var, "diff.statgraphwidth")) { |
| 390 | diff_stat_graph_width = git_config_int(var, value); |
| 391 | return 0; |
| 392 | } |
Brian Hetro | daec808 | 2008-07-05 01:24:43 -0400 | [diff] [blame] | 393 | if (!strcmp(var, "diff.external")) |
| 394 | return git_config_string(&external_diff_cmd_cfg, var, value); |
Boyd Stephen Smith Jr | 98a4d87 | 2009-01-20 21:46:57 -0600 | [diff] [blame] | 395 | if (!strcmp(var, "diff.wordregex")) |
| 396 | return git_config_string(&diff_word_regex_cfg, var, value); |
Samuel Bronson | 6d8940b | 2013-12-18 19:08:12 -0500 | [diff] [blame] | 397 | if (!strcmp(var, "diff.orderfile")) |
| 398 | return git_config_pathname(&diff_order_file_cfg, var, value); |
Junio C Hamano | f1af60b | 2007-04-22 17:52:55 -0700 | [diff] [blame] | 399 | |
Johannes Schindelin | be4f2b4 | 2010-08-05 10:49:55 +0200 | [diff] [blame] | 400 | if (!strcmp(var, "diff.ignoresubmodules")) |
| 401 | handle_ignore_submodules_arg(&default_diff_options, value); |
| 402 | |
Ramkumar Ramachandra | c47ef57 | 2012-11-13 21:12:45 +0530 | [diff] [blame] | 403 | 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 Privoznik | 07ab4de | 2013-01-16 08:51:57 +0100 | [diff] [blame] | 410 | 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 Hamano | a17505f | 2016-10-04 15:26:27 -0700 | [diff] [blame] | 417 | 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 King | 33c643b | 2017-10-13 13:24:31 -0400 | [diff] [blame] | 425 | if (git_color_config(var, value, cb) < 0) |
| 426 | return -1; |
| 427 | |
Johannes Schindelin | ef90d6d | 2008-05-14 18:46:53 +0100 | [diff] [blame] | 428 | return git_diff_basic_config(var, value, cb); |
Jeff King | 9a1805a | 2008-01-04 03:59:34 -0500 | [diff] [blame] | 429 | } |
| 430 | |
Johannes Schindelin | ef90d6d | 2008-05-14 18:46:53 +0100 | [diff] [blame] | 431 | int git_diff_basic_config(const char *var, const char *value, void *cb) |
Jeff King | 9a1805a | 2008-01-04 03:59:34 -0500 | [diff] [blame] | 432 | { |
Jeff King | ae021d8 | 2014-06-18 15:47:50 -0400 | [diff] [blame] | 433 | const char *name; |
| 434 | |
Linus Torvalds | 2b6ca6d | 2008-08-05 11:27:30 -0700 | [diff] [blame] | 435 | if (!strcmp(var, "diff.renamelimit")) { |
| 436 | diff_rename_limit_default = git_config_int(var, value); |
| 437 | return 0; |
| 438 | } |
| 439 | |
Jeff King | 6680a08 | 2012-02-07 13:23:02 -0500 | [diff] [blame] | 440 | if (userdiff_config(var, value) < 0) |
| 441 | return -1; |
Jeff King | c7534ef | 2008-10-26 00:45:55 -0400 | [diff] [blame] | 442 | |
Jeff King | ae021d8 | 2014-06-18 15:47:50 -0400 | [diff] [blame] | 443 | if (skip_prefix(var, "diff.color.", &name) || |
| 444 | skip_prefix(var, "color.diff.", &name)) { |
| 445 | int slot = parse_diff_color_slot(name); |
Jeff King | 8b8e862 | 2009-12-12 07:25:24 -0500 | [diff] [blame] | 446 | if (slot < 0) |
| 447 | return 0; |
Junio C Hamano | 64f30e9 | 2008-02-11 10:53:56 -0800 | [diff] [blame] | 448 | if (!value) |
| 449 | return config_error_nonbool(var); |
Jeff King | f6c5a29 | 2014-10-07 15:33:09 -0400 | [diff] [blame] | 450 | return color_parse(value, diff_colors[slot]); |
Junio C Hamano | 801235c | 2006-06-24 04:06:23 -0700 | [diff] [blame] | 451 | } |
Junio C Hamano | f1af60b | 2007-04-22 17:52:55 -0700 | [diff] [blame] | 452 | |
Jim Meyering | a624eaa | 2008-08-15 13:39:26 +0200 | [diff] [blame] | 453 | /* like GNU diff's --suppress-blank-empty option */ |
Johannes Schindelin | 950db87 | 2009-01-20 22:08:33 +0100 | [diff] [blame] | 454 | if (!strcmp(var, "diff.suppressblankempty") || |
| 455 | /* for backwards compatibility */ |
| 456 | !strcmp(var, "diff.suppress-blank-empty")) { |
Jim Meyering | a624eaa | 2008-08-15 13:39:26 +0200 | [diff] [blame] | 457 | diff_suppress_blank_empty = git_config_bool(var, value); |
| 458 | return 0; |
| 459 | } |
| 460 | |
Johan Herland | 2d17495 | 2011-04-29 11:36:19 +0200 | [diff] [blame] | 461 | if (!strcmp(var, "diff.dirstat")) { |
Johan Herland | 51670fc | 2011-04-29 11:36:22 +0200 | [diff] [blame] | 462 | struct strbuf errmsg = STRBUF_INIT; |
Johan Herland | 712d2c7 | 2011-04-29 11:36:20 +0200 | [diff] [blame] | 463 | default_diff_options.dirstat_permille = diff_dirstat_permille_default; |
Johan Herland | 51670fc | 2011-04-29 11:36:22 +0200 | [diff] [blame] | 464 | if (parse_dirstat_params(&default_diff_options, value, &errmsg)) |
Johan Herland | 7478ac5 | 2011-04-29 11:36:23 +0200 | [diff] [blame] | 465 | warning(_("Found errors in 'diff.dirstat' config variable:\n%s"), |
Johan Herland | 51670fc | 2011-04-29 11:36:22 +0200 | [diff] [blame] | 466 | errmsg.buf); |
| 467 | strbuf_release(&errmsg); |
Johan Herland | 712d2c7 | 2011-04-29 11:36:20 +0200 | [diff] [blame] | 468 | diff_dirstat_permille_default = default_diff_options.dirstat_permille; |
Johan Herland | 2d17495 | 2011-04-29 11:36:19 +0200 | [diff] [blame] | 469 | return 0; |
| 470 | } |
| 471 | |
Marc Branchaud | cf5e772 | 2017-05-08 12:03:36 -0400 | [diff] [blame] | 472 | if (git_diff_heuristic_config(var, value, cb) < 0) |
| 473 | return -1; |
| 474 | |
Jeff King | 3e1dd17 | 2011-08-17 22:05:08 -0700 | [diff] [blame] | 475 | return git_default_config(var, value, cb); |
Junio C Hamano | 801235c | 2006-06-24 04:06:23 -0700 | [diff] [blame] | 476 | } |
| 477 | |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 478 | static 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 Casey | f285a2d | 2008-10-09 14:12:12 -0500 | [diff] [blame] | 482 | struct strbuf res = STRBUF_INIT; |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 483 | |
| 484 | if (need_one + need_two) { |
Pierre Habouzit | 663af34 | 2007-09-20 00:42:15 +0200 | [diff] [blame] | 485 | 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 Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 492 | } |
Pierre Habouzit | b315c5c | 2007-09-27 12:58:23 +0200 | [diff] [blame] | 493 | return strbuf_detach(&res, NULL); |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 494 | } |
| 495 | |
| 496 | static 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 Gybels | 6776a84 | 2019-01-11 21:26:08 +0100 | [diff] [blame] | 503 | external_diff_cmd = xstrdup_or_null(getenv("GIT_EXTERNAL_DIFF")); |
Johannes Schindelin | cbe0210 | 2007-12-17 13:42:20 +0000 | [diff] [blame] | 504 | if (!external_diff_cmd) |
| 505 | external_diff_cmd = external_diff_cmd_cfg; |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 506 | done_preparing = 1; |
| 507 | return external_diff_cmd; |
| 508 | } |
| 509 | |
Michael Haggerty | 284098f | 2015-08-12 19:12:01 +0200 | [diff] [blame] | 510 | /* |
| 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 Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 515 | static struct diff_tempfile { |
Michael Haggerty | 284098f | 2015-08-12 19:12:01 +0200 | [diff] [blame] | 516 | /* |
| 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. carlson | dc01505 | 2017-03-26 16:01:24 +0000 | [diff] [blame] | 522 | char hex[GIT_MAX_HEXSZ + 1]; |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 523 | char mode[10]; |
Michael Haggerty | 284098f | 2015-08-12 19:12:01 +0200 | [diff] [blame] | 524 | |
| 525 | /* |
| 526 | * If this diff_tempfile instance refers to a temporary file, |
| 527 | * this tempfile object is used to manage its lifetime. |
| 528 | */ |
Jeff King | 076aa2c | 2017-09-05 08:15:08 -0400 | [diff] [blame] | 529 | struct tempfile *tempfile; |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 530 | } diff_temp[2]; |
| 531 | |
Junio C Hamano | 6957eb9 | 2009-09-14 18:44:01 -0700 | [diff] [blame] | 532 | struct emit_callback { |
Junio C Hamano | 6957eb9 | 2009-09-14 18:44:01 -0700 | [diff] [blame] | 533 | 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 Hamano | 6957eb9 | 2009-09-14 18:44:01 -0700 | [diff] [blame] | 539 | const char **label_path; |
| 540 | struct diff_words_data *diff_words; |
Bo Yang | a3c158d | 2010-05-26 15:08:02 +0800 | [diff] [blame] | 541 | struct diff_options *opt; |
Greg Bacon | 3e97c7c | 2009-11-19 15:12:24 -0600 | [diff] [blame] | 542 | struct strbuf *header; |
Junio C Hamano | 6957eb9 | 2009-09-14 18:44:01 -0700 | [diff] [blame] | 543 | }; |
| 544 | |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 545 | static 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 Duy | b78ea5f | 2018-09-21 17:57:19 +0200 | [diff] [blame] | 568 | static int fill_mmfile(struct repository *r, mmfile_t *mf, |
| 569 | struct diff_filespec *one) |
Junio C Hamano | 6957eb9 | 2009-09-14 18:44:01 -0700 | [diff] [blame] | 570 | { |
| 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 Duy | b78ea5f | 2018-09-21 17:57:19 +0200 | [diff] [blame] | 576 | else if (diff_populate_filespec(r, one, 0)) |
Junio C Hamano | 6957eb9 | 2009-09-14 18:44:01 -0700 | [diff] [blame] | 577 | return -1; |
Junio C Hamano | bb35fef | 2009-09-15 03:38:30 -0700 | [diff] [blame] | 578 | |
Junio C Hamano | 6957eb9 | 2009-09-14 18:44:01 -0700 | [diff] [blame] | 579 | mf->ptr = one->data; |
| 580 | mf->size = one->size; |
| 581 | return 0; |
| 582 | } |
| 583 | |
Jeff King | abb371a | 2011-02-19 03:16:32 -0500 | [diff] [blame] | 584 | /* like fill_mmfile, but only for size, so we can avoid retrieving blob */ |
Nguyễn Thái Ngọc Duy | b78ea5f | 2018-09-21 17:57:19 +0200 | [diff] [blame] | 585 | static unsigned long diff_filespec_size(struct repository *r, |
| 586 | struct diff_filespec *one) |
Jeff King | abb371a | 2011-02-19 03:16:32 -0500 | [diff] [blame] | 587 | { |
| 588 | if (!DIFF_FILE_VALID(one)) |
| 589 | return 0; |
Nguyễn Thái Ngọc Duy | b78ea5f | 2018-09-21 17:57:19 +0200 | [diff] [blame] | 590 | diff_populate_filespec(r, one, CHECK_SIZE_ONLY); |
Jeff King | abb371a | 2011-02-19 03:16:32 -0500 | [diff] [blame] | 591 | return one->size; |
| 592 | } |
| 593 | |
Junio C Hamano | 6957eb9 | 2009-09-14 18:44:01 -0700 | [diff] [blame] | 594 | static 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 | |
| 620 | static 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 Schindelin | f7c3b4e | 2018-08-13 04:33:20 -0700 | [diff] [blame] | 639 | static void emit_line_0(struct diff_options *o, |
Stefan Beller | 017ac45 | 2018-08-13 18:41:19 -0700 | [diff] [blame] | 640 | const char *set_sign, const char *set, unsigned reverse, const char *reset, |
Junio C Hamano | 250f799 | 2009-09-14 18:44:01 -0700 | [diff] [blame] | 641 | int first, const char *line, int len) |
Junio C Hamano | 6957eb9 | 2009-09-14 18:44:01 -0700 | [diff] [blame] | 642 | { |
| 643 | int has_trailing_newline, has_trailing_carriage_return; |
Stefan Beller | 4441067 | 2018-08-13 18:41:22 -0700 | [diff] [blame] | 644 | int needs_reset = 0; /* at the end of the line */ |
Bo Yang | a3c158d | 2010-05-26 15:08:02 +0800 | [diff] [blame] | 645 | FILE *file = o->file; |
| 646 | |
Stefan Beller | f103a6f | 2018-08-13 18:41:21 -0700 | [diff] [blame] | 647 | fputs(diff_line_prefix(o), file); |
Junio C Hamano | 6957eb9 | 2009-09-14 18:44:01 -0700 | [diff] [blame] | 648 | |
Stefan Beller | 4441067 | 2018-08-13 18:41:22 -0700 | [diff] [blame] | 649 | 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 Hamano | 250f799 | 2009-09-14 18:44:01 -0700 | [diff] [blame] | 663 | } |
Junio C Hamano | 6957eb9 | 2009-09-14 18:44:01 -0700 | [diff] [blame] | 664 | |
Stefan Beller | 4441067 | 2018-08-13 18:41:22 -0700 | [diff] [blame] | 665 | if (set_sign) { |
| 666 | fputs(set_sign, file); |
| 667 | needs_reset = 1; |
Junio C Hamano | 06a4755 | 2009-11-27 22:04:10 -0800 | [diff] [blame] | 668 | } |
Stefan Beller | 4441067 | 2018-08-13 18:41:22 -0700 | [diff] [blame] | 669 | |
Junio C Hamano | 6957eb9 | 2009-09-14 18:44:01 -0700 | [diff] [blame] | 670 | if (first) |
Stefan Beller | 4441067 | 2018-08-13 18:41:22 -0700 | [diff] [blame] | 671 | fputc(first, file); |
Junio C Hamano | 6957eb9 | 2009-09-14 18:44:01 -0700 | [diff] [blame] | 672 | |
Stefan Beller | 4441067 | 2018-08-13 18:41:22 -0700 | [diff] [blame] | 673 | if (!len) |
| 674 | goto end_of_line; |
Junio C Hamano | 6957eb9 | 2009-09-14 18:44:01 -0700 | [diff] [blame] | 675 | |
Stefan Beller | 4441067 | 2018-08-13 18:41:22 -0700 | [diff] [blame] | 676 | if (set) { |
| 677 | if (set_sign && set != set_sign) |
| 678 | fputs(reset, file); |
Junio C Hamano | 250f799 | 2009-09-14 18:44:01 -0700 | [diff] [blame] | 679 | fputs(set, file); |
Stefan Beller | 4441067 | 2018-08-13 18:41:22 -0700 | [diff] [blame] | 680 | needs_reset = 1; |
Junio C Hamano | 6957eb9 | 2009-09-14 18:44:01 -0700 | [diff] [blame] | 681 | } |
Stefan Beller | 4441067 | 2018-08-13 18:41:22 -0700 | [diff] [blame] | 682 | fwrite(line, len, 1, file); |
| 683 | needs_reset = 1; /* 'line' may contain color codes. */ |
| 684 | |
| 685 | end_of_line: |
| 686 | if (needs_reset) |
| 687 | fputs(reset, file); |
Junio C Hamano | 6957eb9 | 2009-09-14 18:44:01 -0700 | [diff] [blame] | 688 | if (has_trailing_carriage_return) |
| 689 | fputc('\r', file); |
| 690 | if (has_trailing_newline) |
| 691 | fputc('\n', file); |
| 692 | } |
| 693 | |
Bo Yang | a3c158d | 2010-05-26 15:08:02 +0800 | [diff] [blame] | 694 | static void emit_line(struct diff_options *o, const char *set, const char *reset, |
Junio C Hamano | 250f799 | 2009-09-14 18:44:01 -0700 | [diff] [blame] | 695 | const char *line, int len) |
| 696 | { |
Stefan Beller | 4441067 | 2018-08-13 18:41:22 -0700 | [diff] [blame] | 697 | emit_line_0(o, set, NULL, 0, reset, 0, line, len); |
Junio C Hamano | 250f799 | 2009-09-14 18:44:01 -0700 | [diff] [blame] | 698 | } |
| 699 | |
Stefan Beller | 36a4cef | 2017-06-29 17:06:49 -0700 | [diff] [blame] | 700 | enum diff_symbol { |
Stefan Beller | 4eed0eb | 2017-06-29 17:07:01 -0700 | [diff] [blame] | 701 | 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 Beller | 0911c47 | 2017-06-29 17:07:02 -0700 | [diff] [blame] | 706 | 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 Beller | bd03329 | 2017-06-29 17:07:03 -0700 | [diff] [blame] | 710 | DIFF_SYMBOL_WORD_DIFF, |
Stefan Beller | 30b7e1e | 2017-06-29 17:07:04 -0700 | [diff] [blame] | 711 | DIFF_SYMBOL_STAT_SEP, |
Stefan Beller | 146fdb0 | 2017-06-29 17:07:05 -0700 | [diff] [blame] | 712 | DIFF_SYMBOL_SUMMARY, |
Stefan Beller | f359713 | 2017-06-29 17:07:00 -0700 | [diff] [blame] | 713 | 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 Beller | 5af6ea9 | 2017-06-29 17:06:59 -0700 | [diff] [blame] | 720 | DIFF_SYMBOL_REWRITE_DIFF, |
Stefan Beller | 4acaaa7 | 2017-06-29 17:06:58 -0700 | [diff] [blame] | 721 | DIFF_SYMBOL_BINARY_FILES, |
Stefan Beller | a29b0a1 | 2017-06-29 17:06:57 -0700 | [diff] [blame] | 722 | DIFF_SYMBOL_HEADER, |
Stefan Beller | 3ee8b7b | 2017-06-29 17:06:56 -0700 | [diff] [blame] | 723 | DIFF_SYMBOL_FILEPAIR_PLUS, |
| 724 | DIFF_SYMBOL_FILEPAIR_MINUS, |
Stefan Beller | ff95867 | 2017-06-29 17:06:54 -0700 | [diff] [blame] | 725 | DIFF_SYMBOL_WORDS_PORCELAIN, |
| 726 | DIFF_SYMBOL_WORDS, |
Stefan Beller | 091f8e2 | 2017-06-29 17:06:53 -0700 | [diff] [blame] | 727 | DIFF_SYMBOL_CONTEXT, |
Stefan Beller | f2bb121 | 2017-06-29 17:06:55 -0700 | [diff] [blame] | 728 | DIFF_SYMBOL_CONTEXT_INCOMPLETE, |
Stefan Beller | 091f8e2 | 2017-06-29 17:06:53 -0700 | [diff] [blame] | 729 | DIFF_SYMBOL_PLUS, |
| 730 | DIFF_SYMBOL_MINUS, |
Stefan Beller | b9cbfde | 2017-06-29 17:06:52 -0700 | [diff] [blame] | 731 | DIFF_SYMBOL_NO_LF_EOF, |
Stefan Beller | 68abc6f | 2017-06-29 17:06:51 -0700 | [diff] [blame] | 732 | DIFF_SYMBOL_CONTEXT_FRAGINFO, |
Stefan Beller | c64b420 | 2017-06-29 17:06:50 -0700 | [diff] [blame] | 733 | DIFF_SYMBOL_CONTEXT_MARKER, |
Stefan Beller | 36a4cef | 2017-06-29 17:06:49 -0700 | [diff] [blame] | 734 | DIFF_SYMBOL_SEPARATOR |
| 735 | }; |
Stefan Beller | 091f8e2 | 2017-06-29 17:06:53 -0700 | [diff] [blame] | 736 | /* |
| 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 Beller | 2e2d5ac | 2017-06-30 13:53:07 -0700 | [diff] [blame] | 742 | #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 Beller | 86b452e | 2017-06-30 13:53:09 -0700 | [diff] [blame] | 745 | #define DIFF_SYMBOL_MOVED_LINE_UNINTERESTING (1<<19) |
Stefan Beller | 091f8e2 | 2017-06-29 17:06:53 -0700 | [diff] [blame] | 746 | #define DIFF_SYMBOL_CONTENT_WS_MASK (WSEH_NEW | WSEH_OLD | WSEH_CONTEXT | WS_RULE_MASK) |
| 747 | |
Stefan Beller | e6e045f | 2017-06-29 17:07:06 -0700 | [diff] [blame] | 748 | /* |
| 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 | */ |
| 760 | struct emitted_diff_symbol { |
| 761 | const char *line; |
| 762 | int len; |
| 763 | int flags; |
Phillip Wood | 21536d0 | 2018-11-23 11:16:57 +0000 | [diff] [blame] | 764 | int indent_off; /* Offset to first non-whitespace character */ |
| 765 | int indent_width; /* The visual width of the indentation */ |
Stefan Beller | e6e045f | 2017-06-29 17:07:06 -0700 | [diff] [blame] | 766 | enum diff_symbol s; |
| 767 | }; |
| 768 | #define EMITTED_DIFF_SYMBOL_INIT {NULL} |
| 769 | |
| 770 | struct emitted_diff_symbols { |
| 771 | struct emitted_diff_symbol *buf; |
| 772 | int nr, alloc; |
| 773 | }; |
| 774 | #define EMITTED_DIFF_SYMBOLS_INIT {NULL, 0, 0} |
| 775 | |
| 776 | static 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 Beller | 2e2d5ac | 2017-06-30 13:53:07 -0700 | [diff] [blame] | 790 | struct moved_entry { |
| 791 | struct hashmap_entry ent; |
| 792 | const struct emitted_diff_symbol *es; |
| 793 | struct moved_entry *next_line; |
| 794 | }; |
| 795 | |
Phillip Wood | 74d156f | 2018-10-04 11:07:41 +0100 | [diff] [blame] | 796 | struct moved_block { |
| 797 | struct moved_entry *match; |
Phillip Wood | 21536d0 | 2018-11-23 11:16:57 +0000 | [diff] [blame] | 798 | int wsd; /* The whitespace delta of this block */ |
Phillip Wood | 74d156f | 2018-10-04 11:07:41 +0100 | [diff] [blame] | 799 | }; |
| 800 | |
| 801 | static void moved_block_clear(struct moved_block *b) |
| 802 | { |
Phillip Wood | 21536d0 | 2018-11-23 11:16:57 +0000 | [diff] [blame] | 803 | memset(b, 0, sizeof(*b)); |
| 804 | } |
| 805 | |
Phillip Wood | 0cd51e9 | 2018-11-23 11:16:58 +0000 | [diff] [blame] | 806 | #define INDENT_BLANKLINE INT_MIN |
| 807 | |
Phillip Wood | 21536d0 | 2018-11-23 11:16:57 +0000 | [diff] [blame] | 808 | static void fill_es_indent_data(struct emitted_diff_symbol *es) |
| 809 | { |
Phillip Wood | 0cd51e9 | 2018-11-23 11:16:58 +0000 | [diff] [blame] | 810 | unsigned int off = 0, i; |
Phillip Wood | 21536d0 | 2018-11-23 11:16:57 +0000 | [diff] [blame] | 811 | 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 Wood | 0cd51e9 | 2018-11-23 11:16:58 +0000 | [diff] [blame] | 834 | /* 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 Wood | 74d156f | 2018-10-04 11:07:41 +0100 | [diff] [blame] | 846 | } |
| 847 | |
Stefan Beller | ca1f4ae | 2018-07-18 12:31:55 -0700 | [diff] [blame] | 848 | static int compute_ws_delta(const struct emitted_diff_symbol *a, |
Phillip Wood | 21536d0 | 2018-11-23 11:16:57 +0000 | [diff] [blame] | 849 | const struct emitted_diff_symbol *b, |
| 850 | int *out) |
Stefan Beller | ca1f4ae | 2018-07-18 12:31:55 -0700 | [diff] [blame] | 851 | { |
Phillip Wood | 21536d0 | 2018-11-23 11:16:57 +0000 | [diff] [blame] | 852 | 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 Beller | ca1f4ae | 2018-07-18 12:31:55 -0700 | [diff] [blame] | 859 | |
Phillip Wood | 0cd51e9 | 2018-11-23 11:16:58 +0000 | [diff] [blame] | 860 | if (a_width == INDENT_BLANKLINE && b_width == INDENT_BLANKLINE) { |
| 861 | *out = INDENT_BLANKLINE; |
| 862 | return 1; |
| 863 | } |
| 864 | |
Phillip Wood | 21536d0 | 2018-11-23 11:16:57 +0000 | [diff] [blame] | 865 | 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 Wood | fe4516d | 2018-10-04 11:07:43 +0100 | [diff] [blame] | 872 | return 0; |
| 873 | |
Phillip Wood | 21536d0 | 2018-11-23 11:16:57 +0000 | [diff] [blame] | 874 | *out = delta; |
Stefan Beller | ca1f4ae | 2018-07-18 12:31:55 -0700 | [diff] [blame] | 875 | |
Phillip Wood | fe4516d | 2018-10-04 11:07:43 +0100 | [diff] [blame] | 876 | return 1; |
Stefan Beller | ca1f4ae | 2018-07-18 12:31:55 -0700 | [diff] [blame] | 877 | } |
| 878 | |
| 879 | static int cmp_in_block_with_wsd(const struct diff_options *o, |
| 880 | const struct moved_entry *cur, |
| 881 | const struct moved_entry *match, |
Phillip Wood | 74d156f | 2018-10-04 11:07:41 +0100 | [diff] [blame] | 882 | struct moved_block *pmb, |
Stefan Beller | ca1f4ae | 2018-07-18 12:31:55 -0700 | [diff] [blame] | 883 | int n) |
| 884 | { |
| 885 | struct emitted_diff_symbol *l = &o->emitted_symbols->buf[n]; |
Phillip Wood | 7a4252c | 2018-11-23 11:16:56 +0000 | [diff] [blame] | 886 | int al = cur->es->len, bl = match->es->len, cl = l->len; |
Stefan Beller | ca1f4ae | 2018-07-18 12:31:55 -0700 | [diff] [blame] | 887 | const char *a = cur->es->line, |
| 888 | *b = match->es->line, |
| 889 | *c = l->line; |
Phillip Wood | 21536d0 | 2018-11-23 11:16:57 +0000 | [diff] [blame] | 890 | 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 Beller | ca1f4ae | 2018-07-18 12:31:55 -0700 | [diff] [blame] | 895 | |
| 896 | /* |
Phillip Wood | 7a4252c | 2018-11-23 11:16:56 +0000 | [diff] [blame] | 897 | * 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 Beller | ca1f4ae | 2018-07-18 12:31:55 -0700 | [diff] [blame] | 904 | */ |
Phillip Wood | 7a4252c | 2018-11-23 11:16:56 +0000 | [diff] [blame] | 905 | if (al != bl) |
Stefan Beller | ca1f4ae | 2018-07-18 12:31:55 -0700 | [diff] [blame] | 906 | return 1; |
| 907 | |
Phillip Wood | 0cd51e9 | 2018-11-23 11:16:58 +0000 | [diff] [blame] | 908 | /* If 'l' and 'cur' are both blank then they match. */ |
| 909 | if (a_width == INDENT_BLANKLINE && c_width == INDENT_BLANKLINE) |
| 910 | return 0; |
Stefan Beller | ca1f4ae | 2018-07-18 12:31:55 -0700 | [diff] [blame] | 911 | |
| 912 | /* |
Phillip Wood | 21536d0 | 2018-11-23 11:16:57 +0000 | [diff] [blame] | 913 | * 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 Beller | ca1f4ae | 2018-07-18 12:31:55 -0700 | [diff] [blame] | 917 | */ |
Phillip Wood | 21536d0 | 2018-11-23 11:16:57 +0000 | [diff] [blame] | 918 | if (cur->es->s == DIFF_SYMBOL_PLUS) |
| 919 | delta = a_width - c_width; |
| 920 | else |
| 921 | delta = c_width - a_width; |
Stefan Beller | ca1f4ae | 2018-07-18 12:31:55 -0700 | [diff] [blame] | 922 | |
Phillip Wood | 0cd51e9 | 2018-11-23 11:16:58 +0000 | [diff] [blame] | 923 | /* |
| 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 Beller | ca1f4ae | 2018-07-18 12:31:55 -0700 | [diff] [blame] | 929 | |
Phillip Wood | 21536d0 | 2018-11-23 11:16:57 +0000 | [diff] [blame] | 930 | 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 Beller | ca1f4ae | 2018-07-18 12:31:55 -0700 | [diff] [blame] | 933 | } |
| 934 | |
Stefan Beller | ee1df66 | 2018-07-16 16:05:38 -0700 | [diff] [blame] | 935 | static int moved_entry_cmp(const void *hashmap_cmp_fn_data, |
| 936 | const void *entry, |
| 937 | const void *entry_or_key, |
Stefan Beller | 2e2d5ac | 2017-06-30 13:53:07 -0700 | [diff] [blame] | 938 | const void *keydata) |
| 939 | { |
Stefan Beller | ee1df66 | 2018-07-16 16:05:38 -0700 | [diff] [blame] | 940 | 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 Beller | b309571 | 2018-07-16 16:05:40 -0700 | [diff] [blame] | 943 | unsigned flags = diffopt->color_moved_ws_handling |
| 944 | & XDF_WHITESPACE_FLAGS; |
Stefan Beller | ee1df66 | 2018-07-16 16:05:38 -0700 | [diff] [blame] | 945 | |
Stefan Beller | ca1f4ae | 2018-07-18 12:31:55 -0700 | [diff] [blame] | 946 | 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 Beller | 01be97c | 2017-10-25 11:49:12 -0700 | [diff] [blame] | 956 | return !xdiff_compare_lines(a->es->line, a->es->len, |
| 957 | b->es->line, b->es->len, |
Stefan Beller | b309571 | 2018-07-16 16:05:40 -0700 | [diff] [blame] | 958 | flags); |
Stefan Beller | 2e2d5ac | 2017-06-30 13:53:07 -0700 | [diff] [blame] | 959 | } |
| 960 | |
| 961 | static 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 Beller | b309571 | 2018-07-16 16:05:40 -0700 | [diff] [blame] | 966 | unsigned flags = o->color_moved_ws_handling & XDF_WHITESPACE_FLAGS; |
Stefan Beller | 2e2d5ac | 2017-06-30 13:53:07 -0700 | [diff] [blame] | 967 | |
Stefan Beller | b309571 | 2018-07-16 16:05:40 -0700 | [diff] [blame] | 968 | ret->ent.hash = xdiff_hash_string(l->line, l->len, flags); |
Stefan Beller | 2e2d5ac | 2017-06-30 13:53:07 -0700 | [diff] [blame] | 969 | ret->es = l; |
| 970 | ret->next_line = NULL; |
| 971 | |
| 972 | return ret; |
| 973 | } |
| 974 | |
| 975 | static 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 Wood | 21536d0 | 2018-11-23 11:16:57 +0000 | [diff] [blame] | 998 | if (o->color_moved_ws_handling & |
| 999 | COLOR_MOVED_WS_ALLOW_INDENTATION_CHANGE) |
| 1000 | fill_es_indent_data(&o->emitted_symbols->buf[n]); |
Stefan Beller | 2e2d5ac | 2017-06-30 13:53:07 -0700 | [diff] [blame] | 1001 | 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 Beller | e2fe6ab | 2018-07-16 16:05:41 -0700 | [diff] [blame] | 1010 | static void pmb_advance_or_null(struct diff_options *o, |
| 1011 | struct moved_entry *match, |
| 1012 | struct hashmap *hm, |
Phillip Wood | 74d156f | 2018-10-04 11:07:41 +0100 | [diff] [blame] | 1013 | struct moved_block *pmb, |
Stefan Beller | e2fe6ab | 2018-07-16 16:05:41 -0700 | [diff] [blame] | 1014 | int pmb_nr) |
| 1015 | { |
| 1016 | int i; |
| 1017 | for (i = 0; i < pmb_nr; i++) { |
Phillip Wood | 74d156f | 2018-10-04 11:07:41 +0100 | [diff] [blame] | 1018 | struct moved_entry *prev = pmb[i].match; |
Stefan Beller | e2fe6ab | 2018-07-16 16:05:41 -0700 | [diff] [blame] | 1019 | struct moved_entry *cur = (prev && prev->next_line) ? |
| 1020 | prev->next_line : NULL; |
| 1021 | if (cur && !hm->cmpfn(o, cur, match, NULL)) { |
Phillip Wood | 74d156f | 2018-10-04 11:07:41 +0100 | [diff] [blame] | 1022 | pmb[i].match = cur; |
Stefan Beller | e2fe6ab | 2018-07-16 16:05:41 -0700 | [diff] [blame] | 1023 | } else { |
Phillip Wood | 74d156f | 2018-10-04 11:07:41 +0100 | [diff] [blame] | 1024 | pmb[i].match = NULL; |
Stefan Beller | e2fe6ab | 2018-07-16 16:05:41 -0700 | [diff] [blame] | 1025 | } |
| 1026 | } |
| 1027 | } |
| 1028 | |
Stefan Beller | ca1f4ae | 2018-07-18 12:31:55 -0700 | [diff] [blame] | 1029 | static void pmb_advance_or_null_multi_match(struct diff_options *o, |
| 1030 | struct moved_entry *match, |
| 1031 | struct hashmap *hm, |
Phillip Wood | 74d156f | 2018-10-04 11:07:41 +0100 | [diff] [blame] | 1032 | struct moved_block *pmb, |
Stefan Beller | ca1f4ae | 2018-07-18 12:31:55 -0700 | [diff] [blame] | 1033 | 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 Wood | 74d156f | 2018-10-04 11:07:41 +0100 | [diff] [blame] | 1040 | struct moved_entry *prev = pmb[i].match; |
Stefan Beller | ca1f4ae | 2018-07-18 12:31:55 -0700 | [diff] [blame] | 1041 | struct moved_entry *cur = (prev && prev->next_line) ? |
| 1042 | prev->next_line : NULL; |
| 1043 | if (!cur) |
| 1044 | continue; |
Phillip Wood | 74d156f | 2018-10-04 11:07:41 +0100 | [diff] [blame] | 1045 | if (!cmp_in_block_with_wsd(o, cur, match, &pmb[i], n)) |
Stefan Beller | ca1f4ae | 2018-07-18 12:31:55 -0700 | [diff] [blame] | 1046 | got_match[i] |= 1; |
| 1047 | } |
| 1048 | } |
| 1049 | |
| 1050 | for (i = 0; i < pmb_nr; i++) { |
| 1051 | if (got_match[i]) { |
Phillip Wood | 74d156f | 2018-10-04 11:07:41 +0100 | [diff] [blame] | 1052 | /* Advance to the next line */ |
| 1053 | pmb[i].match = pmb[i].match->next_line; |
Phillip Wood | fab01ec | 2018-09-04 14:52:58 +0100 | [diff] [blame] | 1054 | } else { |
Phillip Wood | 74d156f | 2018-10-04 11:07:41 +0100 | [diff] [blame] | 1055 | moved_block_clear(&pmb[i]); |
Phillip Wood | fab01ec | 2018-09-04 14:52:58 +0100 | [diff] [blame] | 1056 | } |
Stefan Beller | ca1f4ae | 2018-07-18 12:31:55 -0700 | [diff] [blame] | 1057 | } |
Phillip Wood | 9c1a6c2 | 2018-10-04 11:07:44 +0100 | [diff] [blame] | 1058 | |
| 1059 | free(got_match); |
Stefan Beller | ca1f4ae | 2018-07-18 12:31:55 -0700 | [diff] [blame] | 1060 | } |
| 1061 | |
Phillip Wood | 74d156f | 2018-10-04 11:07:41 +0100 | [diff] [blame] | 1062 | static int shrink_potential_moved_blocks(struct moved_block *pmb, |
Stefan Beller | 2e2d5ac | 2017-06-30 13:53:07 -0700 | [diff] [blame] | 1063 | 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 Wood | 74d156f | 2018-10-04 11:07:41 +0100 | [diff] [blame] | 1069 | while (lp < pmb_nr && pmb[lp].match) |
Stefan Beller | 2e2d5ac | 2017-06-30 13:53:07 -0700 | [diff] [blame] | 1070 | lp++; |
| 1071 | /* lp points at the first NULL now */ |
| 1072 | |
Phillip Wood | 74d156f | 2018-10-04 11:07:41 +0100 | [diff] [blame] | 1073 | while (rp > -1 && !pmb[rp].match) |
Stefan Beller | 2e2d5ac | 2017-06-30 13:53:07 -0700 | [diff] [blame] | 1074 | 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 Wood | 21536d0 | 2018-11-23 11:16:57 +0000 | [diff] [blame] | 1079 | memset(&pmb[rp], 0, sizeof(pmb[rp])); |
Stefan Beller | 2e2d5ac | 2017-06-30 13:53:07 -0700 | [diff] [blame] | 1080 | rp--; |
| 1081 | lp++; |
| 1082 | } |
| 1083 | } |
| 1084 | |
| 1085 | /* Remember the number of running sets */ |
| 1086 | return rp + 1; |
| 1087 | } |
| 1088 | |
Jonathan Tan | 0915327 | 2017-08-15 18:27:38 -0700 | [diff] [blame] | 1089 | /* |
| 1090 | * If o->color_moved is COLOR_MOVED_PLAIN, this function does nothing. |
| 1091 | * |
Jonathan Tan | f0b8fb6 | 2017-08-15 18:27:39 -0700 | [diff] [blame] | 1092 | * 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 Tan | 0915327 | 2017-08-15 18:27:38 -0700 | [diff] [blame] | 1094 | * 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 Tan | f0b8fb6 | 2017-08-15 18:27:39 -0700 | [diff] [blame] | 1098 | * |
Phillip Wood | b0a2ba4 | 2018-11-23 11:16:55 +0000 | [diff] [blame] | 1099 | * Returns 0 if the last block is empty or is unset by this function, non zero |
| 1100 | * otherwise. |
| 1101 | * |
Jonathan Tan | f0b8fb6 | 2017-08-15 18:27:39 -0700 | [diff] [blame] | 1102 | * NEEDSWORK: This uses the same heuristic as blame_entry_score() in blame.c. |
| 1103 | * Think of a way to unify them. |
Jonathan Tan | 0915327 | 2017-08-15 18:27:38 -0700 | [diff] [blame] | 1104 | */ |
Phillip Wood | b0a2ba4 | 2018-11-23 11:16:55 +0000 | [diff] [blame] | 1105 | static int adjust_last_block(struct diff_options *o, int n, int block_length) |
Jonathan Tan | 0915327 | 2017-08-15 18:27:38 -0700 | [diff] [blame] | 1106 | { |
Jonathan Tan | f0b8fb6 | 2017-08-15 18:27:39 -0700 | [diff] [blame] | 1107 | int i, alnum_count = 0; |
| 1108 | if (o->color_moved == COLOR_MOVED_PLAIN) |
Phillip Wood | b0a2ba4 | 2018-11-23 11:16:55 +0000 | [diff] [blame] | 1109 | return block_length; |
Jonathan Tan | f0b8fb6 | 2017-08-15 18:27:39 -0700 | [diff] [blame] | 1110 | 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 Wood | b0a2ba4 | 2018-11-23 11:16:55 +0000 | [diff] [blame] | 1117 | return 1; |
Jonathan Tan | f0b8fb6 | 2017-08-15 18:27:39 -0700 | [diff] [blame] | 1118 | } |
| 1119 | } |
Jonathan Tan | 0915327 | 2017-08-15 18:27:38 -0700 | [diff] [blame] | 1120 | for (i = 1; i < block_length + 1; i++) |
| 1121 | o->emitted_symbols->buf[n - i].flags &= ~DIFF_SYMBOL_MOVED_LINE; |
Phillip Wood | b0a2ba4 | 2018-11-23 11:16:55 +0000 | [diff] [blame] | 1122 | return 0; |
Jonathan Tan | 0915327 | 2017-08-15 18:27:38 -0700 | [diff] [blame] | 1123 | } |
| 1124 | |
Stefan Beller | 2e2d5ac | 2017-06-30 13:53:07 -0700 | [diff] [blame] | 1125 | /* Find blocks of moved code, delegate actual coloring decision to helper */ |
| 1126 | static void mark_color_as_moved(struct diff_options *o, |
| 1127 | struct hashmap *add_lines, |
| 1128 | struct hashmap *del_lines) |
| 1129 | { |
Phillip Wood | 74d156f | 2018-10-04 11:07:41 +0100 | [diff] [blame] | 1130 | struct moved_block *pmb = NULL; /* potentially moved blocks */ |
Stefan Beller | 2e2d5ac | 2017-06-30 13:53:07 -0700 | [diff] [blame] | 1131 | int pmb_nr = 0, pmb_alloc = 0; |
Phillip Wood | b0a2ba4 | 2018-11-23 11:16:55 +0000 | [diff] [blame] | 1132 | int n, flipped_block = 0, block_length = 0; |
Stefan Beller | 2e2d5ac | 2017-06-30 13:53:07 -0700 | [diff] [blame] | 1133 | |
| 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 Wood | b0a2ba4 | 2018-11-23 11:16:55 +0000 | [diff] [blame] | 1140 | enum diff_symbol last_symbol = 0; |
Stefan Beller | 2e2d5ac | 2017-06-30 13:53:07 -0700 | [diff] [blame] | 1141 | |
| 1142 | switch (l->s) { |
| 1143 | case DIFF_SYMBOL_PLUS: |
| 1144 | hm = del_lines; |
| 1145 | key = prepare_entry(o, n); |
Stefan Beller | 3783aad | 2018-07-16 16:05:37 -0700 | [diff] [blame] | 1146 | match = hashmap_get(hm, key, NULL); |
Stefan Beller | 2e2d5ac | 2017-06-30 13:53:07 -0700 | [diff] [blame] | 1147 | free(key); |
| 1148 | break; |
| 1149 | case DIFF_SYMBOL_MINUS: |
| 1150 | hm = add_lines; |
| 1151 | key = prepare_entry(o, n); |
Stefan Beller | 3783aad | 2018-07-16 16:05:37 -0700 | [diff] [blame] | 1152 | match = hashmap_get(hm, key, NULL); |
Stefan Beller | 2e2d5ac | 2017-06-30 13:53:07 -0700 | [diff] [blame] | 1153 | free(key); |
| 1154 | break; |
| 1155 | default: |
Phillip Wood | b0a2ba4 | 2018-11-23 11:16:55 +0000 | [diff] [blame] | 1156 | flipped_block = 0; |
Stefan Beller | 2e2d5ac | 2017-06-30 13:53:07 -0700 | [diff] [blame] | 1157 | } |
| 1158 | |
| 1159 | if (!match) { |
Phillip Wood | 74d156f | 2018-10-04 11:07:41 +0100 | [diff] [blame] | 1160 | int i; |
| 1161 | |
Jonathan Tan | 0915327 | 2017-08-15 18:27:38 -0700 | [diff] [blame] | 1162 | adjust_last_block(o, n, block_length); |
Phillip Wood | 74d156f | 2018-10-04 11:07:41 +0100 | [diff] [blame] | 1163 | for(i = 0; i < pmb_nr; i++) |
| 1164 | moved_block_clear(&pmb[i]); |
Stefan Beller | 2e2d5ac | 2017-06-30 13:53:07 -0700 | [diff] [blame] | 1165 | pmb_nr = 0; |
| 1166 | block_length = 0; |
Phillip Wood | b0a2ba4 | 2018-11-23 11:16:55 +0000 | [diff] [blame] | 1167 | flipped_block = 0; |
| 1168 | last_symbol = l->s; |
Stefan Beller | 2e2d5ac | 2017-06-30 13:53:07 -0700 | [diff] [blame] | 1169 | continue; |
| 1170 | } |
| 1171 | |
Phillip Wood | 2034b47 | 2018-11-23 11:16:54 +0000 | [diff] [blame] | 1172 | if (o->color_moved == COLOR_MOVED_PLAIN) { |
Phillip Wood | b0a2ba4 | 2018-11-23 11:16:55 +0000 | [diff] [blame] | 1173 | last_symbol = l->s; |
Phillip Wood | 2034b47 | 2018-11-23 11:16:54 +0000 | [diff] [blame] | 1174 | l->flags |= DIFF_SYMBOL_MOVED_LINE; |
Stefan Beller | 176841f | 2017-06-30 13:53:08 -0700 | [diff] [blame] | 1175 | continue; |
Phillip Wood | 2034b47 | 2018-11-23 11:16:54 +0000 | [diff] [blame] | 1176 | } |
Stefan Beller | 176841f | 2017-06-30 13:53:08 -0700 | [diff] [blame] | 1177 | |
Stefan Beller | ca1f4ae | 2018-07-18 12:31:55 -0700 | [diff] [blame] | 1178 | 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 Beller | 2e2d5ac | 2017-06-30 13:53:07 -0700 | [diff] [blame] | 1183 | |
| 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 Beller | ca1f4ae | 2018-07-18 12:31:55 -0700 | [diff] [blame] | 1193 | if (o->color_moved_ws_handling & |
| 1194 | COLOR_MOVED_WS_ALLOW_INDENTATION_CHANGE) { |
Phillip Wood | 74d156f | 2018-10-04 11:07:41 +0100 | [diff] [blame] | 1195 | if (compute_ws_delta(l, match->es, |
| 1196 | &pmb[pmb_nr].wsd)) |
| 1197 | pmb[pmb_nr++].match = match; |
Stefan Beller | ca1f4ae | 2018-07-18 12:31:55 -0700 | [diff] [blame] | 1198 | } else { |
Phillip Wood | 21536d0 | 2018-11-23 11:16:57 +0000 | [diff] [blame] | 1199 | pmb[pmb_nr].wsd = 0; |
Phillip Wood | 74d156f | 2018-10-04 11:07:41 +0100 | [diff] [blame] | 1200 | pmb[pmb_nr++].match = match; |
Stefan Beller | ca1f4ae | 2018-07-18 12:31:55 -0700 | [diff] [blame] | 1201 | } |
Stefan Beller | 2e2d5ac | 2017-06-30 13:53:07 -0700 | [diff] [blame] | 1202 | } |
| 1203 | |
Phillip Wood | b0a2ba4 | 2018-11-23 11:16:55 +0000 | [diff] [blame] | 1204 | 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 Tan | f0b8fb6 | 2017-08-15 18:27:39 -0700 | [diff] [blame] | 1209 | |
Jonathan Tan | f0b8fb6 | 2017-08-15 18:27:39 -0700 | [diff] [blame] | 1210 | block_length = 0; |
Stefan Beller | 2e2d5ac | 2017-06-30 13:53:07 -0700 | [diff] [blame] | 1211 | } |
| 1212 | |
Phillip Wood | 2034b47 | 2018-11-23 11:16:54 +0000 | [diff] [blame] | 1213 | if (pmb_nr) { |
| 1214 | block_length++; |
Phillip Wood | 2034b47 | 2018-11-23 11:16:54 +0000 | [diff] [blame] | 1215 | 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 Wood | b0a2ba4 | 2018-11-23 11:16:55 +0000 | [diff] [blame] | 1219 | last_symbol = l->s; |
Stefan Beller | 2e2d5ac | 2017-06-30 13:53:07 -0700 | [diff] [blame] | 1220 | } |
Jonathan Tan | 0915327 | 2017-08-15 18:27:38 -0700 | [diff] [blame] | 1221 | adjust_last_block(o, n, block_length); |
Stefan Beller | 2e2d5ac | 2017-06-30 13:53:07 -0700 | [diff] [blame] | 1222 | |
Phillip Wood | 74d156f | 2018-10-04 11:07:41 +0100 | [diff] [blame] | 1223 | for(n = 0; n < pmb_nr; n++) |
| 1224 | moved_block_clear(&pmb[n]); |
Stefan Beller | 2e2d5ac | 2017-06-30 13:53:07 -0700 | [diff] [blame] | 1225 | free(pmb); |
| 1226 | } |
Stefan Beller | e6e045f | 2017-06-29 17:07:06 -0700 | [diff] [blame] | 1227 | |
Stefan Beller | 86b452e | 2017-06-30 13:53:09 -0700 | [diff] [blame] | 1228 | #define DIFF_SYMBOL_MOVED_LINE_ZEBRA_MASK \ |
| 1229 | (DIFF_SYMBOL_MOVED_LINE | DIFF_SYMBOL_MOVED_LINE_ALT) |
| 1230 | static 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 Beller | 091f8e2 | 2017-06-29 17:06:53 -0700 | [diff] [blame] | 1289 | static void emit_line_ws_markup(struct diff_options *o, |
Stefan Beller | 9d1e16b | 2018-08-13 18:41:18 -0700 | [diff] [blame] | 1290 | const char *set_sign, const char *set, |
| 1291 | const char *reset, |
Stefan Beller | bc9feb0 | 2018-10-10 16:24:59 -0700 | [diff] [blame] | 1292 | int sign_index, const char *line, int len, |
Stefan Beller | 091f8e2 | 2017-06-29 17:06:53 -0700 | [diff] [blame] | 1293 | unsigned ws_rule, int blank_at_eof) |
| 1294 | { |
| 1295 | const char *ws = NULL; |
Stefan Beller | bc9feb0 | 2018-10-10 16:24:59 -0700 | [diff] [blame] | 1296 | int sign = o->output_indicators[sign_index]; |
Stefan Beller | 091f8e2 | 2017-06-29 17:06:53 -0700 | [diff] [blame] | 1297 | |
| 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 Schindelin | f7c3b4e | 2018-08-13 04:33:20 -0700 | [diff] [blame] | 1304 | if (!ws && !set_sign) |
Stefan Beller | 017ac45 | 2018-08-13 18:41:19 -0700 | [diff] [blame] | 1305 | emit_line_0(o, set, NULL, 0, reset, sign, line, len); |
Johannes Schindelin | f7c3b4e | 2018-08-13 04:33:20 -0700 | [diff] [blame] | 1306 | else if (!ws) { |
Stefan Beller | 29ef759 | 2018-08-13 18:41:20 -0700 | [diff] [blame] | 1307 | emit_line_0(o, set_sign, set, !!set_sign, reset, sign, line, len); |
Johannes Schindelin | f7c3b4e | 2018-08-13 04:33:20 -0700 | [diff] [blame] | 1308 | } else if (blank_at_eof) |
Stefan Beller | 091f8e2 | 2017-06-29 17:06:53 -0700 | [diff] [blame] | 1309 | /* Blank line at EOF - paint '+' as well */ |
Stefan Beller | 017ac45 | 2018-08-13 18:41:19 -0700 | [diff] [blame] | 1310 | emit_line_0(o, ws, NULL, 0, reset, sign, line, len); |
Stefan Beller | 091f8e2 | 2017-06-29 17:06:53 -0700 | [diff] [blame] | 1311 | else { |
| 1312 | /* Emit just the prefix, then the rest. */ |
Stefan Beller | 017ac45 | 2018-08-13 18:41:19 -0700 | [diff] [blame] | 1313 | emit_line_0(o, set_sign ? set_sign : set, NULL, !!set_sign, reset, |
Johannes Schindelin | f7c3b4e | 2018-08-13 04:33:20 -0700 | [diff] [blame] | 1314 | sign, "", 0); |
Stefan Beller | 091f8e2 | 2017-06-29 17:06:53 -0700 | [diff] [blame] | 1315 | ws_check_emit(line, len, ws_rule, |
| 1316 | o->file, set, reset, ws); |
| 1317 | } |
| 1318 | } |
Stefan Beller | 36a4cef | 2017-06-29 17:06:49 -0700 | [diff] [blame] | 1319 | |
Stefan Beller | e6e045f | 2017-06-29 17:07:06 -0700 | [diff] [blame] | 1320 | static void emit_diff_symbol_from_struct(struct diff_options *o, |
| 1321 | struct emitted_diff_symbol *eds) |
Stefan Beller | 36a4cef | 2017-06-29 17:06:49 -0700 | [diff] [blame] | 1322 | { |
Stefan Beller | b9cbfde | 2017-06-29 17:06:52 -0700 | [diff] [blame] | 1323 | static const char *nneof = " No newline at end of file\n"; |
Johannes Schindelin | f7c3b4e | 2018-08-13 04:33:20 -0700 | [diff] [blame] | 1324 | const char *context, *reset, *set, *set_sign, *meta, *fraginfo; |
Stefan Beller | 0911c47 | 2017-06-29 17:07:02 -0700 | [diff] [blame] | 1325 | struct strbuf sb = STRBUF_INIT; |
Stefan Beller | e6e045f | 2017-06-29 17:07:06 -0700 | [diff] [blame] | 1326 | |
| 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 Beller | 36a4cef | 2017-06-29 17:06:49 -0700 | [diff] [blame] | 1332 | switch (s) { |
Stefan Beller | b9cbfde | 2017-06-29 17:06:52 -0700 | [diff] [blame] | 1333 | 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 Beller | 017ac45 | 2018-08-13 18:41:19 -0700 | [diff] [blame] | 1337 | emit_line_0(o, context, NULL, 0, reset, '\\', |
Stefan Beller | b9cbfde | 2017-06-29 17:06:52 -0700 | [diff] [blame] | 1338 | nneof, strlen(nneof)); |
| 1339 | break; |
Stefan Beller | f359713 | 2017-06-29 17:07:00 -0700 | [diff] [blame] | 1340 | case DIFF_SYMBOL_SUBMODULE_HEADER: |
| 1341 | case DIFF_SYMBOL_SUBMODULE_ERROR: |
| 1342 | case DIFF_SYMBOL_SUBMODULE_PIPETHROUGH: |
Stefan Beller | 0911c47 | 2017-06-29 17:07:02 -0700 | [diff] [blame] | 1343 | case DIFF_SYMBOL_STATS_SUMMARY_INSERTS_DELETES: |
Stefan Beller | 146fdb0 | 2017-06-29 17:07:05 -0700 | [diff] [blame] | 1344 | case DIFF_SYMBOL_SUMMARY: |
Stefan Beller | 0911c47 | 2017-06-29 17:07:02 -0700 | [diff] [blame] | 1345 | case DIFF_SYMBOL_STATS_LINE: |
Stefan Beller | 4eed0eb | 2017-06-29 17:07:01 -0700 | [diff] [blame] | 1346 | case DIFF_SYMBOL_BINARY_DIFF_BODY: |
Stefan Beller | 68abc6f | 2017-06-29 17:06:51 -0700 | [diff] [blame] | 1347 | case DIFF_SYMBOL_CONTEXT_FRAGINFO: |
| 1348 | emit_line(o, "", "", line, len); |
| 1349 | break; |
Stefan Beller | f2bb121 | 2017-06-29 17:06:55 -0700 | [diff] [blame] | 1350 | case DIFF_SYMBOL_CONTEXT_INCOMPLETE: |
Stefan Beller | c64b420 | 2017-06-29 17:06:50 -0700 | [diff] [blame] | 1351 | 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 Beller | 36a4cef | 2017-06-29 17:06:49 -0700 | [diff] [blame] | 1356 | case DIFF_SYMBOL_SEPARATOR: |
| 1357 | fprintf(o->file, "%s%c", |
| 1358 | diff_line_prefix(o), |
| 1359 | o->line_termination); |
| 1360 | break; |
Stefan Beller | 091f8e2 | 2017-06-29 17:06:53 -0700 | [diff] [blame] | 1361 | case DIFF_SYMBOL_CONTEXT: |
| 1362 | set = diff_get_color_opt(o, DIFF_CONTEXT); |
| 1363 | reset = diff_get_color_opt(o, DIFF_RESET); |
Johannes Schindelin | f7c3b4e | 2018-08-13 04:33:20 -0700 | [diff] [blame] | 1364 | 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 Beller | 7648b79 | 2018-08-17 13:43:52 -0700 | [diff] [blame] | 1375 | emit_line_ws_markup(o, set_sign, set, reset, |
Stefan Beller | bc9feb0 | 2018-10-10 16:24:59 -0700 | [diff] [blame] | 1376 | OUTPUT_INDICATOR_CONTEXT, line, len, |
Stefan Beller | 091f8e2 | 2017-06-29 17:06:53 -0700 | [diff] [blame] | 1377 | flags & (DIFF_SYMBOL_CONTENT_WS_MASK), 0); |
| 1378 | break; |
| 1379 | case DIFF_SYMBOL_PLUS: |
Stefan Beller | 86b452e | 2017-06-30 13:53:09 -0700 | [diff] [blame] | 1380 | 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 Beller | 2e2d5ac | 2017-06-30 13:53:07 -0700 | [diff] [blame] | 1390 | set = diff_get_color_opt(o, DIFF_FILE_NEW_MOVED_ALT); |
Stefan Beller | 86b452e | 2017-06-30 13:53:09 -0700 | [diff] [blame] | 1391 | 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 Beller | 2e2d5ac | 2017-06-30 13:53:07 -0700 | [diff] [blame] | 1397 | set = diff_get_color_opt(o, DIFF_FILE_NEW_MOVED); |
Stefan Beller | 86b452e | 2017-06-30 13:53:09 -0700 | [diff] [blame] | 1398 | break; |
| 1399 | default: |
Stefan Beller | 2e2d5ac | 2017-06-30 13:53:07 -0700 | [diff] [blame] | 1400 | set = diff_get_color_opt(o, DIFF_FILE_NEW); |
Stefan Beller | 86b452e | 2017-06-30 13:53:09 -0700 | [diff] [blame] | 1401 | } |
Stefan Beller | 091f8e2 | 2017-06-29 17:06:53 -0700 | [diff] [blame] | 1402 | reset = diff_get_color_opt(o, DIFF_RESET); |
Johannes Schindelin | f7c3b4e | 2018-08-13 04:33:20 -0700 | [diff] [blame] | 1403 | 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 Schindelin | a7be92a | 2018-08-13 04:33:32 -0700 | [diff] [blame] | 1410 | set = diff_get_color_opt(o, DIFF_FILE_OLD_BOLD); |
Johannes Schindelin | f7c3b4e | 2018-08-13 04:33:20 -0700 | [diff] [blame] | 1411 | else if (c == '@') |
| 1412 | set = diff_get_color_opt(o, DIFF_FRAGINFO); |
Johannes Schindelin | a7be92a | 2018-08-13 04:33:32 -0700 | [diff] [blame] | 1413 | 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 Schindelin | 0b91faa | 2018-08-13 04:33:24 -0700 | [diff] [blame] | 1417 | flags &= ~DIFF_SYMBOL_CONTENT_WS_MASK; |
Johannes Schindelin | f7c3b4e | 2018-08-13 04:33:20 -0700 | [diff] [blame] | 1418 | } |
Stefan Beller | 7648b79 | 2018-08-17 13:43:52 -0700 | [diff] [blame] | 1419 | emit_line_ws_markup(o, set_sign, set, reset, |
Stefan Beller | bc9feb0 | 2018-10-10 16:24:59 -0700 | [diff] [blame] | 1420 | OUTPUT_INDICATOR_NEW, line, len, |
Stefan Beller | 091f8e2 | 2017-06-29 17:06:53 -0700 | [diff] [blame] | 1421 | flags & DIFF_SYMBOL_CONTENT_WS_MASK, |
| 1422 | flags & DIFF_SYMBOL_CONTENT_BLANK_LINE_EOF); |
| 1423 | break; |
| 1424 | case DIFF_SYMBOL_MINUS: |
Stefan Beller | 86b452e | 2017-06-30 13:53:09 -0700 | [diff] [blame] | 1425 | 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 Beller | 2e2d5ac | 2017-06-30 13:53:07 -0700 | [diff] [blame] | 1435 | set = diff_get_color_opt(o, DIFF_FILE_OLD_MOVED_ALT); |
Stefan Beller | 86b452e | 2017-06-30 13:53:09 -0700 | [diff] [blame] | 1436 | 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 Beller | 2e2d5ac | 2017-06-30 13:53:07 -0700 | [diff] [blame] | 1442 | set = diff_get_color_opt(o, DIFF_FILE_OLD_MOVED); |
Stefan Beller | 86b452e | 2017-06-30 13:53:09 -0700 | [diff] [blame] | 1443 | break; |
| 1444 | default: |
Stefan Beller | 2e2d5ac | 2017-06-30 13:53:07 -0700 | [diff] [blame] | 1445 | set = diff_get_color_opt(o, DIFF_FILE_OLD); |
Stefan Beller | 86b452e | 2017-06-30 13:53:09 -0700 | [diff] [blame] | 1446 | } |
Stefan Beller | 091f8e2 | 2017-06-29 17:06:53 -0700 | [diff] [blame] | 1447 | reset = diff_get_color_opt(o, DIFF_RESET); |
Johannes Schindelin | f7c3b4e | 2018-08-13 04:33:20 -0700 | [diff] [blame] | 1448 | 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 Schindelin | a7be92a | 2018-08-13 04:33:32 -0700 | [diff] [blame] | 1455 | set = diff_get_color_opt(o, DIFF_FILE_NEW_DIM); |
Johannes Schindelin | f7c3b4e | 2018-08-13 04:33:20 -0700 | [diff] [blame] | 1456 | else if (c == '@') |
| 1457 | set = diff_get_color_opt(o, DIFF_FRAGINFO); |
Johannes Schindelin | a7be92a | 2018-08-13 04:33:32 -0700 | [diff] [blame] | 1458 | 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 Schindelin | f7c3b4e | 2018-08-13 04:33:20 -0700 | [diff] [blame] | 1462 | } |
Stefan Beller | 7648b79 | 2018-08-17 13:43:52 -0700 | [diff] [blame] | 1463 | emit_line_ws_markup(o, set_sign, set, reset, |
Stefan Beller | bc9feb0 | 2018-10-10 16:24:59 -0700 | [diff] [blame] | 1464 | OUTPUT_INDICATOR_OLD, line, len, |
Stefan Beller | 091f8e2 | 2017-06-29 17:06:53 -0700 | [diff] [blame] | 1465 | flags & DIFF_SYMBOL_CONTENT_WS_MASK, 0); |
| 1466 | break; |
Stefan Beller | ff95867 | 2017-06-29 17:06:54 -0700 | [diff] [blame] | 1467 | 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 Beller | 3ee8b7b | 2017-06-29 17:06:56 -0700 | [diff] [blame] | 1487 | 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 Beller | 4acaaa7 | 2017-06-29 17:06:58 -0700 | [diff] [blame] | 1501 | case DIFF_SYMBOL_BINARY_FILES: |
Stefan Beller | a29b0a1 | 2017-06-29 17:06:57 -0700 | [diff] [blame] | 1502 | case DIFF_SYMBOL_HEADER: |
| 1503 | fprintf(o->file, "%s", line); |
| 1504 | break; |
Stefan Beller | 4eed0eb | 2017-06-29 17:07:01 -0700 | [diff] [blame] | 1505 | 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 Beller | 5af6ea9 | 2017-06-29 17:06:59 -0700 | [diff] [blame] | 1518 | 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 Beller | f359713 | 2017-06-29 17:07:00 -0700 | [diff] [blame] | 1523 | 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 Beller | 0911c47 | 2017-06-29 17:07:02 -0700 | [diff] [blame] | 1541 | 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 Beller | bd03329 | 2017-06-29 17:07:03 -0700 | [diff] [blame] | 1548 | case DIFF_SYMBOL_WORD_DIFF: |
| 1549 | fprintf(o->file, "%.*s", len, line); |
| 1550 | break; |
Stefan Beller | 30b7e1e | 2017-06-29 17:07:04 -0700 | [diff] [blame] | 1551 | case DIFF_SYMBOL_STAT_SEP: |
| 1552 | fputs(o->stat_sep, o->file); |
| 1553 | break; |
Stefan Beller | 36a4cef | 2017-06-29 17:06:49 -0700 | [diff] [blame] | 1554 | default: |
Johannes Schindelin | 033abf9 | 2018-05-02 11:38:39 +0200 | [diff] [blame] | 1555 | BUG("unknown diff symbol"); |
Stefan Beller | 36a4cef | 2017-06-29 17:06:49 -0700 | [diff] [blame] | 1556 | } |
Stefan Beller | 0911c47 | 2017-06-29 17:07:02 -0700 | [diff] [blame] | 1557 | strbuf_release(&sb); |
Stefan Beller | 36a4cef | 2017-06-29 17:06:49 -0700 | [diff] [blame] | 1558 | } |
| 1559 | |
Stefan Beller | e6e045f | 2017-06-29 17:07:06 -0700 | [diff] [blame] | 1560 | static void emit_diff_symbol(struct diff_options *o, enum diff_symbol s, |
| 1561 | const char *line, int len, unsigned flags) |
| 1562 | { |
Phillip Wood | 21536d0 | 2018-11-23 11:16:57 +0000 | [diff] [blame] | 1563 | struct emitted_diff_symbol e = {line, len, flags, 0, 0, s}; |
Stefan Beller | e6e045f | 2017-06-29 17:07:06 -0700 | [diff] [blame] | 1564 | |
| 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 Beller | f359713 | 2017-06-29 17:07:00 -0700 | [diff] [blame] | 1571 | void 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 | |
| 1576 | void 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 | |
| 1581 | void 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 | |
| 1587 | void 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 | |
| 1593 | void 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 | |
| 1599 | void 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 | |
| 1604 | void 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 Hamano | 6957eb9 | 2009-09-14 18:44:01 -0700 | [diff] [blame] | 1610 | static 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 Hamano | 018cff7 | 2009-09-14 18:44:01 -0700 | [diff] [blame] | 1618 | return ws_blank_line(line, len, ecbdata->ws_rule); |
Junio C Hamano | 6957eb9 | 2009-09-14 18:44:01 -0700 | [diff] [blame] | 1619 | } |
| 1620 | |
Jeff King | e04df61 | 2019-02-14 00:48:13 -0500 | [diff] [blame] | 1621 | static void emit_add_line(struct emit_callback *ecbdata, |
Junio C Hamano | 018cff7 | 2009-09-14 18:44:01 -0700 | [diff] [blame] | 1622 | const char *line, int len) |
Junio C Hamano | 6957eb9 | 2009-09-14 18:44:01 -0700 | [diff] [blame] | 1623 | { |
Stefan Beller | 091f8e2 | 2017-06-29 17:06:53 -0700 | [diff] [blame] | 1624 | 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 Hamano | 6957eb9 | 2009-09-14 18:44:01 -0700 | [diff] [blame] | 1629 | } |
Junio C Hamano | 6957eb9 | 2009-09-14 18:44:01 -0700 | [diff] [blame] | 1630 | |
Jeff King | e04df61 | 2019-02-14 00:48:13 -0500 | [diff] [blame] | 1631 | static void emit_del_line(struct emit_callback *ecbdata, |
Junio C Hamano | 0e383e1 | 2015-05-26 09:56:33 -0700 | [diff] [blame] | 1632 | const char *line, int len) |
| 1633 | { |
Stefan Beller | 091f8e2 | 2017-06-29 17:06:53 -0700 | [diff] [blame] | 1634 | unsigned flags = WSEH_OLD | ecbdata->ws_rule; |
| 1635 | emit_diff_symbol(ecbdata->opt, DIFF_SYMBOL_MINUS, line, len, flags); |
Junio C Hamano | 0e383e1 | 2015-05-26 09:56:33 -0700 | [diff] [blame] | 1636 | } |
| 1637 | |
Jeff King | e04df61 | 2019-02-14 00:48:13 -0500 | [diff] [blame] | 1638 | static void emit_context_line(struct emit_callback *ecbdata, |
Junio C Hamano | 0e383e1 | 2015-05-26 09:56:33 -0700 | [diff] [blame] | 1639 | const char *line, int len) |
| 1640 | { |
Stefan Beller | 091f8e2 | 2017-06-29 17:06:53 -0700 | [diff] [blame] | 1641 | unsigned flags = WSEH_CONTEXT | ecbdata->ws_rule; |
| 1642 | emit_diff_symbol(ecbdata->opt, DIFF_SYMBOL_CONTEXT, line, len, flags); |
Junio C Hamano | 6957eb9 | 2009-09-14 18:44:01 -0700 | [diff] [blame] | 1643 | } |
| 1644 | |
Bert Wesarg | 89cb73a | 2009-11-27 07:55:18 +0100 | [diff] [blame] | 1645 | static void emit_hunk_header(struct emit_callback *ecbdata, |
| 1646 | const char *line, int len) |
| 1647 | { |
Jeff King | 8dbf3eb | 2015-05-27 16:48:46 -0400 | [diff] [blame] | 1648 | const char *context = diff_get_color(ecbdata->color_diff, DIFF_CONTEXT); |
Bert Wesarg | 89cb73a | 2009-11-27 07:55:18 +0100 | [diff] [blame] | 1649 | 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 Schindelin | f7c3b4e | 2018-08-13 04:33:20 -0700 | [diff] [blame] | 1652 | const char *reverse = ecbdata->color_diff ? GIT_COLOR_REVERSE : ""; |
Bert Wesarg | 89cb73a | 2009-11-27 07:55:18 +0100 | [diff] [blame] | 1653 | static const char atat[2] = { '@', '@' }; |
| 1654 | const char *cp, *ep; |
Bo Yang | 2efcc97 | 2010-05-29 23:32:05 +0800 | [diff] [blame] | 1655 | struct strbuf msgbuf = STRBUF_INIT; |
| 1656 | int org_len = len; |
| 1657 | int i = 1; |
Bert Wesarg | 89cb73a | 2009-11-27 07:55:18 +0100 | [diff] [blame] | 1658 | |
| 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 Beller | c64b420 | 2017-06-29 17:06:50 -0700 | [diff] [blame] | 1666 | emit_diff_symbol(ecbdata->opt, |
Stefan Beller | 091f8e2 | 2017-06-29 17:06:53 -0700 | [diff] [blame] | 1667 | DIFF_SYMBOL_CONTEXT_MARKER, line, len, 0); |
Bert Wesarg | 89cb73a | 2009-11-27 07:55:18 +0100 | [diff] [blame] | 1668 | return; |
| 1669 | } |
| 1670 | ep += 2; /* skip over @@ */ |
| 1671 | |
| 1672 | /* The hunk header in fraginfo color */ |
Johannes Schindelin | f7c3b4e | 2018-08-13 04:33:20 -0700 | [diff] [blame] | 1673 | if (ecbdata->opt->flags.dual_color_diffed_diffs) |
| 1674 | strbuf_addstr(&msgbuf, reverse); |
René Scharfe | cedc61a | 2014-07-17 01:38:18 +0200 | [diff] [blame] | 1675 | strbuf_addstr(&msgbuf, frag); |
Bo Yang | 2efcc97 | 2010-05-29 23:32:05 +0800 | [diff] [blame] | 1676 | strbuf_add(&msgbuf, line, ep - line); |
René Scharfe | cedc61a | 2014-07-17 01:38:18 +0200 | [diff] [blame] | 1677 | strbuf_addstr(&msgbuf, reset); |
Bo Yang | 2efcc97 | 2010-05-29 23:32:05 +0800 | [diff] [blame] | 1678 | |
| 1679 | /* |
| 1680 | * trailing "\r\n" |
| 1681 | */ |
| 1682 | for ( ; i < 3; i++) |
| 1683 | if (line[len - i] == '\r' || line[len - i] == '\n') |
| 1684 | len--; |
Bert Wesarg | 89cb73a | 2009-11-27 07:55:18 +0100 | [diff] [blame] | 1685 | |
| 1686 | /* blank before the func header */ |
| 1687 | for (cp = ep; ep - line < len; ep++) |
| 1688 | if (*ep != ' ' && *ep != '\t') |
| 1689 | break; |
Bo Yang | 2efcc97 | 2010-05-29 23:32:05 +0800 | [diff] [blame] | 1690 | if (ep != cp) { |
Jeff King | 8dbf3eb | 2015-05-27 16:48:46 -0400 | [diff] [blame] | 1691 | strbuf_addstr(&msgbuf, context); |
Bo Yang | 2efcc97 | 2010-05-29 23:32:05 +0800 | [diff] [blame] | 1692 | strbuf_add(&msgbuf, cp, ep - cp); |
René Scharfe | cedc61a | 2014-07-17 01:38:18 +0200 | [diff] [blame] | 1693 | strbuf_addstr(&msgbuf, reset); |
Bo Yang | 2efcc97 | 2010-05-29 23:32:05 +0800 | [diff] [blame] | 1694 | } |
Bert Wesarg | 89cb73a | 2009-11-27 07:55:18 +0100 | [diff] [blame] | 1695 | |
Bo Yang | 2efcc97 | 2010-05-29 23:32:05 +0800 | [diff] [blame] | 1696 | if (ep < line + len) { |
René Scharfe | cedc61a | 2014-07-17 01:38:18 +0200 | [diff] [blame] | 1697 | strbuf_addstr(&msgbuf, func); |
Bo Yang | 2efcc97 | 2010-05-29 23:32:05 +0800 | [diff] [blame] | 1698 | strbuf_add(&msgbuf, ep, line + len - ep); |
René Scharfe | cedc61a | 2014-07-17 01:38:18 +0200 | [diff] [blame] | 1699 | strbuf_addstr(&msgbuf, reset); |
Bo Yang | 2efcc97 | 2010-05-29 23:32:05 +0800 | [diff] [blame] | 1700 | } |
| 1701 | |
| 1702 | strbuf_add(&msgbuf, line + len, org_len - len); |
Stefan Beller | dfb7728 | 2017-06-29 17:06:47 -0700 | [diff] [blame] | 1703 | strbuf_complete_line(&msgbuf); |
Stefan Beller | 68abc6f | 2017-06-29 17:06:51 -0700 | [diff] [blame] | 1704 | emit_diff_symbol(ecbdata->opt, |
Stefan Beller | 091f8e2 | 2017-06-29 17:06:53 -0700 | [diff] [blame] | 1705 | DIFF_SYMBOL_CONTEXT_FRAGINFO, msgbuf.buf, msgbuf.len, 0); |
Bo Yang | 2efcc97 | 2010-05-29 23:32:05 +0800 | [diff] [blame] | 1706 | strbuf_release(&msgbuf); |
Bert Wesarg | 89cb73a | 2009-11-27 07:55:18 +0100 | [diff] [blame] | 1707 | } |
| 1708 | |
Nguyễn Thái Ngọc Duy | 3b33576 | 2018-12-09 11:25:21 +0100 | [diff] [blame] | 1709 | static struct diff_tempfile *claim_diff_tempfile(void) |
| 1710 | { |
Jeff King | 479b0ae | 2009-01-22 00:59:56 -0500 | [diff] [blame] | 1711 | int i; |
| 1712 | for (i = 0; i < ARRAY_SIZE(diff_temp); i++) |
| 1713 | if (!diff_temp[i].name) |
| 1714 | return diff_temp + i; |
Johannes Schindelin | 033abf9 | 2018-05-02 11:38:39 +0200 | [diff] [blame] | 1715 | BUG("diff is failing to clean up its tempfiles"); |
Jeff King | 479b0ae | 2009-01-22 00:59:56 -0500 | [diff] [blame] | 1716 | } |
| 1717 | |
Jeff King | 479b0ae | 2009-01-22 00:59:56 -0500 | [diff] [blame] | 1718 | static void remove_tempfile(void) |
| 1719 | { |
| 1720 | int i; |
Nazri Ramliy | a8344ab | 2009-02-12 21:36:14 +0800 | [diff] [blame] | 1721 | for (i = 0; i < ARRAY_SIZE(diff_temp); i++) { |
Jeff King | 076aa2c | 2017-09-05 08:15:08 -0400 | [diff] [blame] | 1722 | if (is_tempfile_active(diff_temp[i].tempfile)) |
Michael Haggerty | 284098f | 2015-08-12 19:12:01 +0200 | [diff] [blame] | 1723 | delete_tempfile(&diff_temp[i].tempfile); |
Nazri Ramliy | a8344ab | 2009-02-12 21:36:14 +0800 | [diff] [blame] | 1724 | diff_temp[i].name = NULL; |
| 1725 | } |
Jeff King | 479b0ae | 2009-01-22 00:59:56 -0500 | [diff] [blame] | 1726 | } |
| 1727 | |
Stefan Beller | 5af6ea9 | 2017-06-29 17:06:59 -0700 | [diff] [blame] | 1728 | static void add_line_count(struct strbuf *out, int count) |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 1729 | { |
| 1730 | switch (count) { |
| 1731 | case 0: |
Stefan Beller | 5af6ea9 | 2017-06-29 17:06:59 -0700 | [diff] [blame] | 1732 | strbuf_addstr(out, "0,0"); |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 1733 | break; |
| 1734 | case 1: |
Stefan Beller | 5af6ea9 | 2017-06-29 17:06:59 -0700 | [diff] [blame] | 1735 | strbuf_addstr(out, "1"); |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 1736 | break; |
| 1737 | default: |
Stefan Beller | 5af6ea9 | 2017-06-29 17:06:59 -0700 | [diff] [blame] | 1738 | strbuf_addf(out, "1,%d", count); |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 1739 | break; |
| 1740 | } |
| 1741 | } |
| 1742 | |
Junio C Hamano | 7f7ee2f | 2009-09-14 18:44:01 -0700 | [diff] [blame] | 1743 | static void emit_rewrite_lines(struct emit_callback *ecb, |
| 1744 | int prefix, const char *data, int size) |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 1745 | { |
Junio C Hamano | 7f7ee2f | 2009-09-14 18:44:01 -0700 | [diff] [blame] | 1746 | const char *endp = NULL; |
Junio C Hamano | 7f7ee2f | 2009-09-14 18:44:01 -0700 | [diff] [blame] | 1747 | |
| 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 King | e04df61 | 2019-02-14 00:48:13 -0500 | [diff] [blame] | 1755 | emit_del_line(ecb, data, len); |
Junio C Hamano | 7f7ee2f | 2009-09-14 18:44:01 -0700 | [diff] [blame] | 1756 | } else { |
| 1757 | ecb->lno_in_postimage++; |
Jeff King | e04df61 | 2019-02-14 00:48:13 -0500 | [diff] [blame] | 1758 | emit_add_line(ecb, data, len); |
Johannes Schindelin | 13e36ec | 2007-02-20 15:08:46 +0100 | [diff] [blame] | 1759 | } |
Junio C Hamano | 7f7ee2f | 2009-09-14 18:44:01 -0700 | [diff] [blame] | 1760 | size -= len; |
| 1761 | data += len; |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 1762 | } |
Stefan Beller | b9cbfde | 2017-06-29 17:06:52 -0700 | [diff] [blame] | 1763 | if (!endp) |
Stefan Beller | 091f8e2 | 2017-06-29 17:06:53 -0700 | [diff] [blame] | 1764 | emit_diff_symbol(ecb->opt, DIFF_SYMBOL_NO_LF_EOF, NULL, 0, 0); |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 1765 | } |
| 1766 | |
| 1767 | static void emit_rewrite_diff(const char *name_a, |
| 1768 | const char *name_b, |
| 1769 | struct diff_filespec *one, |
Johannes Schindelin | 13e36ec | 2007-02-20 15:08:46 +0100 | [diff] [blame] | 1770 | struct diff_filespec *two, |
Jeff King | d9bae1a | 2010-04-01 20:12:15 -0400 | [diff] [blame] | 1771 | struct userdiff_driver *textconv_one, |
| 1772 | struct userdiff_driver *textconv_two, |
Johannes Schindelin | eab9a40 | 2007-12-18 19:32:14 +0000 | [diff] [blame] | 1773 | struct diff_options *o) |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 1774 | { |
| 1775 | int lc_a, lc_b; |
Junio C Hamano | d562509 | 2007-12-26 17:13:36 -0800 | [diff] [blame] | 1776 | static struct strbuf a_name = STRBUF_INIT, b_name = STRBUF_INIT; |
Junio C Hamano | a5a818e | 2008-08-18 20:08:09 -0700 | [diff] [blame] | 1777 | const char *a_prefix, *b_prefix; |
Jeff King | 840383b | 2010-04-01 20:09:26 -0400 | [diff] [blame] | 1778 | char *data_one, *data_two; |
Jeff King | 3aa1f7c | 2008-12-09 03:13:21 -0500 | [diff] [blame] | 1779 | size_t size_one, size_two; |
Junio C Hamano | 7f7ee2f | 2009-09-14 18:44:01 -0700 | [diff] [blame] | 1780 | struct emit_callback ecbdata; |
Stefan Beller | 5af6ea9 | 2017-06-29 17:06:59 -0700 | [diff] [blame] | 1781 | struct strbuf out = STRBUF_INIT; |
Junio C Hamano | a5a818e | 2008-08-18 20:08:09 -0700 | [diff] [blame] | 1782 | |
Brandon Williams | 0d1e0e7 | 2017-10-31 11:19:11 -0700 | [diff] [blame] | 1783 | if (diff_mnemonic_prefix && o->flags.reverse_diff) { |
Junio C Hamano | a5a818e | 2008-08-18 20:08:09 -0700 | [diff] [blame] | 1784 | 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 Hamano | 1a9eb3b | 2006-09-22 16:17:58 -0700 | [diff] [blame] | 1790 | |
Junio C Hamano | 8a13bec | 2007-02-24 01:42:06 -0800 | [diff] [blame] | 1791 | name_a += (*name_a == '/'); |
| 1792 | name_b += (*name_b == '/'); |
Junio C Hamano | 1a9eb3b | 2006-09-22 16:17:58 -0700 | [diff] [blame] | 1793 | |
Junio C Hamano | d562509 | 2007-12-26 17:13:36 -0800 | [diff] [blame] | 1794 | strbuf_reset(&a_name); |
| 1795 | strbuf_reset(&b_name); |
Junio C Hamano | a5a818e | 2008-08-18 20:08:09 -0700 | [diff] [blame] | 1796 | 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 Hamano | d562509 | 2007-12-26 17:13:36 -0800 | [diff] [blame] | 1798 | |
Nguyễn Thái Ngọc Duy | 6afaf80 | 2018-09-21 17:57:22 +0200 | [diff] [blame] | 1799 | size_one = fill_textconv(o->repo, textconv_one, one, &data_one); |
| 1800 | size_two = fill_textconv(o->repo, textconv_two, two, &data_two); |
Jeff King | 3aa1f7c | 2008-12-09 03:13:21 -0500 | [diff] [blame] | 1801 | |
Junio C Hamano | d91ba8f | 2009-09-15 11:21:10 -0700 | [diff] [blame] | 1802 | memset(&ecbdata, 0, sizeof(ecbdata)); |
Jeff King | daa0c3d | 2011-08-17 22:04:23 -0700 | [diff] [blame] | 1803 | ecbdata.color_diff = want_color(o->use_color); |
Nguyễn Thái Ngọc Duy | 26d024e | 2018-09-21 17:57:37 +0200 | [diff] [blame] | 1804 | ecbdata.ws_rule = whitespace_rule(o->repo->index, name_b); |
Bo Yang | a3c158d | 2010-05-26 15:08:02 +0800 | [diff] [blame] | 1805 | ecbdata.opt = o; |
Junio C Hamano | d91ba8f | 2009-09-15 11:21:10 -0700 | [diff] [blame] | 1806 | 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 King | 3aa1f7c | 2008-12-09 03:13:21 -0500 | [diff] [blame] | 1817 | lc_a = count_lines(data_one, size_one); |
| 1818 | lc_b = count_lines(data_two, size_two); |
Stefan Beller | 3ee8b7b | 2017-06-29 17:06:56 -0700 | [diff] [blame] | 1819 | |
| 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 Beller | 5af6ea9 | 2017-06-29 17:06:59 -0700 | [diff] [blame] | 1825 | strbuf_addstr(&out, "@@ -"); |
Junio C Hamano | 467ddc1 | 2011-02-28 16:11:55 -0800 | [diff] [blame] | 1826 | if (!o->irreversible_delete) |
Stefan Beller | 5af6ea9 | 2017-06-29 17:06:59 -0700 | [diff] [blame] | 1827 | add_line_count(&out, lc_a); |
Junio C Hamano | 467ddc1 | 2011-02-28 16:11:55 -0800 | [diff] [blame] | 1828 | else |
Stefan Beller | 5af6ea9 | 2017-06-29 17:06:59 -0700 | [diff] [blame] | 1829 | 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 Hamano | 467ddc1 | 2011-02-28 16:11:55 -0800 | [diff] [blame] | 1836 | if (lc_a && !o->irreversible_delete) |
Junio C Hamano | d91ba8f | 2009-09-15 11:21:10 -0700 | [diff] [blame] | 1837 | emit_rewrite_lines(&ecbdata, '-', data_one, size_one); |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 1838 | if (lc_b) |
Junio C Hamano | d91ba8f | 2009-09-15 11:21:10 -0700 | [diff] [blame] | 1839 | emit_rewrite_lines(&ecbdata, '+', data_two, size_two); |
Jeff King | b76c056 | 2010-04-01 20:04:14 -0400 | [diff] [blame] | 1840 | if (textconv_one) |
Junio C Hamano | aed6ca5 | 2010-04-08 23:30:49 -0700 | [diff] [blame] | 1841 | free((char *)data_one); |
Jeff King | b76c056 | 2010-04-01 20:04:14 -0400 | [diff] [blame] | 1842 | if (textconv_two) |
Junio C Hamano | aed6ca5 | 2010-04-08 23:30:49 -0700 | [diff] [blame] | 1843 | free((char *)data_two); |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 1844 | } |
| 1845 | |
Johannes Schindelin | f59a59e | 2006-07-28 23:56:15 +0200 | [diff] [blame] | 1846 | struct diff_words_buffer { |
| 1847 | mmfile_t text; |
Ramsay Jones | 071bcaa | 2017-09-21 17:49:38 +0100 | [diff] [blame] | 1848 | unsigned long alloc; |
Johannes Schindelin | 2e5d200 | 2009-01-17 17:29:44 +0100 | [diff] [blame] | 1849 | struct diff_words_orig { |
| 1850 | const char *begin, *end; |
| 1851 | } *orig; |
| 1852 | int orig_nr, orig_alloc; |
Johannes Schindelin | f59a59e | 2006-07-28 23:56:15 +0200 | [diff] [blame] | 1853 | }; |
| 1854 | |
| 1855 | static void diff_words_append(char *line, unsigned long len, |
| 1856 | struct diff_words_buffer *buffer) |
| 1857 | { |
Johannes Schindelin | 23c1575 | 2009-01-17 17:29:43 +0100 | [diff] [blame] | 1858 | ALLOC_GROW(buffer->text.ptr, buffer->text.size + len, buffer->alloc); |
Johannes Schindelin | f59a59e | 2006-07-28 23:56:15 +0200 | [diff] [blame] | 1859 | line++; |
| 1860 | len--; |
| 1861 | memcpy(buffer->text.ptr + buffer->text.size, line, len); |
| 1862 | buffer->text.size += len; |
Johannes Schindelin | 2b6a541 | 2009-01-17 17:29:45 +0100 | [diff] [blame] | 1863 | buffer->text.ptr[buffer->text.size] = '\0'; |
Johannes Schindelin | f59a59e | 2006-07-28 23:56:15 +0200 | [diff] [blame] | 1864 | } |
| 1865 | |
Jonathan Nieder | 9cba13c | 2011-03-16 02:08:34 -0500 | [diff] [blame] | 1866 | struct diff_words_style_elem { |
Thomas Rast | 882749a | 2010-04-14 17:59:06 +0200 | [diff] [blame] | 1867 | 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 Nieder | 9cba13c | 2011-03-16 02:08:34 -0500 | [diff] [blame] | 1873 | struct diff_words_style { |
Thomas Rast | 882749a | 2010-04-14 17:59:06 +0200 | [diff] [blame] | 1874 | enum diff_words_type type; |
Brandon Williams | 63a01c3 | 2018-02-14 10:59:39 -0800 | [diff] [blame] | 1875 | struct diff_words_style_elem new_word, old_word, ctx; |
Thomas Rast | 882749a | 2010-04-14 17:59:06 +0200 | [diff] [blame] | 1876 | const char *newline; |
| 1877 | }; |
| 1878 | |
Stephen Boyd | c2e86ad | 2011-03-22 00:51:05 -0700 | [diff] [blame] | 1879 | static struct diff_words_style diff_words_styles[] = { |
Thomas Rast | 882749a | 2010-04-14 17:59:06 +0200 | [diff] [blame] | 1880 | { DIFF_WORDS_PORCELAIN, {"+", "\n"}, {"-", "\n"}, {" ", "\n"}, "~\n" }, |
| 1881 | { DIFF_WORDS_PLAIN, {"{+", "+}"}, {"[-", "-]"}, {"", ""}, "\n" }, |
| 1882 | { DIFF_WORDS_COLOR, {"", ""}, {"", ""}, {"", ""}, "\n" } |
| 1883 | }; |
| 1884 | |
Johannes Schindelin | f59a59e | 2006-07-28 23:56:15 +0200 | [diff] [blame] | 1885 | struct diff_words_data { |
Johannes Schindelin | f59a59e | 2006-07-28 23:56:15 +0200 | [diff] [blame] | 1886 | struct diff_words_buffer minus, plus; |
Johannes Schindelin | 2e5d200 | 2009-01-17 17:29:44 +0100 | [diff] [blame] | 1887 | const char *current_plus; |
Bo Yang | 4297c0a | 2010-05-29 23:32:06 +0800 | [diff] [blame] | 1888 | int last_minus; |
| 1889 | struct diff_options *opt; |
Johannes Schindelin | 2b6a541 | 2009-01-17 17:29:45 +0100 | [diff] [blame] | 1890 | regex_t *word_regex; |
Thomas Rast | 882749a | 2010-04-14 17:59:06 +0200 | [diff] [blame] | 1891 | enum diff_words_type type; |
| 1892 | struct diff_words_style *style; |
Johannes Schindelin | f59a59e | 2006-07-28 23:56:15 +0200 | [diff] [blame] | 1893 | }; |
| 1894 | |
Stefan Beller | bd03329 | 2017-06-29 17:07:03 -0700 | [diff] [blame] | 1895 | static int fn_out_diff_words_write_helper(struct diff_options *o, |
Thomas Rast | 882749a | 2010-04-14 17:59:06 +0200 | [diff] [blame] | 1896 | struct diff_words_style_elem *st_el, |
| 1897 | const char *newline, |
Stefan Beller | bd03329 | 2017-06-29 17:07:03 -0700 | [diff] [blame] | 1898 | size_t count, const char *buf) |
Thomas Rast | 882749a | 2010-04-14 17:59:06 +0200 | [diff] [blame] | 1899 | { |
Bo Yang | 4297c0a | 2010-05-29 23:32:06 +0800 | [diff] [blame] | 1900 | int print = 0; |
Stefan Beller | bd03329 | 2017-06-29 17:07:03 -0700 | [diff] [blame] | 1901 | struct strbuf sb = STRBUF_INIT; |
Bo Yang | 4297c0a | 2010-05-29 23:32:06 +0800 | [diff] [blame] | 1902 | |
Thomas Rast | 882749a | 2010-04-14 17:59:06 +0200 | [diff] [blame] | 1903 | while (count) { |
| 1904 | char *p = memchr(buf, '\n', count); |
Bo Yang | 4297c0a | 2010-05-29 23:32:06 +0800 | [diff] [blame] | 1905 | if (print) |
Stefan Beller | bd03329 | 2017-06-29 17:07:03 -0700 | [diff] [blame] | 1906 | strbuf_addstr(&sb, diff_line_prefix(o)); |
| 1907 | |
Thomas Rast | 882749a | 2010-04-14 17:59:06 +0200 | [diff] [blame] | 1908 | if (p != buf) { |
Stefan Beller | bd03329 | 2017-06-29 17:07:03 -0700 | [diff] [blame] | 1909 | 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 Rast | 882749a | 2010-04-14 17:59:06 +0200 | [diff] [blame] | 1918 | } |
| 1919 | if (!p) |
Stefan Beller | bd03329 | 2017-06-29 17:07:03 -0700 | [diff] [blame] | 1920 | goto out; |
| 1921 | |
| 1922 | strbuf_addstr(&sb, newline); |
Thomas Rast | 882749a | 2010-04-14 17:59:06 +0200 | [diff] [blame] | 1923 | count -= p + 1 - buf; |
| 1924 | buf = p + 1; |
Bo Yang | 4297c0a | 2010-05-29 23:32:06 +0800 | [diff] [blame] | 1925 | print = 1; |
Stefan Beller | bd03329 | 2017-06-29 17:07:03 -0700 | [diff] [blame] | 1926 | if (count) { |
| 1927 | emit_diff_symbol(o, DIFF_SYMBOL_WORD_DIFF, |
| 1928 | sb.buf, sb.len, 0); |
| 1929 | strbuf_reset(&sb); |
| 1930 | } |
Thomas Rast | 882749a | 2010-04-14 17:59:06 +0200 | [diff] [blame] | 1931 | } |
Stefan Beller | bd03329 | 2017-06-29 17:07:03 -0700 | [diff] [blame] | 1932 | |
| 1933 | out: |
| 1934 | if (sb.len) |
| 1935 | emit_diff_symbol(o, DIFF_SYMBOL_WORD_DIFF, |
| 1936 | sb.buf, sb.len, 0); |
| 1937 | strbuf_release(&sb); |
Thomas Rast | 882749a | 2010-04-14 17:59:06 +0200 | [diff] [blame] | 1938 | return 0; |
| 1939 | } |
| 1940 | |
Bo Yang | 4297c0a | 2010-05-29 23:32:06 +0800 | [diff] [blame] | 1941 | /* |
| 1942 | * '--color-words' algorithm can be described as: |
| 1943 | * |
René Genz | 5621760 | 2017-04-30 17:48:27 +0200 | [diff] [blame] | 1944 | * 1. collect the minus/plus lines of a diff hunk, divided into |
Bo Yang | 4297c0a | 2010-05-29 23:32:06 +0800 | [diff] [blame] | 1945 | * 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 | */ |
| 1972 | static 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 King | 7c61e25 | 2018-11-02 02:37:18 -0400 | [diff] [blame] | 1984 | static 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 Schindelin | f59a59e | 2006-07-28 23:56:15 +0200 | [diff] [blame] | 1988 | { |
| 1989 | struct diff_words_data *diff_words = priv; |
Thomas Rast | 882749a | 2010-04-14 17:59:06 +0200 | [diff] [blame] | 1990 | struct diff_words_style *style = diff_words->style; |
Johannes Schindelin | 2e5d200 | 2009-01-17 17:29:44 +0100 | [diff] [blame] | 1991 | const char *minus_begin, *minus_end, *plus_begin, *plus_end; |
Bo Yang | 4297c0a | 2010-05-29 23:32:06 +0800 | [diff] [blame] | 1992 | struct diff_options *opt = diff_words->opt; |
John Keeping | 30997bb | 2013-02-07 20:15:27 +0000 | [diff] [blame] | 1993 | const char *line_prefix; |
Johannes Schindelin | f59a59e | 2006-07-28 23:56:15 +0200 | [diff] [blame] | 1994 | |
Bo Yang | 4297c0a | 2010-05-29 23:32:06 +0800 | [diff] [blame] | 1995 | assert(opt); |
John Keeping | 30997bb | 2013-02-07 20:15:27 +0000 | [diff] [blame] | 1996 | line_prefix = diff_line_prefix(opt); |
Bo Yang | 4297c0a | 2010-05-29 23:32:06 +0800 | [diff] [blame] | 1997 | |
Johannes Schindelin | 2e5d200 | 2009-01-17 17:29:44 +0100 | [diff] [blame] | 1998 | /* 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 Yang | 4297c0a | 2010-05-29 23:32:06 +0800 | [diff] [blame] | 2013 | 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 Beller | bd03329 | 2017-06-29 17:07:03 -0700 | [diff] [blame] | 2017 | fn_out_diff_words_write_helper(diff_words->opt, |
Thomas Rast | 882749a | 2010-04-14 17:59:06 +0200 | [diff] [blame] | 2018 | &style->ctx, style->newline, |
| 2019 | plus_begin - diff_words->current_plus, |
Stefan Beller | bd03329 | 2017-06-29 17:07:03 -0700 | [diff] [blame] | 2020 | diff_words->current_plus); |
Bo Yang | 4297c0a | 2010-05-29 23:32:06 +0800 | [diff] [blame] | 2021 | } |
| 2022 | if (minus_begin != minus_end) { |
Stefan Beller | bd03329 | 2017-06-29 17:07:03 -0700 | [diff] [blame] | 2023 | fn_out_diff_words_write_helper(diff_words->opt, |
Brandon Williams | 63a01c3 | 2018-02-14 10:59:39 -0800 | [diff] [blame] | 2024 | &style->old_word, style->newline, |
Stefan Beller | bd03329 | 2017-06-29 17:07:03 -0700 | [diff] [blame] | 2025 | minus_end - minus_begin, minus_begin); |
Bo Yang | 4297c0a | 2010-05-29 23:32:06 +0800 | [diff] [blame] | 2026 | } |
| 2027 | if (plus_begin != plus_end) { |
Stefan Beller | bd03329 | 2017-06-29 17:07:03 -0700 | [diff] [blame] | 2028 | fn_out_diff_words_write_helper(diff_words->opt, |
Brandon Williams | 63a01c3 | 2018-02-14 10:59:39 -0800 | [diff] [blame] | 2029 | &style->new_word, style->newline, |
Stefan Beller | bd03329 | 2017-06-29 17:07:03 -0700 | [diff] [blame] | 2030 | plus_end - plus_begin, plus_begin); |
Bo Yang | 4297c0a | 2010-05-29 23:32:06 +0800 | [diff] [blame] | 2031 | } |
Johannes Schindelin | 2e5d200 | 2009-01-17 17:29:44 +0100 | [diff] [blame] | 2032 | |
| 2033 | diff_words->current_plus = plus_end; |
Bo Yang | 4297c0a | 2010-05-29 23:32:06 +0800 | [diff] [blame] | 2034 | diff_words->last_minus = minus_first; |
Johannes Schindelin | f59a59e | 2006-07-28 23:56:15 +0200 | [diff] [blame] | 2035 | } |
| 2036 | |
Johannes Schindelin | 2b6a541 | 2009-01-17 17:29:45 +0100 | [diff] [blame] | 2037 | /* This function starts looking at *begin, and returns 0 iff a word was found. */ |
| 2038 | static 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 Schindelin | b7d36ff | 2016-09-21 20:24:14 +0200 | [diff] [blame] | 2043 | if (!regexec_buf(word_regex, buffer->ptr + *begin, |
| 2044 | buffer->size - *begin, 1, match, 0)) { |
Johannes Schindelin | 2b6a541 | 2009-01-17 17:29:45 +0100 | [diff] [blame] | 2045 | 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 Schindelin | f59a59e | 2006-07-28 23:56:15 +0200 | [diff] [blame] | 2052 | } |
| 2053 | |
Johannes Schindelin | 2b6a541 | 2009-01-17 17:29:45 +0100 | [diff] [blame] | 2054 | /* 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 Schindelin | 23c1575 | 2009-01-17 17:29:43 +0100 | [diff] [blame] | 2068 | /* |
Johannes Schindelin | 2e5d200 | 2009-01-17 17:29:44 +0100 | [diff] [blame] | 2069 | * 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 Schindelin | 23c1575 | 2009-01-17 17:29:43 +0100 | [diff] [blame] | 2072 | */ |
Johannes Schindelin | 2b6a541 | 2009-01-17 17:29:45 +0100 | [diff] [blame] | 2073 | static void diff_words_fill(struct diff_words_buffer *buffer, mmfile_t *out, |
| 2074 | regex_t *word_regex) |
Johannes Schindelin | 23c1575 | 2009-01-17 17:29:43 +0100 | [diff] [blame] | 2075 | { |
Johannes Schindelin | 2e5d200 | 2009-01-17 17:29:44 +0100 | [diff] [blame] | 2076 | int i, j; |
Johannes Schindelin | 2b6a541 | 2009-01-17 17:29:45 +0100 | [diff] [blame] | 2077 | long alloc = 0; |
Johannes Schindelin | 2e5d200 | 2009-01-17 17:29:44 +0100 | [diff] [blame] | 2078 | |
| 2079 | out->size = 0; |
Johannes Schindelin | 2b6a541 | 2009-01-17 17:29:45 +0100 | [diff] [blame] | 2080 | out->ptr = NULL; |
Johannes Schindelin | 2e5d200 | 2009-01-17 17:29:44 +0100 | [diff] [blame] | 2081 | |
| 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 Schindelin | 2b6a541 | 2009-01-17 17:29:45 +0100 | [diff] [blame] | 2088 | if (find_word_boundaries(&buffer->text, word_regex, &i, &j)) |
| 2089 | return; |
Johannes Schindelin | 2e5d200 | 2009-01-17 17:29:44 +0100 | [diff] [blame] | 2090 | |
| 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 Schindelin | 2b6a541 | 2009-01-17 17:29:45 +0100 | [diff] [blame] | 2099 | ALLOC_GROW(out->ptr, out->size + j - i + 1, alloc); |
Johannes Schindelin | 2e5d200 | 2009-01-17 17:29:44 +0100 | [diff] [blame] | 2100 | 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 Schindelin | f59a59e | 2006-07-28 23:56:15 +0200 | [diff] [blame] | 2105 | } |
| 2106 | } |
| 2107 | |
| 2108 | /* this executes the word diff on the accumulated buffers */ |
| 2109 | static void diff_words_show(struct diff_words_data *diff_words) |
| 2110 | { |
| 2111 | xpparam_t xpp; |
| 2112 | xdemitconf_t xecfg; |
Johannes Schindelin | f59a59e | 2006-07-28 23:56:15 +0200 | [diff] [blame] | 2113 | mmfile_t minus, plus; |
Thomas Rast | 882749a | 2010-04-14 17:59:06 +0200 | [diff] [blame] | 2114 | struct diff_words_style *style = diff_words->style; |
Johannes Schindelin | f59a59e | 2006-07-28 23:56:15 +0200 | [diff] [blame] | 2115 | |
Bo Yang | 4297c0a | 2010-05-29 23:32:06 +0800 | [diff] [blame] | 2116 | struct diff_options *opt = diff_words->opt; |
John Keeping | 30997bb | 2013-02-07 20:15:27 +0000 | [diff] [blame] | 2117 | const char *line_prefix; |
Bo Yang | 4297c0a | 2010-05-29 23:32:06 +0800 | [diff] [blame] | 2118 | |
| 2119 | assert(opt); |
John Keeping | 30997bb | 2013-02-07 20:15:27 +0000 | [diff] [blame] | 2120 | line_prefix = diff_line_prefix(opt); |
Bo Yang | 4297c0a | 2010-05-29 23:32:06 +0800 | [diff] [blame] | 2121 | |
Johannes Schindelin | 2e5d200 | 2009-01-17 17:29:44 +0100 | [diff] [blame] | 2122 | /* special case: only removal */ |
| 2123 | if (!diff_words->plus.text.size) { |
Stefan Beller | bd03329 | 2017-06-29 17:07:03 -0700 | [diff] [blame] | 2124 | 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 Williams | 63a01c3 | 2018-02-14 10:59:39 -0800 | [diff] [blame] | 2127 | &style->old_word, style->newline, |
Bo Yang | 4297c0a | 2010-05-29 23:32:06 +0800 | [diff] [blame] | 2128 | diff_words->minus.text.size, |
Stefan Beller | bd03329 | 2017-06-29 17:07:03 -0700 | [diff] [blame] | 2129 | diff_words->minus.text.ptr); |
Johannes Schindelin | 2e5d200 | 2009-01-17 17:29:44 +0100 | [diff] [blame] | 2130 | diff_words->minus.text.size = 0; |
| 2131 | return; |
| 2132 | } |
| 2133 | |
| 2134 | diff_words->current_plus = diff_words->plus.text.ptr; |
Bo Yang | 4297c0a | 2010-05-29 23:32:06 +0800 | [diff] [blame] | 2135 | diff_words->last_minus = 0; |
Johannes Schindelin | f59a59e | 2006-07-28 23:56:15 +0200 | [diff] [blame] | 2136 | |
Brian Downing | 9ccd0a8 | 2008-10-25 15:30:37 +0200 | [diff] [blame] | 2137 | memset(&xpp, 0, sizeof(xpp)); |
Johannes Schindelin | 30b2501 | 2007-07-04 19:05:46 +0100 | [diff] [blame] | 2138 | memset(&xecfg, 0, sizeof(xecfg)); |
Johannes Schindelin | 2b6a541 | 2009-01-17 17:29:45 +0100 | [diff] [blame] | 2139 | diff_words_fill(&diff_words->minus, &minus, diff_words->word_regex); |
| 2140 | diff_words_fill(&diff_words->plus, &plus, diff_words->word_regex); |
René Scharfe | 582aa00 | 2010-05-02 15:04:41 +0200 | [diff] [blame] | 2141 | xpp.flags = 0; |
Johannes Schindelin | 2b6a541 | 2009-01-17 17:29:45 +0100 | [diff] [blame] | 2142 | /* as only the hunk header will be parsed, we need a 0-context */ |
Johannes Schindelin | 2e5d200 | 2009-01-17 17:29:44 +0100 | [diff] [blame] | 2143 | xecfg.ctxlen = 0; |
Jeff King | 7c61e25 | 2018-11-02 02:37:18 -0400 | [diff] [blame] | 2144 | if (xdi_diff_outf(&minus, &plus, fn_out_diff_words_aux, NULL, |
Jeff King | 9346d6d | 2018-11-02 02:35:45 -0400 | [diff] [blame] | 2145 | diff_words, &xpp, &xecfg)) |
Jeff King | 3efb988 | 2015-09-24 19:12:23 -0400 | [diff] [blame] | 2146 | die("unable to generate word diff"); |
Johannes Schindelin | f59a59e | 2006-07-28 23:56:15 +0200 | [diff] [blame] | 2147 | free(minus.ptr); |
| 2148 | free(plus.ptr); |
Johannes Schindelin | 2e5d200 | 2009-01-17 17:29:44 +0100 | [diff] [blame] | 2149 | if (diff_words->current_plus != diff_words->plus.text.ptr + |
Bo Yang | 4297c0a | 2010-05-29 23:32:06 +0800 | [diff] [blame] | 2150 | diff_words->plus.text.size) { |
| 2151 | if (color_words_output_graph_prefix(diff_words)) |
Stefan Beller | bd03329 | 2017-06-29 17:07:03 -0700 | [diff] [blame] | 2152 | 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 Rast | 882749a | 2010-04-14 17:59:06 +0200 | [diff] [blame] | 2155 | &style->ctx, style->newline, |
Johannes Schindelin | 2e5d200 | 2009-01-17 17:29:44 +0100 | [diff] [blame] | 2156 | diff_words->plus.text.ptr + diff_words->plus.text.size |
Stefan Beller | bd03329 | 2017-06-29 17:07:03 -0700 | [diff] [blame] | 2157 | - diff_words->current_plus, diff_words->current_plus); |
Bo Yang | 4297c0a | 2010-05-29 23:32:06 +0800 | [diff] [blame] | 2158 | } |
Johannes Schindelin | f59a59e | 2006-07-28 23:56:15 +0200 | [diff] [blame] | 2159 | diff_words->minus.text.size = diff_words->plus.text.size = 0; |
Johannes Schindelin | f59a59e | 2006-07-28 23:56:15 +0200 | [diff] [blame] | 2160 | } |
| 2161 | |
Junio C Hamano | 76fd282 | 2009-10-30 10:09:06 -0700 | [diff] [blame] | 2162 | /* In "color-words" mode, show word-diff of words accumulated in the buffer */ |
| 2163 | static void diff_words_flush(struct emit_callback *ecbdata) |
| 2164 | { |
Stefan Beller | e6e045f | 2017-06-29 17:07:06 -0700 | [diff] [blame] | 2165 | struct diff_options *wo = ecbdata->diff_words->opt; |
| 2166 | |
Junio C Hamano | 76fd282 | 2009-10-30 10:09:06 -0700 | [diff] [blame] | 2167 | if (ecbdata->diff_words->minus.text.size || |
| 2168 | ecbdata->diff_words->plus.text.size) |
| 2169 | diff_words_show(ecbdata->diff_words); |
Stefan Beller | e6e045f | 2017-06-29 17:07:06 -0700 | [diff] [blame] | 2170 | |
| 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 Hamano | 76fd282 | 2009-10-30 10:09:06 -0700 | [diff] [blame] | 2188 | } |
| 2189 | |
Nguyễn Thái Ngọc Duy | acd00ea | 2018-09-21 17:57:33 +0200 | [diff] [blame] | 2190 | static void diff_filespec_load_driver(struct diff_filespec *one, |
| 2191 | struct index_state *istate) |
Thomas Rast | 77d1a52 | 2012-03-14 19:24:08 +0100 | [diff] [blame] | 2192 | { |
| 2193 | /* Use already-loaded driver */ |
| 2194 | if (one->driver) |
| 2195 | return; |
| 2196 | |
| 2197 | if (S_ISREG(one->mode)) |
Nguyễn Thái Ngọc Duy | acd00ea | 2018-09-21 17:57:33 +0200 | [diff] [blame] | 2198 | one->driver = userdiff_find_by_path(istate, one->path); |
Thomas Rast | 77d1a52 | 2012-03-14 19:24:08 +0100 | [diff] [blame] | 2199 | |
| 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 Duy | acd00ea | 2018-09-21 17:57:33 +0200 | [diff] [blame] | 2205 | static const char *userdiff_word_regex(struct diff_filespec *one, |
| 2206 | struct index_state *istate) |
Thomas Rast | 77d1a52 | 2012-03-14 19:24:08 +0100 | [diff] [blame] | 2207 | { |
Nguyễn Thái Ngọc Duy | acd00ea | 2018-09-21 17:57:33 +0200 | [diff] [blame] | 2208 | diff_filespec_load_driver(one, istate); |
Thomas Rast | 77d1a52 | 2012-03-14 19:24:08 +0100 | [diff] [blame] | 2209 | return one->driver->word_regex; |
| 2210 | } |
| 2211 | |
| 2212 | static void init_diff_words_data(struct emit_callback *ecbdata, |
Thomas Rast | 6440d34 | 2012-03-14 19:24:09 +0100 | [diff] [blame] | 2213 | struct diff_options *orig_opts, |
Thomas Rast | 77d1a52 | 2012-03-14 19:24:08 +0100 | [diff] [blame] | 2214 | struct diff_filespec *one, |
| 2215 | struct diff_filespec *two) |
| 2216 | { |
| 2217 | int i; |
Thomas Rast | 6440d34 | 2012-03-14 19:24:09 +0100 | [diff] [blame] | 2218 | struct diff_options *o = xmalloc(sizeof(struct diff_options)); |
| 2219 | memcpy(o, orig_opts, sizeof(struct diff_options)); |
Thomas Rast | 77d1a52 | 2012-03-14 19:24:08 +0100 | [diff] [blame] | 2220 | |
| 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 Beller | e6e045f | 2017-06-29 17:07:06 -0700 | [diff] [blame] | 2225 | |
| 2226 | if (orig_opts->emitted_symbols) |
| 2227 | o->emitted_symbols = |
| 2228 | xcalloc(1, sizeof(struct emitted_diff_symbols)); |
| 2229 | |
Thomas Rast | 77d1a52 | 2012-03-14 19:24:08 +0100 | [diff] [blame] | 2230 | if (!o->word_regex) |
Nguyễn Thái Ngọc Duy | acd00ea | 2018-09-21 17:57:33 +0200 | [diff] [blame] | 2231 | o->word_regex = userdiff_word_regex(one, o->repo->index); |
Thomas Rast | 77d1a52 | 2012-03-14 19:24:08 +0100 | [diff] [blame] | 2232 | if (!o->word_regex) |
Nguyễn Thái Ngọc Duy | acd00ea | 2018-09-21 17:57:33 +0200 | [diff] [blame] | 2233 | o->word_regex = userdiff_word_regex(two, o->repo->index); |
Thomas Rast | 77d1a52 | 2012-03-14 19:24:08 +0100 | [diff] [blame] | 2234 | 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 Duy | 1a07e59 | 2018-07-21 09:49:19 +0200 | [diff] [blame] | 2242 | die("invalid regular expression: %s", |
| 2243 | o->word_regex); |
Thomas Rast | 77d1a52 | 2012-03-14 19:24:08 +0100 | [diff] [blame] | 2244 | } |
| 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 Williams | 63a01c3 | 2018-02-14 10:59:39 -0800 | [diff] [blame] | 2254 | 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 King | 8dbf3eb | 2015-05-27 16:48:46 -0400 | [diff] [blame] | 2256 | st->ctx.color = diff_get_color_opt(o, DIFF_CONTEXT); |
Thomas Rast | 77d1a52 | 2012-03-14 19:24:08 +0100 | [diff] [blame] | 2257 | } |
| 2258 | } |
| 2259 | |
Johannes Schindelin | f59a59e | 2006-07-28 23:56:15 +0200 | [diff] [blame] | 2260 | static void free_diff_words_data(struct emit_callback *ecbdata) |
| 2261 | { |
| 2262 | if (ecbdata->diff_words) { |
Junio C Hamano | 76fd282 | 2009-10-30 10:09:06 -0700 | [diff] [blame] | 2263 | diff_words_flush(ecbdata); |
Stefan Beller | e6e045f | 2017-06-29 17:07:06 -0700 | [diff] [blame] | 2264 | free (ecbdata->diff_words->opt->emitted_symbols); |
Thomas Rast | 6440d34 | 2012-03-14 19:24:09 +0100 | [diff] [blame] | 2265 | free (ecbdata->diff_words->opt); |
Jim Meyering | 8e0f700 | 2008-01-31 18:26:32 +0100 | [diff] [blame] | 2266 | free (ecbdata->diff_words->minus.text.ptr); |
Johannes Schindelin | 2e5d200 | 2009-01-17 17:29:44 +0100 | [diff] [blame] | 2267 | free (ecbdata->diff_words->minus.orig); |
Jim Meyering | 8e0f700 | 2008-01-31 18:26:32 +0100 | [diff] [blame] | 2268 | free (ecbdata->diff_words->plus.text.ptr); |
Johannes Schindelin | 2e5d200 | 2009-01-17 17:29:44 +0100 | [diff] [blame] | 2269 | free (ecbdata->diff_words->plus.orig); |
Brandon Casey | ef5644e | 2010-09-09 14:02:45 -0500 | [diff] [blame] | 2270 | if (ecbdata->diff_words->word_regex) { |
| 2271 | regfree(ecbdata->diff_words->word_regex); |
| 2272 | free(ecbdata->diff_words->word_regex); |
| 2273 | } |
Ævar Arnfjörð Bjarmason | 6a83d90 | 2017-06-15 23:15:46 +0000 | [diff] [blame] | 2274 | FREE_AND_NULL(ecbdata->diff_words); |
Johannes Schindelin | f59a59e | 2006-07-28 23:56:15 +0200 | [diff] [blame] | 2275 | } |
| 2276 | } |
| 2277 | |
Jeff King | ce43697 | 2006-07-23 05:24:18 -0400 | [diff] [blame] | 2278 | const char *diff_get_color(int diff_use_color, enum color_diff ix) |
Johannes Schindelin | cd112ce | 2006-06-13 18:45:44 +0200 | [diff] [blame] | 2279 | { |
Jeff King | daa0c3d | 2011-08-17 22:04:23 -0700 | [diff] [blame] | 2280 | if (want_color(diff_use_color)) |
Linus Torvalds | 50f575f | 2006-06-22 13:53:31 -0700 | [diff] [blame] | 2281 | return diff_colors[ix]; |
| 2282 | return ""; |
Johannes Schindelin | cd112ce | 2006-06-13 18:45:44 +0200 | [diff] [blame] | 2283 | } |
| 2284 | |
John Keeping | f192223 | 2013-02-07 20:15:26 +0000 | [diff] [blame] | 2285 | const 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 King | 19b9046 | 2019-02-14 00:48:27 -0500 | [diff] [blame] | 2295 | static unsigned long sane_truncate_line(char *line, unsigned long len) |
Junio C Hamano | 2370781 | 2008-01-02 01:50:11 -0800 | [diff] [blame] | 2296 | { |
| 2297 | const char *cp; |
| 2298 | unsigned long allot; |
| 2299 | size_t l = len; |
| 2300 | |
Junio C Hamano | 2370781 | 2008-01-02 01:50:11 -0800 | [diff] [blame] | 2301 | 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 Hamano | d68fe26 | 2009-09-14 22:05:57 -0700 | [diff] [blame] | 2311 | static void find_lno(const char *line, struct emit_callback *ecbdata) |
Junio C Hamano | 690ed84 | 2009-09-04 00:41:15 -0700 | [diff] [blame] | 2312 | { |
Junio C Hamano | d68fe26 | 2009-09-14 22:05:57 -0700 | [diff] [blame] | 2313 | const char *p; |
| 2314 | ecbdata->lno_in_preimage = 0; |
| 2315 | ecbdata->lno_in_postimage = 0; |
| 2316 | p = strchr(line, '-'); |
Junio C Hamano | 690ed84 | 2009-09-04 00:41:15 -0700 | [diff] [blame] | 2317 | if (!p) |
Junio C Hamano | d68fe26 | 2009-09-14 22:05:57 -0700 | [diff] [blame] | 2318 | 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 Hamano | 690ed84 | 2009-09-04 00:41:15 -0700 | [diff] [blame] | 2324 | } |
| 2325 | |
Johannes Schindelin | cd112ce | 2006-06-13 18:45:44 +0200 | [diff] [blame] | 2326 | static void fn_out_consume(void *priv, char *line, unsigned long len) |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 2327 | { |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 2328 | struct emit_callback *ecbdata = priv; |
Bo Yang | 7be5761 | 2010-05-26 15:23:54 +0800 | [diff] [blame] | 2329 | struct diff_options *o = ecbdata->opt; |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 2330 | |
Stefan Beller | ba16233 | 2016-09-07 16:36:46 -0700 | [diff] [blame] | 2331 | o->found_changes = 1; |
| 2332 | |
Greg Bacon | 3e97c7c | 2009-11-19 15:12:24 -0600 | [diff] [blame] | 2333 | if (ecbdata->header) { |
Stefan Beller | a29b0a1 | 2017-06-29 17:06:57 -0700 | [diff] [blame] | 2334 | emit_diff_symbol(o, DIFF_SYMBOL_HEADER, |
| 2335 | ecbdata->header->buf, ecbdata->header->len, 0); |
Greg Bacon | 3e97c7c | 2009-11-19 15:12:24 -0600 | [diff] [blame] | 2336 | strbuf_reset(ecbdata->header); |
| 2337 | ecbdata->header = NULL; |
| 2338 | } |
Johannes Schindelin | 34a5e1a | 2007-02-25 23:34:54 +0100 | [diff] [blame] | 2339 | |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 2340 | if (ecbdata->label_path[0]) { |
Stefan Beller | 3ee8b7b | 2017-06-29 17:06:56 -0700 | [diff] [blame] | 2341 | 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 Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 2347 | ecbdata->label_path[0] = ecbdata->label_path[1] = NULL; |
| 2348 | } |
Johannes Schindelin | cd112ce | 2006-06-13 18:45:44 +0200 | [diff] [blame] | 2349 | |
Jim Meyering | a624eaa | 2008-08-15 13:39:26 +0200 | [diff] [blame] | 2350 | if (diff_suppress_blank_empty |
| 2351 | && len == 2 && line[0] == ' ' && line[1] == '\n') { |
| 2352 | line[0] = '\n'; |
| 2353 | len = 1; |
| 2354 | } |
| 2355 | |
Junio C Hamano | b8d9c1a | 2009-09-03 23:59:25 -0700 | [diff] [blame] | 2356 | if (line[0] == '@') { |
Junio C Hamano | 76fd282 | 2009-10-30 10:09:06 -0700 | [diff] [blame] | 2357 | if (ecbdata->diff_words) |
| 2358 | diff_words_flush(ecbdata); |
Jeff King | 19b9046 | 2019-02-14 00:48:27 -0500 | [diff] [blame] | 2359 | len = sane_truncate_line(line, len); |
Junio C Hamano | d68fe26 | 2009-09-14 22:05:57 -0700 | [diff] [blame] | 2360 | find_lno(line, ecbdata); |
Bert Wesarg | 89cb73a | 2009-11-27 07:55:18 +0100 | [diff] [blame] | 2361 | emit_hunk_header(ecbdata, line, len); |
Junio C Hamano | 448c3ef | 2006-09-22 22:48:39 -0700 | [diff] [blame] | 2362 | return; |
Johannes Schindelin | cd112ce | 2006-06-13 18:45:44 +0200 | [diff] [blame] | 2363 | } |
Junio C Hamano | 448c3ef | 2006-09-22 22:48:39 -0700 | [diff] [blame] | 2364 | |
Junio C Hamano | 448c3ef | 2006-09-22 22:48:39 -0700 | [diff] [blame] | 2365 | if (ecbdata->diff_words) { |
Stefan Beller | ff95867 | 2017-06-29 17:06:54 -0700 | [diff] [blame] | 2366 | enum diff_symbol s = |
| 2367 | ecbdata->diff_words->type == DIFF_WORDS_PORCELAIN ? |
| 2368 | DIFF_SYMBOL_WORDS_PORCELAIN : DIFF_SYMBOL_WORDS; |
Junio C Hamano | 448c3ef | 2006-09-22 22:48:39 -0700 | [diff] [blame] | 2369 | 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 Couder | 5955654 | 2013-11-30 21:55:40 +0100 | [diff] [blame] | 2377 | } else if (starts_with(line, "\\ ")) { |
Thomas Rast | c7c2bc0 | 2012-01-12 12:15:33 +0100 | [diff] [blame] | 2378 | /* |
| 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 Hamano | 448c3ef | 2006-09-22 22:48:39 -0700 | [diff] [blame] | 2386 | } |
Junio C Hamano | 76fd282 | 2009-10-30 10:09:06 -0700 | [diff] [blame] | 2387 | diff_words_flush(ecbdata); |
Stefan Beller | ff95867 | 2017-06-29 17:06:54 -0700 | [diff] [blame] | 2388 | emit_diff_symbol(o, s, line, len, 0); |
Junio C Hamano | 448c3ef | 2006-09-22 22:48:39 -0700 | [diff] [blame] | 2389 | return; |
| 2390 | } |
Junio C Hamano | 448c3ef | 2006-09-22 22:48:39 -0700 | [diff] [blame] | 2391 | |
Junio C Hamano | 0e383e1 | 2015-05-26 09:56:33 -0700 | [diff] [blame] | 2392 | switch (line[0]) { |
| 2393 | case '+': |
Junio C Hamano | d68fe26 | 2009-09-14 22:05:57 -0700 | [diff] [blame] | 2394 | ecbdata->lno_in_postimage++; |
Jeff King | e04df61 | 2019-02-14 00:48:13 -0500 | [diff] [blame] | 2395 | emit_add_line(ecbdata, line + 1, len - 1); |
Junio C Hamano | 0e383e1 | 2015-05-26 09:56:33 -0700 | [diff] [blame] | 2396 | break; |
| 2397 | case '-': |
| 2398 | ecbdata->lno_in_preimage++; |
Jeff King | e04df61 | 2019-02-14 00:48:13 -0500 | [diff] [blame] | 2399 | emit_del_line(ecbdata, line + 1, len - 1); |
Junio C Hamano | 0e383e1 | 2015-05-26 09:56:33 -0700 | [diff] [blame] | 2400 | break; |
| 2401 | case ' ': |
| 2402 | ecbdata->lno_in_postimage++; |
| 2403 | ecbdata->lno_in_preimage++; |
Jeff King | e04df61 | 2019-02-14 00:48:13 -0500 | [diff] [blame] | 2404 | emit_context_line(ecbdata, line + 1, len - 1); |
Junio C Hamano | 0e383e1 | 2015-05-26 09:56:33 -0700 | [diff] [blame] | 2405 | break; |
| 2406 | default: |
| 2407 | /* incomplete line at the end */ |
| 2408 | ecbdata->lno_in_preimage++; |
Stefan Beller | f2bb121 | 2017-06-29 17:06:55 -0700 | [diff] [blame] | 2409 | emit_diff_symbol(o, DIFF_SYMBOL_CONTEXT_INCOMPLETE, |
| 2410 | line, len, 0); |
Junio C Hamano | 0e383e1 | 2015-05-26 09:56:33 -0700 | [diff] [blame] | 2411 | break; |
Junio C Hamano | 448c3ef | 2006-09-22 22:48:39 -0700 | [diff] [blame] | 2412 | } |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 2413 | } |
| 2414 | |
Nguyễn Thái Ngọc Duy | c905cbc | 2018-02-01 20:02:20 +0700 | [diff] [blame] | 2415 | static void pprint_rename(struct strbuf *name, const char *a, const char *b) |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 2416 | { |
Brandon Williams | 63a01c3 | 2018-02-14 10:59:39 -0800 | [diff] [blame] | 2417 | const char *old_name = a; |
| 2418 | const char *new_name = b; |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 2419 | int pfx_length, sfx_length; |
Thomas Rast | dd281f0 | 2013-02-26 21:47:01 +0100 | [diff] [blame] | 2420 | int pfx_adjust_for_slash; |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 2421 | int len_a = strlen(a); |
| 2422 | int len_b = strlen(b); |
Pierre Habouzit | 663af34 | 2007-09-20 00:42:15 +0200 | [diff] [blame] | 2423 | int a_midlen, b_midlen; |
Alexandre Julliard | e5bfbf9 | 2007-02-10 15:39:00 +0100 | [diff] [blame] | 2424 | 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 Duy | c905cbc | 2018-02-01 20:02:20 +0700 | [diff] [blame] | 2428 | quote_c_style(a, name, NULL, 0); |
| 2429 | strbuf_addstr(name, " => "); |
| 2430 | quote_c_style(b, name, NULL, 0); |
| 2431 | return; |
Alexandre Julliard | e5bfbf9 | 2007-02-10 15:39:00 +0100 | [diff] [blame] | 2432 | } |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 2433 | |
| 2434 | /* Find common prefix */ |
| 2435 | pfx_length = 0; |
Brandon Williams | 63a01c3 | 2018-02-14 10:59:39 -0800 | [diff] [blame] | 2436 | 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 Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 2441 | } |
| 2442 | |
| 2443 | /* Find common suffix */ |
Brandon Williams | 63a01c3 | 2018-02-14 10:59:39 -0800 | [diff] [blame] | 2444 | old_name = a + len_a; |
| 2445 | new_name = b + len_b; |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 2446 | sfx_length = 0; |
Antoine Pelisse | d020e27 | 2013-02-23 17:48:45 +0100 | [diff] [blame] | 2447 | /* |
Thomas Rast | dd281f0 | 2013-02-26 21:47:01 +0100 | [diff] [blame] | 2448 | * 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 Pelisse | d020e27 | 2013-02-23 17:48:45 +0100 | [diff] [blame] | 2454 | */ |
Thomas Rast | dd281f0 | 2013-02-26 21:47:01 +0100 | [diff] [blame] | 2455 | pfx_adjust_for_slash = (pfx_length ? 1 : 0); |
Brandon Williams | 63a01c3 | 2018-02-14 10:59:39 -0800 | [diff] [blame] | 2456 | 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 Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 2463 | } |
| 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 Habouzit | 663af34 | 2007-09-20 00:42:15 +0200 | [diff] [blame] | 2471 | 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 Hamano | cc908b8 | 2006-05-14 22:07:28 -0700 | [diff] [blame] | 2477 | |
Nguyễn Thái Ngọc Duy | c905cbc | 2018-02-01 20:02:20 +0700 | [diff] [blame] | 2478 | strbuf_grow(name, pfx_length + a_midlen + b_midlen + sfx_length + 7); |
Pierre Habouzit | 663af34 | 2007-09-20 00:42:15 +0200 | [diff] [blame] | 2479 | if (pfx_length + sfx_length) { |
Nguyễn Thái Ngọc Duy | c905cbc | 2018-02-01 20:02:20 +0700 | [diff] [blame] | 2480 | strbuf_add(name, a, pfx_length); |
| 2481 | strbuf_addch(name, '{'); |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 2482 | } |
Nguyễn Thái Ngọc Duy | c905cbc | 2018-02-01 20:02:20 +0700 | [diff] [blame] | 2483 | strbuf_add(name, a + pfx_length, a_midlen); |
| 2484 | strbuf_addstr(name, " => "); |
| 2485 | strbuf_add(name, b + pfx_length, b_midlen); |
Pierre Habouzit | 663af34 | 2007-09-20 00:42:15 +0200 | [diff] [blame] | 2486 | if (pfx_length + sfx_length) { |
Nguyễn Thái Ngọc Duy | c905cbc | 2018-02-01 20:02:20 +0700 | [diff] [blame] | 2487 | strbuf_addch(name, '}'); |
| 2488 | strbuf_add(name, a + len_a - sfx_length, sfx_length); |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 2489 | } |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 2490 | } |
| 2491 | |
| 2492 | struct diffstat_t { |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 2493 | int nr; |
| 2494 | int alloc; |
| 2495 | struct diffstat_file { |
Junio C Hamano | f604652 | 2007-12-11 23:46:30 -0800 | [diff] [blame] | 2496 | char *from_name; |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 2497 | char *name; |
Junio C Hamano | f604652 | 2007-12-11 23:46:30 -0800 | [diff] [blame] | 2498 | char *print_name; |
Nguyễn Thái Ngọc Duy | ddf88fa | 2018-02-24 21:09:59 +0700 | [diff] [blame] | 2499 | const char *comments; |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 2500 | unsigned is_unmerged:1; |
| 2501 | unsigned is_binary:1; |
| 2502 | unsigned is_renamed:1; |
Linus Torvalds | 74faaa1 | 2012-10-17 10:00:37 -0700 | [diff] [blame] | 2503 | unsigned is_interesting:1; |
Jeff King | 0974c11 | 2010-04-17 13:41:08 -0400 | [diff] [blame] | 2504 | uintmax_t added, deleted; |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 2505 | } **files; |
| 2506 | }; |
| 2507 | |
| 2508 | static 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 Gesiak | 1a4927c | 2014-05-27 00:33:47 +0900 | [diff] [blame] | 2513 | x = xcalloc(1, sizeof(*x)); |
Dmitry S. Dolzhenko | 4c960a4 | 2014-03-04 02:31:53 +0400 | [diff] [blame] | 2514 | ALLOC_GROW(diffstat->files, diffstat->nr + 1, diffstat->alloc); |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 2515 | diffstat->files[diffstat->nr++] = x; |
| 2516 | if (name_b) { |
Junio C Hamano | f604652 | 2007-12-11 23:46:30 -0800 | [diff] [blame] | 2517 | x->from_name = xstrdup(name_a); |
| 2518 | x->name = xstrdup(name_b); |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 2519 | x->is_renamed = 1; |
| 2520 | } |
Junio C Hamano | f604652 | 2007-12-11 23:46:30 -0800 | [diff] [blame] | 2521 | else { |
| 2522 | x->from_name = NULL; |
Shawn Pearce | 9befac4 | 2006-09-02 00:16:31 -0400 | [diff] [blame] | 2523 | x->name = xstrdup(name_a); |
Junio C Hamano | f604652 | 2007-12-11 23:46:30 -0800 | [diff] [blame] | 2524 | } |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 2525 | return x; |
| 2526 | } |
| 2527 | |
| 2528 | static 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 Schindelin | 698ce6f | 2006-05-20 15:40:29 +0200 | [diff] [blame] | 2539 | const char mime_boundary_leader[] = "------------"; |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 2540 | |
Junio C Hamano | a254002 | 2006-09-26 18:53:02 -0700 | [diff] [blame] | 2541 | static int scale_linear(int it, int width, int max_change) |
| 2542 | { |
Junio C Hamano | 2eeeef2 | 2012-02-14 13:49:11 -0800 | [diff] [blame] | 2543 | if (!it) |
| 2544 | return 0; |
Junio C Hamano | a254002 | 2006-09-26 18:53:02 -0700 | [diff] [blame] | 2545 | /* |
Junio C Hamano | 2eeeef2 | 2012-02-14 13:49:11 -0800 | [diff] [blame] | 2546 | * 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 Hamano | a254002 | 2006-09-26 18:53:02 -0700 | [diff] [blame] | 2550 | */ |
Junio C Hamano | 2eeeef2 | 2012-02-14 13:49:11 -0800 | [diff] [blame] | 2551 | return 1 + (it * (width - 1) / max_change); |
Junio C Hamano | a254002 | 2006-09-26 18:53:02 -0700 | [diff] [blame] | 2552 | } |
| 2553 | |
Stefan Beller | 0911c47 | 2017-06-29 17:07:02 -0700 | [diff] [blame] | 2554 | static void show_graph(struct strbuf *out, char ch, int cnt, |
| 2555 | const char *set, const char *reset) |
Junio C Hamano | a254002 | 2006-09-26 18:53:02 -0700 | [diff] [blame] | 2556 | { |
| 2557 | if (cnt <= 0) |
| 2558 | return; |
Stefan Beller | 0911c47 | 2017-06-29 17:07:02 -0700 | [diff] [blame] | 2559 | strbuf_addstr(out, set); |
| 2560 | strbuf_addchars(out, ch, cnt); |
| 2561 | strbuf_addstr(out, reset); |
Junio C Hamano | a254002 | 2006-09-26 18:53:02 -0700 | [diff] [blame] | 2562 | } |
| 2563 | |
Junio C Hamano | f604652 | 2007-12-11 23:46:30 -0800 | [diff] [blame] | 2564 | static void fill_print_name(struct diffstat_file *file) |
| 2565 | { |
Nguyễn Thái Ngọc Duy | c905cbc | 2018-02-01 20:02:20 +0700 | [diff] [blame] | 2566 | struct strbuf pname = STRBUF_INIT; |
Junio C Hamano | f604652 | 2007-12-11 23:46:30 -0800 | [diff] [blame] | 2567 | |
| 2568 | if (file->print_name) |
| 2569 | return; |
| 2570 | |
Nguyễn Thái Ngọc Duy | c905cbc | 2018-02-01 20:02:20 +0700 | [diff] [blame] | 2571 | 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 Duy | ddf88fa | 2018-02-24 21:09:59 +0700 | [diff] [blame] | 2576 | if (file->comments) |
| 2577 | strbuf_addf(&pname, " (%s)", file->comments); |
| 2578 | |
Nguyễn Thái Ngọc Duy | c905cbc | 2018-02-01 20:02:20 +0700 | [diff] [blame] | 2579 | file->print_name = strbuf_detach(&pname, NULL); |
Junio C Hamano | f604652 | 2007-12-11 23:46:30 -0800 | [diff] [blame] | 2580 | } |
| 2581 | |
Stefan Beller | 0911c47 | 2017-06-29 17:07:02 -0700 | [diff] [blame] | 2582 | static void print_stat_summary_inserts_deletes(struct diff_options *options, |
| 2583 | int files, int insertions, int deletions) |
Nguyễn Thái Ngọc Duy | 7f81463 | 2012-02-01 19:55:07 +0700 | [diff] [blame] | 2584 | { |
| 2585 | struct strbuf sb = STRBUF_INIT; |
Nguyễn Thái Ngọc Duy | 7f81463 | 2012-02-01 19:55:07 +0700 | [diff] [blame] | 2586 | |
| 2587 | if (!files) { |
| 2588 | assert(insertions == 0 && deletions == 0); |
Stefan Beller | 0911c47 | 2017-06-29 17:07:02 -0700 | [diff] [blame] | 2589 | emit_diff_symbol(options, DIFF_SYMBOL_STATS_SUMMARY_NO_FILES, |
| 2590 | NULL, 0, 0); |
| 2591 | return; |
Nguyễn Thái Ngọc Duy | 7f81463 | 2012-02-01 19:55:07 +0700 | [diff] [blame] | 2592 | } |
| 2593 | |
| 2594 | strbuf_addf(&sb, |
Nguyễn Thái Ngọc Duy | 218adaa | 2012-09-13 21:16:26 +0700 | [diff] [blame] | 2595 | (files == 1) ? " %d file changed" : " %d files changed", |
Nguyễn Thái Ngọc Duy | 7f81463 | 2012-02-01 19:55:07 +0700 | [diff] [blame] | 2596 | 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 Duy | 7f81463 | 2012-02-01 19:55:07 +0700 | [diff] [blame] | 2607 | strbuf_addf(&sb, |
Nguyễn Thái Ngọc Duy | 218adaa | 2012-09-13 21:16:26 +0700 | [diff] [blame] | 2608 | (insertions == 1) ? ", %d insertion(+)" : ", %d insertions(+)", |
Nguyễn Thái Ngọc Duy | 7f81463 | 2012-02-01 19:55:07 +0700 | [diff] [blame] | 2609 | insertions); |
| 2610 | } |
| 2611 | |
| 2612 | if (deletions || insertions == 0) { |
Nguyễn Thái Ngọc Duy | 7f81463 | 2012-02-01 19:55:07 +0700 | [diff] [blame] | 2613 | strbuf_addf(&sb, |
Nguyễn Thái Ngọc Duy | 218adaa | 2012-09-13 21:16:26 +0700 | [diff] [blame] | 2614 | (deletions == 1) ? ", %d deletion(-)" : ", %d deletions(-)", |
Nguyễn Thái Ngọc Duy | 7f81463 | 2012-02-01 19:55:07 +0700 | [diff] [blame] | 2615 | deletions); |
| 2616 | } |
| 2617 | strbuf_addch(&sb, '\n'); |
Stefan Beller | 0911c47 | 2017-06-29 17:07:02 -0700 | [diff] [blame] | 2618 | emit_diff_symbol(options, DIFF_SYMBOL_STATS_SUMMARY_INSERTS_DELETES, |
| 2619 | sb.buf, sb.len, 0); |
Nguyễn Thái Ngọc Duy | 7f81463 | 2012-02-01 19:55:07 +0700 | [diff] [blame] | 2620 | strbuf_release(&sb); |
Stefan Beller | 0911c47 | 2017-06-29 17:07:02 -0700 | [diff] [blame] | 2621 | } |
| 2622 | |
| 2623 | void 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 Duy | 7f81463 | 2012-02-01 19:55:07 +0700 | [diff] [blame] | 2631 | } |
| 2632 | |
Felipe Contreras | 4b25d09 | 2009-05-01 12:06:36 +0300 | [diff] [blame] | 2633 | static void show_stats(struct diffstat_t *data, struct diff_options *options) |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 2634 | { |
Benjamin Kramer | eb3a9dd | 2009-03-07 21:02:10 +0100 | [diff] [blame] | 2635 | int i, len, add, del, adds = 0, dels = 0; |
Jeff King | 0974c11 | 2010-04-17 13:41:08 -0400 | [diff] [blame] | 2636 | uintmax_t max_change = 0, max_len = 0; |
Zbigniew Jędrzejewski-Szmek | dc801e7 | 2012-04-30 22:38:58 +0200 | [diff] [blame] | 2637 | int total_files = data->nr, count; |
| 2638 | int width, name_width, graph_width, number_width = 0, bin_width = 0; |
Johannes Schindelin | c0aa335 | 2011-03-22 13:50:08 +0100 | [diff] [blame] | 2639 | const char *reset, *add_c, *del_c; |
Junio C Hamano | e5f85df | 2011-05-27 21:50:39 -0700 | [diff] [blame] | 2640 | int extra_shown = 0; |
Stefan Beller | 0911c47 | 2017-06-29 17:07:02 -0700 | [diff] [blame] | 2641 | const char *line_prefix = diff_line_prefix(options); |
| 2642 | struct strbuf out = STRBUF_INIT; |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 2643 | |
| 2644 | if (data->nr == 0) |
| 2645 | return; |
| 2646 | |
Michael J Gruber | 808e1db | 2011-05-27 14:36:41 +0200 | [diff] [blame] | 2647 | count = options->stat_count ? options->stat_count : data->nr; |
Junio C Hamano | a254002 | 2006-09-26 18:53:02 -0700 | [diff] [blame] | 2648 | |
Pierre Habouzit | 8f67f8a | 2007-11-10 20:05:14 +0100 | [diff] [blame] | 2649 | reset = diff_get_color_opt(options, DIFF_RESET); |
Pierre Habouzit | 8f67f8a | 2007-11-10 20:05:14 +0100 | [diff] [blame] | 2650 | add_c = diff_get_color_opt(options, DIFF_FILE_NEW); |
| 2651 | del_c = diff_get_color_opt(options, DIFF_FILE_OLD); |
Junio C Hamano | 785f743 | 2006-09-26 18:59:41 -0700 | [diff] [blame] | 2652 | |
Zbigniew Jędrzejewski-Szmek | 1b058bc | 2012-03-01 13:26:43 +0100 | [diff] [blame] | 2653 | /* |
| 2654 | * Find the longest filename and max number of changes |
| 2655 | */ |
Michael J Gruber | 808e1db | 2011-05-27 14:36:41 +0200 | [diff] [blame] | 2656 | for (i = 0; (i < count) && (i < data->nr); i++) { |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 2657 | struct diffstat_file *file = data->files[i]; |
Jeff King | 0974c11 | 2010-04-17 13:41:08 -0400 | [diff] [blame] | 2658 | uintmax_t change = file->added + file->deleted; |
Junio C Hamano | af0ed81 | 2012-11-27 11:24:54 -0800 | [diff] [blame] | 2659 | |
| 2660 | if (!file->is_interesting && (change == 0)) { |
Michael J Gruber | 808e1db | 2011-05-27 14:36:41 +0200 | [diff] [blame] | 2661 | count++; /* not shown == room for one more */ |
Michael J Gruber | 358e460 | 2011-05-27 14:36:40 +0200 | [diff] [blame] | 2662 | continue; |
| 2663 | } |
Junio C Hamano | f604652 | 2007-12-11 23:46:30 -0800 | [diff] [blame] | 2664 | fill_print_name(file); |
| 2665 | len = strlen(file->print_name); |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 2666 | if (max_len < len) |
| 2667 | max_len = len; |
| 2668 | |
Zbigniew Jędrzejewski-Szmek | dc801e7 | 2012-04-30 22:38:58 +0200 | [diff] [blame] | 2669 | if (file->is_unmerged) { |
| 2670 | /* "Unmerged" is 8 characters */ |
| 2671 | bin_width = bin_width < 8 ? 8 : bin_width; |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 2672 | continue; |
Zbigniew Jędrzejewski-Szmek | dc801e7 | 2012-04-30 22:38:58 +0200 | [diff] [blame] | 2673 | } |
| 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 Hamano | a254002 | 2006-09-26 18:53:02 -0700 | [diff] [blame] | 2684 | if (max_change < change) |
| 2685 | max_change = change; |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 2686 | } |
Junio C Hamano | a20d3c0 | 2012-11-27 11:47:46 -0800 | [diff] [blame] | 2687 | count = i; /* where we can stop scanning in data->files[] */ |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 2688 | |
Zbigniew Jędrzejewski-Szmek | 1b058bc | 2012-03-01 13:26:43 +0100 | [diff] [blame] | 2689 | /* |
| 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-Szmek | 969fe57 | 2012-03-01 13:26:45 +0100 | [diff] [blame] | 2692 | * We want a maximum of min(max_change, stat_graph_width) for the +- part. |
Zbigniew Jędrzejewski-Szmek | 1b058bc | 2012-03-01 13:26:43 +0100 | [diff] [blame] | 2693 | * 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 Hamano | a254002 | 2006-09-26 18:53:02 -0700 | [diff] [blame] | 2696 | * |
Zbigniew Jędrzejewski-Szmek | 1b058bc | 2012-03-01 13:26:43 +0100 | [diff] [blame] | 2697 | * 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-Szmek | 969fe57 | 2012-03-01 13:26:45 +0100 | [diff] [blame] | 2699 | * and the rest for constant elements + graph part, but no more |
| 2700 | * than stat_graph_width for the graph part. |
Zbigniew Jędrzejewski-Szmek | 1b058bc | 2012-03-01 13:26:43 +0100 | [diff] [blame] | 2701 | * (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-Szmek | dc801e7 | 2012-04-30 22:38:58 +0200 | [diff] [blame] | 2708 | * |
| 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 Lattarini | 41ccfdd | 2013-04-12 00:36:10 +0200 | [diff] [blame] | 2712 | * "scaled". If total width is too small to accommodate the |
Zbigniew Jędrzejewski-Szmek | dc801e7 | 2012-04-30 22:38:58 +0200 | [diff] [blame] | 2713 | * 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 Hamano | a254002 | 2006-09-26 18:53:02 -0700 | [diff] [blame] | 2716 | */ |
Junio C Hamano | a254002 | 2006-09-26 18:53:02 -0700 | [diff] [blame] | 2717 | |
Zbigniew Jędrzejewski-Szmek | 1b058bc | 2012-03-01 13:26:43 +0100 | [diff] [blame] | 2718 | if (options->stat_width == -1) |
Junio C Hamano | cd48dad | 2016-08-31 16:27:19 -0700 | [diff] [blame] | 2719 | width = term_columns() - strlen(line_prefix); |
Zbigniew Jędrzejewski-Szmek | 1b058bc | 2012-03-01 13:26:43 +0100 | [diff] [blame] | 2720 | else |
| 2721 | width = options->stat_width ? options->stat_width : 80; |
Zbigniew Jędrzejewski-Szmek | dc801e7 | 2012-04-30 22:38:58 +0200 | [diff] [blame] | 2722 | number_width = decimal_width(max_change) > number_width ? |
| 2723 | decimal_width(max_change) : number_width; |
Zbigniew Jędrzejewski-Szmek | 1b058bc | 2012-03-01 13:26:43 +0100 | [diff] [blame] | 2724 | |
Zbigniew Jędrzejewski-Szmek | df44483 | 2012-03-01 13:26:46 +0100 | [diff] [blame] | 2725 | if (options->stat_graph_width == -1) |
| 2726 | options->stat_graph_width = diff_stat_graph_width; |
| 2727 | |
Zbigniew Jędrzejewski-Szmek | 1b058bc | 2012-03-01 13:26:43 +0100 | [diff] [blame] | 2728 | /* |
| 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-Szmek | dc801e7 | 2012-04-30 22:38:58 +0200 | [diff] [blame] | 2737 | * strlen("Bin XXX -> YYY bytes") == bin_width, and the part |
| 2738 | * starting from "XXX" should fit in graph_width. |
Zbigniew Jędrzejewski-Szmek | 1b058bc | 2012-03-01 13:26:43 +0100 | [diff] [blame] | 2739 | */ |
Zbigniew Jędrzejewski-Szmek | dc801e7 | 2012-04-30 22:38:58 +0200 | [diff] [blame] | 2740 | 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-Szmek | 1b058bc | 2012-03-01 13:26:43 +0100 | [diff] [blame] | 2745 | 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 Poston | 678c574 | 2012-04-18 14:12:18 -0700 | [diff] [blame] | 2753 | if (graph_width > width * 3/8 - number_width - 6) { |
Zbigniew Jędrzejewski-Szmek | 1b058bc | 2012-03-01 13:26:43 +0100 | [diff] [blame] | 2754 | graph_width = width * 3/8 - number_width - 6; |
Lucian Poston | 678c574 | 2012-04-18 14:12:18 -0700 | [diff] [blame] | 2755 | if (graph_width < 6) |
| 2756 | graph_width = 6; |
| 2757 | } |
| 2758 | |
Zbigniew Jędrzejewski-Szmek | 969fe57 | 2012-03-01 13:26:45 +0100 | [diff] [blame] | 2759 | if (options->stat_graph_width && |
| 2760 | graph_width > options->stat_graph_width) |
| 2761 | graph_width = options->stat_graph_width; |
Zbigniew Jędrzejewski-Szmek | 1b058bc | 2012-03-01 13:26:43 +0100 | [diff] [blame] | 2762 | 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 Gruber | 808e1db | 2011-05-27 14:36:41 +0200 | [diff] [blame] | 2773 | for (i = 0; i < count; i++) { |
Timo Hirvonen | d2543b8 | 2006-06-24 20:20:32 +0300 | [diff] [blame] | 2774 | const char *prefix = ""; |
Junio C Hamano | af0ed81 | 2012-11-27 11:24:54 -0800 | [diff] [blame] | 2775 | 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 Hamano | a254002 | 2006-09-26 18:53:02 -0700 | [diff] [blame] | 2779 | int name_len; |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 2780 | |
Junio C Hamano | a20d3c0 | 2012-11-27 11:47:46 -0800 | [diff] [blame] | 2781 | if (!file->is_interesting && (added + deleted == 0)) |
Michael J Gruber | 358e460 | 2011-05-27 14:36:40 +0200 | [diff] [blame] | 2782 | continue; |
Junio C Hamano | a20d3c0 | 2012-11-27 11:47:46 -0800 | [diff] [blame] | 2783 | |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 2784 | /* |
| 2785 | * "scale" the filename |
| 2786 | */ |
Junio C Hamano | a254002 | 2006-09-26 18:53:02 -0700 | [diff] [blame] | 2787 | len = name_width; |
| 2788 | name_len = strlen(name); |
| 2789 | if (name_width < name_len) { |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 2790 | char *slash; |
| 2791 | prefix = "..."; |
Junio C Hamano | a254002 | 2006-09-26 18:53:02 -0700 | [diff] [blame] | 2792 | len -= 3; |
| 2793 | name += name_len - len; |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 2794 | slash = strchr(name, '/'); |
| 2795 | if (slash) |
| 2796 | name = slash; |
| 2797 | } |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 2798 | |
Junio C Hamano | af0ed81 | 2012-11-27 11:24:54 -0800 | [diff] [blame] | 2799 | if (file->is_binary) { |
Stefan Beller | 0911c47 | 2017-06-29 17:07:02 -0700 | [diff] [blame] | 2800 | strbuf_addf(&out, " %s%-*s |", prefix, len, name); |
| 2801 | strbuf_addf(&out, " %*s", number_width, "Bin"); |
Zbigniew Jędrzejewski-Szmek | e18872b | 2012-05-01 19:10:14 +0200 | [diff] [blame] | 2802 | if (!added && !deleted) { |
Stefan Beller | 0911c47 | 2017-06-29 17:07:02 -0700 | [diff] [blame] | 2803 | 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-Szmek | e18872b | 2012-05-01 19:10:14 +0200 | [diff] [blame] | 2807 | continue; |
| 2808 | } |
Stefan Beller | 0911c47 | 2017-06-29 17:07:02 -0700 | [diff] [blame] | 2809 | strbuf_addf(&out, " %s%"PRIuMAX"%s", |
Jeff King | 0974c11 | 2010-04-17 13:41:08 -0400 | [diff] [blame] | 2810 | del_c, deleted, reset); |
Stefan Beller | 0911c47 | 2017-06-29 17:07:02 -0700 | [diff] [blame] | 2811 | strbuf_addstr(&out, " -> "); |
| 2812 | strbuf_addf(&out, "%s%"PRIuMAX"%s", |
Jeff King | 0974c11 | 2010-04-17 13:41:08 -0400 | [diff] [blame] | 2813 | add_c, added, reset); |
Stefan Beller | 0911c47 | 2017-06-29 17:07:02 -0700 | [diff] [blame] | 2814 | 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 Hamano | f604652 | 2007-12-11 23:46:30 -0800 | [diff] [blame] | 2818 | continue; |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 2819 | } |
Junio C Hamano | af0ed81 | 2012-11-27 11:24:54 -0800 | [diff] [blame] | 2820 | else if (file->is_unmerged) { |
Stefan Beller | 0911c47 | 2017-06-29 17:07:02 -0700 | [diff] [blame] | 2821 | 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 Hamano | f604652 | 2007-12-11 23:46:30 -0800 | [diff] [blame] | 2826 | continue; |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 2827 | } |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 2828 | |
Junio C Hamano | a254002 | 2006-09-26 18:53:02 -0700 | [diff] [blame] | 2829 | /* |
| 2830 | * scale the add/delete |
| 2831 | */ |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 2832 | add = added; |
| 2833 | del = deleted; |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 2834 | |
Zbigniew Jędrzejewski-Szmek | 1b058bc | 2012-03-01 13:26:43 +0100 | [diff] [blame] | 2835 | if (graph_width <= max_change) { |
Stefan Beller | d3c9cf3 | 2013-07-14 23:35:49 +0200 | [diff] [blame] | 2836 | int total = scale_linear(add + del, graph_width, max_change); |
Junio C Hamano | 2eeeef2 | 2012-02-14 13:49:11 -0800 | [diff] [blame] | 2837 | if (total < 2 && add && del) |
| 2838 | /* width >= 2 due to the sanity check */ |
| 2839 | total = 2; |
| 2840 | if (add < del) { |
Zbigniew Jędrzejewski-Szmek | 1b058bc | 2012-03-01 13:26:43 +0100 | [diff] [blame] | 2841 | add = scale_linear(add, graph_width, max_change); |
Junio C Hamano | 2eeeef2 | 2012-02-14 13:49:11 -0800 | [diff] [blame] | 2842 | del = total - add; |
| 2843 | } else { |
Zbigniew Jędrzejewski-Szmek | 1b058bc | 2012-03-01 13:26:43 +0100 | [diff] [blame] | 2844 | del = scale_linear(del, graph_width, max_change); |
Junio C Hamano | 2eeeef2 | 2012-02-14 13:49:11 -0800 | [diff] [blame] | 2845 | add = total - del; |
| 2846 | } |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 2847 | } |
Stefan Beller | 0911c47 | 2017-06-29 17:07:02 -0700 | [diff] [blame] | 2848 | strbuf_addf(&out, " %s%-*s |", prefix, len, name); |
| 2849 | strbuf_addf(&out, " %*"PRIuMAX"%s", |
Zbigniew Jędrzejewski-Szmek | dc801e7 | 2012-04-30 22:38:58 +0200 | [diff] [blame] | 2850 | number_width, added + deleted, |
| 2851 | added + deleted ? " " : ""); |
Stefan Beller | 0911c47 | 2017-06-29 17:07:02 -0700 | [diff] [blame] | 2852 | 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 Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 2858 | } |
Junio C Hamano | a20d3c0 | 2012-11-27 11:47:46 -0800 | [diff] [blame] | 2859 | |
| 2860 | for (i = 0; i < data->nr; i++) { |
Junio C Hamano | af0ed81 | 2012-11-27 11:24:54 -0800 | [diff] [blame] | 2861 | struct diffstat_file *file = data->files[i]; |
| 2862 | uintmax_t added = file->added; |
| 2863 | uintmax_t deleted = file->deleted; |
Junio C Hamano | 82dfc2c | 2012-11-27 12:05:10 -0800 | [diff] [blame] | 2864 | |
| 2865 | if (file->is_unmerged || |
| 2866 | (!file->is_interesting && (added + deleted == 0))) { |
Michael J Gruber | 808e1db | 2011-05-27 14:36:41 +0200 | [diff] [blame] | 2867 | total_files--; |
| 2868 | continue; |
| 2869 | } |
Junio C Hamano | a20d3c0 | 2012-11-27 11:47:46 -0800 | [diff] [blame] | 2870 | |
Junio C Hamano | 82dfc2c | 2012-11-27 12:05:10 -0800 | [diff] [blame] | 2871 | if (!file->is_binary) { |
Junio C Hamano | a20d3c0 | 2012-11-27 11:47:46 -0800 | [diff] [blame] | 2872 | adds += added; |
| 2873 | dels += deleted; |
| 2874 | } |
| 2875 | if (i < count) |
| 2876 | continue; |
Junio C Hamano | e5f85df | 2011-05-27 21:50:39 -0700 | [diff] [blame] | 2877 | if (!extra_shown) |
Stefan Beller | 0911c47 | 2017-06-29 17:07:02 -0700 | [diff] [blame] | 2878 | emit_diff_symbol(options, |
| 2879 | DIFF_SYMBOL_STATS_SUMMARY_ABBREV, |
| 2880 | NULL, 0, 0); |
Junio C Hamano | e5f85df | 2011-05-27 21:50:39 -0700 | [diff] [blame] | 2881 | extra_shown = 1; |
Michael J Gruber | 808e1db | 2011-05-27 14:36:41 +0200 | [diff] [blame] | 2882 | } |
Stefan Beller | 0911c47 | 2017-06-29 17:07:02 -0700 | [diff] [blame] | 2883 | |
| 2884 | print_stat_summary_inserts_deletes(options, total_files, adds, dels); |
Rene Scharfe | 5a61201 | 2017-08-30 19:49:43 +0200 | [diff] [blame] | 2885 | strbuf_release(&out); |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 2886 | } |
| 2887 | |
Felipe Contreras | 2775d92 | 2009-10-11 23:46:11 +0300 | [diff] [blame] | 2888 | static void show_shortstats(struct diffstat_t *data, struct diff_options *options) |
Nicolas Pitre | ebd124c | 2006-12-14 23:15:44 -0500 | [diff] [blame] | 2889 | { |
| 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-Szmek | e18872b | 2012-05-01 19:10:14 +0200 | [diff] [blame] | 2896 | int added = data->files[i]->added; |
Stefan Beller | 0911c47 | 2017-06-29 17:07:02 -0700 | [diff] [blame] | 2897 | int deleted = data->files[i]->deleted; |
Zbigniew Jędrzejewski-Szmek | e18872b | 2012-05-01 19:10:14 +0200 | [diff] [blame] | 2898 | |
Junio C Hamano | 20c8cde | 2012-11-27 14:19:36 -0800 | [diff] [blame] | 2899 | if (data->files[i]->is_unmerged || |
| 2900 | (!data->files[i]->is_interesting && (added + deleted == 0))) { |
Zbigniew Jędrzejewski-Szmek | e18872b | 2012-05-01 19:10:14 +0200 | [diff] [blame] | 2901 | total_files--; |
Alexander Strasser | de9658b | 2012-06-15 23:50:30 +0200 | [diff] [blame] | 2902 | } else if (!data->files[i]->is_binary) { /* don't count bytes */ |
Zbigniew Jędrzejewski-Szmek | e18872b | 2012-05-01 19:10:14 +0200 | [diff] [blame] | 2903 | adds += added; |
| 2904 | dels += deleted; |
Nicolas Pitre | ebd124c | 2006-12-14 23:15:44 -0500 | [diff] [blame] | 2905 | } |
Nicolas Pitre | ebd124c | 2006-12-14 23:15:44 -0500 | [diff] [blame] | 2906 | } |
Stefan Beller | 0911c47 | 2017-06-29 17:07:02 -0700 | [diff] [blame] | 2907 | print_stat_summary_inserts_deletes(options, total_files, adds, dels); |
Nicolas Pitre | ebd124c | 2006-12-14 23:15:44 -0500 | [diff] [blame] | 2908 | } |
| 2909 | |
Felipe Contreras | 4b25d09 | 2009-05-01 12:06:36 +0300 | [diff] [blame] | 2910 | static void show_numstat(struct diffstat_t *data, struct diff_options *options) |
Junio C Hamano | 74e2abe | 2006-10-12 03:01:00 -0700 | [diff] [blame] | 2911 | { |
| 2912 | int i; |
| 2913 | |
Junio C Hamano | f604652 | 2007-12-11 23:46:30 -0800 | [diff] [blame] | 2914 | if (data->nr == 0) |
| 2915 | return; |
| 2916 | |
Junio C Hamano | 74e2abe | 2006-10-12 03:01:00 -0700 | [diff] [blame] | 2917 | for (i = 0; i < data->nr; i++) { |
| 2918 | struct diffstat_file *file = data->files[i]; |
| 2919 | |
John Keeping | 30997bb | 2013-02-07 20:15:27 +0000 | [diff] [blame] | 2920 | fprintf(options->file, "%s", diff_line_prefix(options)); |
Bo Yang | 7be5761 | 2010-05-26 15:23:54 +0800 | [diff] [blame] | 2921 | |
Junio C Hamano | bfddbc5 | 2006-12-10 13:50:59 -0800 | [diff] [blame] | 2922 | if (file->is_binary) |
Daniel Barkalow | c0c7773 | 2008-03-09 22:43:39 -0400 | [diff] [blame] | 2923 | fprintf(options->file, "-\t-\t"); |
Junio C Hamano | bfddbc5 | 2006-12-10 13:50:59 -0800 | [diff] [blame] | 2924 | else |
Daniel Barkalow | c0c7773 | 2008-03-09 22:43:39 -0400 | [diff] [blame] | 2925 | fprintf(options->file, |
Jeff King | 0974c11 | 2010-04-17 13:41:08 -0400 | [diff] [blame] | 2926 | "%"PRIuMAX"\t%"PRIuMAX"\t", |
| 2927 | file->added, file->deleted); |
Junio C Hamano | f604652 | 2007-12-11 23:46:30 -0800 | [diff] [blame] | 2928 | if (options->line_termination) { |
| 2929 | fill_print_name(file); |
| 2930 | if (!file->is_renamed) |
Daniel Barkalow | c0c7773 | 2008-03-09 22:43:39 -0400 | [diff] [blame] | 2931 | write_name_quoted(file->name, options->file, |
Junio C Hamano | f604652 | 2007-12-11 23:46:30 -0800 | [diff] [blame] | 2932 | options->line_termination); |
| 2933 | else { |
Daniel Barkalow | c0c7773 | 2008-03-09 22:43:39 -0400 | [diff] [blame] | 2934 | fputs(file->print_name, options->file); |
| 2935 | putc(options->line_termination, options->file); |
Junio C Hamano | f604652 | 2007-12-11 23:46:30 -0800 | [diff] [blame] | 2936 | } |
Pierre Habouzit | 663af34 | 2007-09-20 00:42:15 +0200 | [diff] [blame] | 2937 | } else { |
Junio C Hamano | f604652 | 2007-12-11 23:46:30 -0800 | [diff] [blame] | 2938 | if (file->is_renamed) { |
Daniel Barkalow | c0c7773 | 2008-03-09 22:43:39 -0400 | [diff] [blame] | 2939 | putc('\0', options->file); |
| 2940 | write_name_quoted(file->from_name, options->file, '\0'); |
Junio C Hamano | f604652 | 2007-12-11 23:46:30 -0800 | [diff] [blame] | 2941 | } |
Daniel Barkalow | c0c7773 | 2008-03-09 22:43:39 -0400 | [diff] [blame] | 2942 | write_name_quoted(file->name, options->file, '\0'); |
Pierre Habouzit | 663af34 | 2007-09-20 00:42:15 +0200 | [diff] [blame] | 2943 | } |
Junio C Hamano | 74e2abe | 2006-10-12 03:01:00 -0700 | [diff] [blame] | 2944 | } |
| 2945 | } |
| 2946 | |
Junio C Hamano | c04a715 | 2008-02-12 17:06:58 -0800 | [diff] [blame] | 2947 | struct dirstat_file { |
| 2948 | const char *name; |
| 2949 | unsigned long changed; |
Linus Torvalds | 7df7c01 | 2008-02-12 13:26:31 -0800 | [diff] [blame] | 2950 | }; |
| 2951 | |
Junio C Hamano | c04a715 | 2008-02-12 17:06:58 -0800 | [diff] [blame] | 2952 | struct dirstat_dir { |
| 2953 | struct dirstat_file *files; |
Johan Herland | 712d2c7 | 2011-04-29 11:36:20 +0200 | [diff] [blame] | 2954 | int alloc, nr, permille, cumulative; |
Junio C Hamano | c04a715 | 2008-02-12 17:06:58 -0800 | [diff] [blame] | 2955 | }; |
| 2956 | |
Bo Yang | 7be5761 | 2010-05-26 15:23:54 +0800 | [diff] [blame] | 2957 | static long gather_dirstat(struct diff_options *opt, struct dirstat_dir *dir, |
| 2958 | unsigned long changed, const char *base, int baselen) |
Linus Torvalds | 7df7c01 | 2008-02-12 13:26:31 -0800 | [diff] [blame] | 2959 | { |
Brandon Williams | 585c0e2 | 2018-02-14 10:59:28 -0800 | [diff] [blame] | 2960 | unsigned long sum_changes = 0; |
Linus Torvalds | 7df7c01 | 2008-02-12 13:26:31 -0800 | [diff] [blame] | 2961 | unsigned int sources = 0; |
John Keeping | 30997bb | 2013-02-07 20:15:27 +0000 | [diff] [blame] | 2962 | const char *line_prefix = diff_line_prefix(opt); |
Linus Torvalds | 7df7c01 | 2008-02-12 13:26:31 -0800 | [diff] [blame] | 2963 | |
| 2964 | while (dir->nr) { |
Junio C Hamano | c04a715 | 2008-02-12 17:06:58 -0800 | [diff] [blame] | 2965 | struct dirstat_file *f = dir->files; |
Linus Torvalds | 7df7c01 | 2008-02-12 13:26:31 -0800 | [diff] [blame] | 2966 | int namelen = strlen(f->name); |
Brandon Williams | 585c0e2 | 2018-02-14 10:59:28 -0800 | [diff] [blame] | 2967 | unsigned long changes; |
Linus Torvalds | 7df7c01 | 2008-02-12 13:26:31 -0800 | [diff] [blame] | 2968 | 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 Williams | 585c0e2 | 2018-02-14 10:59:28 -0800 | [diff] [blame] | 2977 | changes = gather_dirstat(opt, dir, changed, f->name, newbaselen); |
Linus Torvalds | 7df7c01 | 2008-02-12 13:26:31 -0800 | [diff] [blame] | 2978 | sources++; |
| 2979 | } else { |
Brandon Williams | 585c0e2 | 2018-02-14 10:59:28 -0800 | [diff] [blame] | 2980 | changes = f->changed; |
Linus Torvalds | 7df7c01 | 2008-02-12 13:26:31 -0800 | [diff] [blame] | 2981 | dir->files++; |
| 2982 | dir->nr--; |
| 2983 | sources += 2; |
| 2984 | } |
Brandon Williams | 585c0e2 | 2018-02-14 10:59:28 -0800 | [diff] [blame] | 2985 | sum_changes += changes; |
Linus Torvalds | 7df7c01 | 2008-02-12 13:26:31 -0800 | [diff] [blame] | 2986 | } |
| 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 Williams | 585c0e2 | 2018-02-14 10:59:28 -0800 | [diff] [blame] | 2995 | if (sum_changes) { |
| 2996 | int permille = sum_changes * 1000 / changed; |
Johan Herland | 712d2c7 | 2011-04-29 11:36:20 +0200 | [diff] [blame] | 2997 | if (permille >= dir->permille) { |
Bo Yang | 7be5761 | 2010-05-26 15:23:54 +0800 | [diff] [blame] | 2998 | fprintf(opt->file, "%s%4d.%01d%% %.*s\n", line_prefix, |
Johan Herland | 712d2c7 | 2011-04-29 11:36:20 +0200 | [diff] [blame] | 2999 | permille / 10, permille % 10, baselen, base); |
Linus Torvalds | 7df7c01 | 2008-02-12 13:26:31 -0800 | [diff] [blame] | 3000 | if (!dir->cumulative) |
| 3001 | return 0; |
| 3002 | } |
| 3003 | } |
| 3004 | } |
Brandon Williams | 585c0e2 | 2018-02-14 10:59:28 -0800 | [diff] [blame] | 3005 | return sum_changes; |
Linus Torvalds | 7df7c01 | 2008-02-12 13:26:31 -0800 | [diff] [blame] | 3006 | } |
| 3007 | |
Linus Torvalds | 441bca0 | 2008-08-28 16:19:08 -0700 | [diff] [blame] | 3008 | static 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 Hamano | c04a715 | 2008-02-12 17:06:58 -0800 | [diff] [blame] | 3015 | static void show_dirstat(struct diff_options *options) |
Linus Torvalds | 7df7c01 | 2008-02-12 13:26:31 -0800 | [diff] [blame] | 3016 | { |
| 3017 | int i; |
| 3018 | unsigned long changed; |
Junio C Hamano | c04a715 | 2008-02-12 17:06:58 -0800 | [diff] [blame] | 3019 | struct dirstat_dir dir; |
| 3020 | struct diff_queue_struct *q = &diff_queued_diff; |
Linus Torvalds | 7df7c01 | 2008-02-12 13:26:31 -0800 | [diff] [blame] | 3021 | |
Junio C Hamano | c04a715 | 2008-02-12 17:06:58 -0800 | [diff] [blame] | 3022 | dir.files = NULL; |
| 3023 | dir.alloc = 0; |
| 3024 | dir.nr = 0; |
Johan Herland | 712d2c7 | 2011-04-29 11:36:20 +0200 | [diff] [blame] | 3025 | dir.permille = options->dirstat_permille; |
Brandon Williams | 0d1e0e7 | 2017-10-31 11:19:11 -0700 | [diff] [blame] | 3026 | dir.cumulative = options->flags.dirstat_cumulative; |
Junio C Hamano | c04a715 | 2008-02-12 17:06:58 -0800 | [diff] [blame] | 3027 | |
Linus Torvalds | 7df7c01 | 2008-02-12 13:26:31 -0800 | [diff] [blame] | 3028 | changed = 0; |
Junio C Hamano | c04a715 | 2008-02-12 17:06:58 -0800 | [diff] [blame] | 3029 | 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 Herland | 2ca8671 | 2011-04-12 11:24:34 +0200 | [diff] [blame] | 3034 | name = p->two->path ? p->two->path : p->one->path; |
Junio C Hamano | c04a715 | 2008-02-12 17:06:58 -0800 | [diff] [blame] | 3035 | |
Jeff King | d9f62df | 2018-08-28 17:23:03 -0400 | [diff] [blame] | 3036 | if (p->one->oid_valid && p->two->oid_valid && |
| 3037 | oideq(&p->one->oid, &p->two->oid)) { |
Johan Herland | 2ff3a80 | 2011-04-11 00:48:52 +0200 | [diff] [blame] | 3038 | /* |
| 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 Williams | 0d1e0e7 | 2017-10-31 11:19:11 -0700 | [diff] [blame] | 3047 | if (options->flags.dirstat_by_file) { |
Johan Herland | 0133dab | 2011-04-11 00:48:51 +0200 | [diff] [blame] | 3048 | /* |
| 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 Herland | 2ff3a80 | 2011-04-11 00:48:52 +0200 | [diff] [blame] | 3055 | damage = 1; |
Johan Herland | 0133dab | 2011-04-11 00:48:51 +0200 | [diff] [blame] | 3056 | goto found_damage; |
| 3057 | } |
Junio C Hamano | c04a715 | 2008-02-12 17:06:58 -0800 | [diff] [blame] | 3058 | |
| 3059 | if (DIFF_FILE_VALID(p->one) && DIFF_FILE_VALID(p->two)) { |
Nguyễn Thái Ngọc Duy | b78ea5f | 2018-09-21 17:57:19 +0200 | [diff] [blame] | 3060 | 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 Hamano | c04a715 | 2008-02-12 17:06:58 -0800 | [diff] [blame] | 3064 | &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 Duy | b78ea5f | 2018-09-21 17:57:19 +0200 | [diff] [blame] | 3068 | diff_populate_filespec(options->repo, p->one, CHECK_SIZE_ONLY); |
Junio C Hamano | c04a715 | 2008-02-12 17:06:58 -0800 | [diff] [blame] | 3069 | copied = added = 0; |
| 3070 | diff_free_filespec_data(p->one); |
| 3071 | } else if (DIFF_FILE_VALID(p->two)) { |
Nguyễn Thái Ngọc Duy | b78ea5f | 2018-09-21 17:57:19 +0200 | [diff] [blame] | 3072 | diff_populate_filespec(options->repo, p->two, CHECK_SIZE_ONLY); |
Junio C Hamano | c04a715 | 2008-02-12 17:06:58 -0800 | [diff] [blame] | 3073 | copied = 0; |
| 3074 | added = p->two->size; |
| 3075 | diff_free_filespec_data(p->two); |
| 3076 | } else |
Junio C Hamano | 2b0b551 | 2008-02-24 17:37:15 -0800 | [diff] [blame] | 3077 | continue; |
Junio C Hamano | c04a715 | 2008-02-12 17:06:58 -0800 | [diff] [blame] | 3078 | |
| 3079 | /* |
| 3080 | * Original minus copied is the removed material, |
| 3081 | * added is the new material. They are both damages |
Johan Herland | 0133dab | 2011-04-11 00:48:51 +0200 | [diff] [blame] | 3082 | * made to the preimage. |
Johan Herland | 2ff3a80 | 2011-04-11 00:48:52 +0200 | [diff] [blame] | 3083 | * If the resulting damage is zero, we know that |
| 3084 | * diffcore_count_changes() considers the two entries to |
Jeff King | d9f62df | 2018-08-28 17:23:03 -0400 | [diff] [blame] | 3085 | * be identical, but since the oid changed, we |
Johan Herland | 2ff3a80 | 2011-04-11 00:48:52 +0200 | [diff] [blame] | 3086 | * know that there must have been _some_ kind of change, |
| 3087 | * so we force all entries to have damage > 0. |
Junio C Hamano | c04a715 | 2008-02-12 17:06:58 -0800 | [diff] [blame] | 3088 | */ |
| 3089 | damage = (p->one->size - copied) + added; |
Johan Herland | 2ff3a80 | 2011-04-11 00:48:52 +0200 | [diff] [blame] | 3090 | if (!damage) |
Heikki Orsila | fd33777 | 2008-09-05 22:27:35 +0300 | [diff] [blame] | 3091 | damage = 1; |
Junio C Hamano | c04a715 | 2008-02-12 17:06:58 -0800 | [diff] [blame] | 3092 | |
Johan Herland | 0133dab | 2011-04-11 00:48:51 +0200 | [diff] [blame] | 3093 | found_damage: |
Junio C Hamano | c04a715 | 2008-02-12 17:06:58 -0800 | [diff] [blame] | 3094 | 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 Torvalds | 7df7c01 | 2008-02-12 13:26:31 -0800 | [diff] [blame] | 3099 | } |
| 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é Scharfe | 9ed0d8d | 2016-09-29 17:27:31 +0200 | [diff] [blame] | 3106 | QSORT(dir.files, dir.nr, dirstat_compare); |
Bo Yang | 7be5761 | 2010-05-26 15:23:54 +0800 | [diff] [blame] | 3107 | gather_dirstat(options, &dir, changed, "", 0); |
Linus Torvalds | 7df7c01 | 2008-02-12 13:26:31 -0800 | [diff] [blame] | 3108 | } |
| 3109 | |
Johan Herland | 1c57a62 | 2011-04-29 11:36:21 +0200 | [diff] [blame] | 3110 | static 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 Williams | 0d1e0e7 | 2017-10-31 11:19:11 -0700 | [diff] [blame] | 3123 | dir.cumulative = options->flags.dirstat_cumulative; |
Johan Herland | 1c57a62 | 2011-04-29 11:36:21 +0200 | [diff] [blame] | 3124 | |
| 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é Scharfe | 42c78a2 | 2017-07-08 12:35:35 +0200 | [diff] [blame] | 3137 | damage = DIV_ROUND_UP(damage, 64); |
Johan Herland | 1c57a62 | 2011-04-29 11:36:21 +0200 | [diff] [blame] | 3138 | 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é Scharfe | 9ed0d8d | 2016-09-29 17:27:31 +0200 | [diff] [blame] | 3150 | QSORT(dir.files, dir.nr, dirstat_compare); |
Johan Herland | 1c57a62 | 2011-04-29 11:36:21 +0200 | [diff] [blame] | 3151 | gather_dirstat(options, &dir, changed, "", 0); |
| 3152 | } |
| 3153 | |
Junio C Hamano | f604652 | 2007-12-11 23:46:30 -0800 | [diff] [blame] | 3154 | static 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 Duy | c905cbc | 2018-02-01 20:02:20 +0700 | [diff] [blame] | 3159 | free(f->print_name); |
Junio C Hamano | f604652 | 2007-12-11 23:46:30 -0800 | [diff] [blame] | 3160 | free(f->name); |
| 3161 | free(f->from_name); |
| 3162 | free(f); |
| 3163 | } |
| 3164 | free(diffstat->files); |
| 3165 | } |
| 3166 | |
Johannes Schindelin | 8824689 | 2006-05-20 23:43:13 +0200 | [diff] [blame] | 3167 | struct checkdiff_t { |
Johannes Schindelin | 8824689 | 2006-05-20 23:43:13 +0200 | [diff] [blame] | 3168 | const char *filename; |
Junio C Hamano | 1ba111d | 2008-06-26 15:36:34 -0700 | [diff] [blame] | 3169 | int lineno; |
Junio C Hamano | a757c64 | 2010-03-24 19:21:32 -0700 | [diff] [blame] | 3170 | int conflict_marker_size; |
Junio C Hamano | 1ba111d | 2008-06-26 15:36:34 -0700 | [diff] [blame] | 3171 | struct diff_options *o; |
Junio C Hamano | cf1b786 | 2007-12-06 00:14:14 -0800 | [diff] [blame] | 3172 | unsigned ws_rule; |
Wincent Colaiuta | 62c6489 | 2007-12-13 21:24:52 +0100 | [diff] [blame] | 3173 | unsigned status; |
Johannes Schindelin | 8824689 | 2006-05-20 23:43:13 +0200 | [diff] [blame] | 3174 | }; |
| 3175 | |
Junio C Hamano | a757c64 | 2010-03-24 19:21:32 -0700 | [diff] [blame] | 3176 | static int is_conflict_marker(const char *line, int marker_size, unsigned long len) |
Junio C Hamano | 0495404 | 2008-06-26 15:37:21 -0700 | [diff] [blame] | 3177 | { |
| 3178 | char firstchar; |
| 3179 | int cnt; |
| 3180 | |
Junio C Hamano | a757c64 | 2010-03-24 19:21:32 -0700 | [diff] [blame] | 3181 | if (len < marker_size + 1) |
Junio C Hamano | 0495404 | 2008-06-26 15:37:21 -0700 | [diff] [blame] | 3182 | return 0; |
| 3183 | firstchar = line[0]; |
| 3184 | switch (firstchar) { |
Junio C Hamano | a757c64 | 2010-03-24 19:21:32 -0700 | [diff] [blame] | 3185 | case '=': case '>': case '<': case '|': |
Junio C Hamano | 0495404 | 2008-06-26 15:37:21 -0700 | [diff] [blame] | 3186 | break; |
| 3187 | default: |
| 3188 | return 0; |
| 3189 | } |
Junio C Hamano | a757c64 | 2010-03-24 19:21:32 -0700 | [diff] [blame] | 3190 | for (cnt = 1; cnt < marker_size; cnt++) |
Junio C Hamano | 0495404 | 2008-06-26 15:37:21 -0700 | [diff] [blame] | 3191 | if (line[cnt] != firstchar) |
| 3192 | return 0; |
Junio C Hamano | a757c64 | 2010-03-24 19:21:32 -0700 | [diff] [blame] | 3193 | /* line[1] thru line[marker_size-1] are same as firstchar */ |
| 3194 | if (len < marker_size + 1 || !isspace(line[marker_size])) |
Junio C Hamano | 0495404 | 2008-06-26 15:37:21 -0700 | [diff] [blame] | 3195 | return 0; |
Junio C Hamano | 0495404 | 2008-06-26 15:37:21 -0700 | [diff] [blame] | 3196 | return 1; |
| 3197 | } |
| 3198 | |
Jeff King | 75ab763 | 2018-11-02 02:39:03 -0400 | [diff] [blame] | 3199 | static 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 Schindelin | 8824689 | 2006-05-20 23:43:13 +0200 | [diff] [blame] | 3208 | static void checkdiff_consume(void *priv, char *line, unsigned long len) |
| 3209 | { |
| 3210 | struct checkdiff_t *data = priv; |
Junio C Hamano | a757c64 | 2010-03-24 19:21:32 -0700 | [diff] [blame] | 3211 | int marker_size = data->conflict_marker_size; |
Jeff King | f1c9626 | 2011-08-17 22:03:12 -0700 | [diff] [blame] | 3212 | 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 Colaiuta | c1795bb | 2007-12-13 14:32:29 +0100 | [diff] [blame] | 3215 | char *err; |
John Keeping | 30997bb | 2013-02-07 20:15:27 +0000 | [diff] [blame] | 3216 | const char *line_prefix; |
Bo Yang | 7be5761 | 2010-05-26 15:23:54 +0800 | [diff] [blame] | 3217 | |
| 3218 | assert(data->o); |
John Keeping | 30997bb | 2013-02-07 20:15:27 +0000 | [diff] [blame] | 3219 | line_prefix = diff_line_prefix(data->o); |
Johannes Schindelin | 8824689 | 2006-05-20 23:43:13 +0200 | [diff] [blame] | 3220 | |
| 3221 | if (line[0] == '+') { |
Junio C Hamano | 18374e5 | 2008-06-26 13:16:33 -0700 | [diff] [blame] | 3222 | unsigned bad; |
Junio C Hamano | 0ef617f | 2008-02-15 20:30:05 -0800 | [diff] [blame] | 3223 | data->lineno++; |
Junio C Hamano | a757c64 | 2010-03-24 19:21:32 -0700 | [diff] [blame] | 3224 | if (is_conflict_marker(line + 1, marker_size, len - 1)) { |
Junio C Hamano | 0495404 | 2008-06-26 15:37:21 -0700 | [diff] [blame] | 3225 | data->status |= 1; |
| 3226 | fprintf(data->o->file, |
Bo Yang | 7be5761 | 2010-05-26 15:23:54 +0800 | [diff] [blame] | 3227 | "%s%s:%d: leftover conflict marker\n", |
| 3228 | line_prefix, data->filename, data->lineno); |
Junio C Hamano | 0495404 | 2008-06-26 15:37:21 -0700 | [diff] [blame] | 3229 | } |
Junio C Hamano | 8f8841e | 2008-06-26 15:35:21 -0700 | [diff] [blame] | 3230 | bad = ws_check(line + 1, len - 1, data->ws_rule); |
Junio C Hamano | 18374e5 | 2008-06-26 13:16:33 -0700 | [diff] [blame] | 3231 | if (!bad) |
Wincent Colaiuta | c1795bb | 2007-12-13 14:32:29 +0100 | [diff] [blame] | 3232 | return; |
Junio C Hamano | 18374e5 | 2008-06-26 13:16:33 -0700 | [diff] [blame] | 3233 | data->status |= bad; |
| 3234 | err = whitespace_error_string(bad); |
Bo Yang | 7be5761 | 2010-05-26 15:23:54 +0800 | [diff] [blame] | 3235 | fprintf(data->o->file, "%s%s:%d: %s.\n", |
| 3236 | line_prefix, data->filename, data->lineno, err); |
Wincent Colaiuta | c1795bb | 2007-12-13 14:32:29 +0100 | [diff] [blame] | 3237 | free(err); |
Bo Yang | a3c158d | 2010-05-26 15:08:02 +0800 | [diff] [blame] | 3238 | emit_line(data->o, set, reset, line, 1); |
Junio C Hamano | 8f8841e | 2008-06-26 15:35:21 -0700 | [diff] [blame] | 3239 | ws_check_emit(line + 1, len - 1, data->ws_rule, |
Junio C Hamano | 1ba111d | 2008-06-26 15:36:34 -0700 | [diff] [blame] | 3240 | data->o->file, set, reset, ws); |
Junio C Hamano | 877f23c | 2008-06-26 15:36:59 -0700 | [diff] [blame] | 3241 | } else if (line[0] == ' ') { |
Johannes Schindelin | 8824689 | 2006-05-20 23:43:13 +0200 | [diff] [blame] | 3242 | data->lineno++; |
Johannes Schindelin | 8824689 | 2006-05-20 23:43:13 +0200 | [diff] [blame] | 3243 | } |
| 3244 | } |
| 3245 | |
Junio C Hamano | 0660626 | 2006-05-05 02:41:53 -0700 | [diff] [blame] | 3246 | static unsigned char *deflate_it(char *data, |
| 3247 | unsigned long size, |
| 3248 | unsigned long *result_size) |
Junio C Hamano | 051308f | 2006-05-04 16:51:44 -0700 | [diff] [blame] | 3249 | { |
Junio C Hamano | 0660626 | 2006-05-05 02:41:53 -0700 | [diff] [blame] | 3250 | int bound; |
| 3251 | unsigned char *deflated; |
Junio C Hamano | ef49a7a | 2011-06-10 11:52:15 -0700 | [diff] [blame] | 3252 | git_zstream stream; |
Junio C Hamano | 051308f | 2006-05-04 16:51:44 -0700 | [diff] [blame] | 3253 | |
Junio C Hamano | 55bb5c9 | 2011-06-10 10:55:10 -0700 | [diff] [blame] | 3254 | git_deflate_init(&stream, zlib_compression_level); |
Junio C Hamano | 225a6f1 | 2011-06-10 11:18:17 -0700 | [diff] [blame] | 3255 | bound = git_deflate_bound(&stream, size); |
Junio C Hamano | 0660626 | 2006-05-05 02:41:53 -0700 | [diff] [blame] | 3256 | deflated = xmalloc(bound); |
| 3257 | stream.next_out = deflated; |
| 3258 | stream.avail_out = bound; |
Junio C Hamano | 051308f | 2006-05-04 16:51:44 -0700 | [diff] [blame] | 3259 | |
Junio C Hamano | 0660626 | 2006-05-05 02:41:53 -0700 | [diff] [blame] | 3260 | stream.next_in = (unsigned char *)data; |
| 3261 | stream.avail_in = size; |
Junio C Hamano | 55bb5c9 | 2011-06-10 10:55:10 -0700 | [diff] [blame] | 3262 | while (git_deflate(&stream, Z_FINISH) == Z_OK) |
Junio C Hamano | 0660626 | 2006-05-05 02:41:53 -0700 | [diff] [blame] | 3263 | ; /* nothing */ |
Junio C Hamano | 55bb5c9 | 2011-06-10 10:55:10 -0700 | [diff] [blame] | 3264 | git_deflate_end(&stream); |
Junio C Hamano | 0660626 | 2006-05-05 02:41:53 -0700 | [diff] [blame] | 3265 | *result_size = stream.total_out; |
| 3266 | return deflated; |
Junio C Hamano | 051308f | 2006-05-04 16:51:44 -0700 | [diff] [blame] | 3267 | } |
| 3268 | |
Stefan Beller | 4eed0eb | 2017-06-29 17:07:01 -0700 | [diff] [blame] | 3269 | static void emit_binary_diff_body(struct diff_options *o, |
| 3270 | mmfile_t *one, mmfile_t *two) |
Junio C Hamano | 051308f | 2006-05-04 16:51:44 -0700 | [diff] [blame] | 3271 | { |
Junio C Hamano | 0660626 | 2006-05-05 02:41:53 -0700 | [diff] [blame] | 3272 | void *cp; |
| 3273 | void *delta; |
| 3274 | void *deflated; |
| 3275 | void *data; |
| 3276 | unsigned long orig_size; |
Junio C Hamano | 051308f | 2006-05-04 16:51:44 -0700 | [diff] [blame] | 3277 | unsigned long delta_size; |
Junio C Hamano | 0660626 | 2006-05-05 02:41:53 -0700 | [diff] [blame] | 3278 | unsigned long deflate_size; |
| 3279 | unsigned long data_size; |
Junio C Hamano | 051308f | 2006-05-04 16:51:44 -0700 | [diff] [blame] | 3280 | |
Junio C Hamano | 0660626 | 2006-05-05 02:41:53 -0700 | [diff] [blame] | 3281 | /* 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 Hamano | 051308f | 2006-05-04 16:51:44 -0700 | [diff] [blame] | 3297 | |
Junio C Hamano | 0660626 | 2006-05-05 02:41:53 -0700 | [diff] [blame] | 3298 | if (delta && delta_size < deflate_size) { |
Torsten Bögershausen | ca473ce | 2018-11-11 08:05:04 +0100 | [diff] [blame] | 3299 | char *s = xstrfmt("%"PRIuMAX , (uintmax_t)orig_size); |
Stefan Beller | 4eed0eb | 2017-06-29 17:07:01 -0700 | [diff] [blame] | 3300 | emit_diff_symbol(o, DIFF_SYMBOL_BINARY_DIFF_HEADER_DELTA, |
| 3301 | s, strlen(s), 0); |
| 3302 | free(s); |
Junio C Hamano | 0660626 | 2006-05-05 02:41:53 -0700 | [diff] [blame] | 3303 | free(deflated); |
| 3304 | data = delta; |
| 3305 | data_size = delta_size; |
Stefan Beller | 4eed0eb | 2017-06-29 17:07:01 -0700 | [diff] [blame] | 3306 | } 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 Hamano | 0660626 | 2006-05-05 02:41:53 -0700 | [diff] [blame] | 3311 | 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 Beller | 4eed0eb | 2017-06-29 17:07:01 -0700 | [diff] [blame] | 3319 | int len; |
Junio C Hamano | 0660626 | 2006-05-05 02:41:53 -0700 | [diff] [blame] | 3320 | int bytes = (52 < data_size) ? 52 : data_size; |
Stefan Beller | 4eed0eb | 2017-06-29 17:07:01 -0700 | [diff] [blame] | 3321 | char line[71]; |
Junio C Hamano | 0660626 | 2006-05-05 02:41:53 -0700 | [diff] [blame] | 3322 | data_size -= bytes; |
Junio C Hamano | 051308f | 2006-05-04 16:51:44 -0700 | [diff] [blame] | 3323 | 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 Forster | 1d7f171 | 2006-06-18 17:18:09 +0200 | [diff] [blame] | 3328 | cp = (char *) cp + bytes; |
Stefan Beller | 4eed0eb | 2017-06-29 17:07:01 -0700 | [diff] [blame] | 3329 | |
| 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 Hamano | 051308f | 2006-05-04 16:51:44 -0700 | [diff] [blame] | 3336 | } |
Stefan Beller | 4eed0eb | 2017-06-29 17:07:01 -0700 | [diff] [blame] | 3337 | emit_diff_symbol(o, DIFF_SYMBOL_BINARY_DIFF_FOOTER, NULL, 0, 0); |
Junio C Hamano | 0660626 | 2006-05-05 02:41:53 -0700 | [diff] [blame] | 3338 | free(data); |
Junio C Hamano | 051308f | 2006-05-04 16:51:44 -0700 | [diff] [blame] | 3339 | } |
| 3340 | |
Stefan Beller | 4eed0eb | 2017-06-29 17:07:01 -0700 | [diff] [blame] | 3341 | static void emit_binary_diff(struct diff_options *o, |
| 3342 | mmfile_t *one, mmfile_t *two) |
Junio C Hamano | d4c452f | 2006-08-16 16:08:14 -0700 | [diff] [blame] | 3343 | { |
Stefan Beller | 4eed0eb | 2017-06-29 17:07:01 -0700 | [diff] [blame] | 3344 | 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 Hamano | d4c452f | 2006-08-16 16:08:14 -0700 | [diff] [blame] | 3347 | } |
| 3348 | |
Nguyễn Thái Ngọc Duy | b78ea5f | 2018-09-21 17:57:19 +0200 | [diff] [blame] | 3349 | int diff_filespec_is_binary(struct repository *r, |
| 3350 | struct diff_filespec *one) |
Junio C Hamano | 29a3eef | 2007-07-06 00:18:54 -0700 | [diff] [blame] | 3351 | { |
Jeff King | 122aa6f | 2008-10-05 17:43:36 -0400 | [diff] [blame] | 3352 | if (one->is_binary == -1) { |
Nguyễn Thái Ngọc Duy | acd00ea | 2018-09-21 17:57:33 +0200 | [diff] [blame] | 3353 | diff_filespec_load_driver(one, r->index); |
Jeff King | 122aa6f | 2008-10-05 17:43:36 -0400 | [diff] [blame] | 3354 | 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 Duy | b78ea5f | 2018-09-21 17:57:19 +0200 | [diff] [blame] | 3358 | diff_populate_filespec(r, one, CHECK_BINARY); |
Nguyễn Thái Ngọc Duy | 6bf3b81 | 2014-08-16 10:08:05 +0700 | [diff] [blame] | 3359 | if (one->is_binary == -1 && one->data) |
Jeff King | 122aa6f | 2008-10-05 17:43:36 -0400 | [diff] [blame] | 3360 | 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 Hamano | 29a3eef | 2007-07-06 00:18:54 -0700 | [diff] [blame] | 3366 | return one->is_binary; |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 3367 | } |
| 3368 | |
Nguyễn Thái Ngọc Duy | acd00ea | 2018-09-21 17:57:33 +0200 | [diff] [blame] | 3369 | static const struct userdiff_funcname * |
| 3370 | diff_funcname_pattern(struct diff_options *o, struct diff_filespec *one) |
Junio C Hamano | f258475 | 2007-07-06 00:45:10 -0700 | [diff] [blame] | 3371 | { |
Nguyễn Thái Ngọc Duy | acd00ea | 2018-09-21 17:57:33 +0200 | [diff] [blame] | 3372 | diff_filespec_load_driver(one, o->repo->index); |
Jeff King | 122aa6f | 2008-10-05 17:43:36 -0400 | [diff] [blame] | 3373 | return one->driver->funcname.pattern ? &one->driver->funcname : NULL; |
Junio C Hamano | f258475 | 2007-07-06 00:45:10 -0700 | [diff] [blame] | 3374 | } |
| 3375 | |
Junio C Hamano | a5a818e | 2008-08-18 20:08:09 -0700 | [diff] [blame] | 3376 | void 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 Duy | bd7ad45 | 2018-11-10 06:49:06 +0100 | [diff] [blame] | 3384 | struct userdiff_driver *get_textconv(struct repository *r, |
Nguyễn Thái Ngọc Duy | acd00ea | 2018-09-21 17:57:33 +0200 | [diff] [blame] | 3385 | struct diff_filespec *one) |
Jeff King | 04427ac | 2008-10-26 00:44:53 -0400 | [diff] [blame] | 3386 | { |
| 3387 | if (!DIFF_FILE_VALID(one)) |
| 3388 | return NULL; |
Jeff King | d391c0f | 2010-09-21 17:01:24 -0400 | [diff] [blame] | 3389 | |
Nguyễn Thái Ngọc Duy | bd7ad45 | 2018-11-10 06:49:06 +0100 | [diff] [blame] | 3390 | diff_filespec_load_driver(one, r->index); |
| 3391 | return userdiff_get_textconv(r, one->driver); |
Jeff King | 04427ac | 2008-10-26 00:44:53 -0400 | [diff] [blame] | 3392 | } |
| 3393 | |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 3394 | static 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 Couder | 296c6bb | 2010-05-26 04:50:12 +0200 | [diff] [blame] | 3399 | int must_show_header, |
Junio C Hamano | 051308f | 2006-05-04 16:51:44 -0700 | [diff] [blame] | 3400 | struct diff_options *o, |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 3401 | int complete_rewrite) |
| 3402 | { |
| 3403 | mmfile_t mf1, mf2; |
| 3404 | const char *lbl[2]; |
| 3405 | char *a_one, *b_two; |
Jeff King | d9c552f | 2012-11-13 21:12:46 +0530 | [diff] [blame] | 3406 | const char *meta = diff_get_color_opt(o, DIFF_METAINFO); |
Pierre Habouzit | 8f67f8a | 2007-11-10 20:05:14 +0100 | [diff] [blame] | 3407 | const char *reset = diff_get_color_opt(o, DIFF_RESET); |
Junio C Hamano | a5a818e | 2008-08-18 20:08:09 -0700 | [diff] [blame] | 3408 | const char *a_prefix, *b_prefix; |
Jeff King | d9bae1a | 2010-04-01 20:12:15 -0400 | [diff] [blame] | 3409 | struct userdiff_driver *textconv_one = NULL; |
| 3410 | struct userdiff_driver *textconv_two = NULL; |
Greg Bacon | 3e97c7c | 2009-11-19 15:12:24 -0600 | [diff] [blame] | 3411 | struct strbuf header = STRBUF_INIT; |
John Keeping | 30997bb | 2013-02-07 20:15:27 +0000 | [diff] [blame] | 3412 | const char *line_prefix = diff_line_prefix(o); |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 3413 | |
Junio C Hamano | a5a818e | 2008-08-18 20:08:09 -0700 | [diff] [blame] | 3414 | diff_set_mnemonic_prefix(o, "a/", "b/"); |
Brandon Williams | 0d1e0e7 | 2017-10-31 11:19:11 -0700 | [diff] [blame] | 3415 | if (o->flags.reverse_diff) { |
Junio C Hamano | a5a818e | 2008-08-18 20:08:09 -0700 | [diff] [blame] | 3416 | 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 Keller | 61cfbc0 | 2016-08-31 16:27:21 -0700 | [diff] [blame] | 3423 | if (o->submodule_format == DIFF_SUBMODULE_LOG && |
| 3424 | (!one->mode || S_ISGITLINK(one->mode)) && |
| 3425 | (!two->mode || S_ISGITLINK(two->mode))) { |
Stefan Beller | f359713 | 2017-06-29 17:07:00 -0700 | [diff] [blame] | 3426 | show_submodule_summary(o, one->path ? one->path : two->path, |
Jacob Keller | 602a283 | 2016-08-31 16:27:23 -0700 | [diff] [blame] | 3427 | &one->oid, &two->oid, |
Stefan Beller | f359713 | 2017-06-29 17:07:00 -0700 | [diff] [blame] | 3428 | two->dirty_submodule); |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 3429 | return; |
Jacob Keller | fd47ae6 | 2016-08-31 16:27:25 -0700 | [diff] [blame] | 3430 | } else if (o->submodule_format == DIFF_SUBMODULE_INLINE_DIFF && |
| 3431 | (!one->mode || S_ISGITLINK(one->mode)) && |
| 3432 | (!two->mode || S_ISGITLINK(two->mode))) { |
Stefan Beller | f359713 | 2017-06-29 17:07:00 -0700 | [diff] [blame] | 3433 | show_submodule_inline_diff(o, one->path ? one->path : two->path, |
Jacob Keller | fd47ae6 | 2016-08-31 16:27:25 -0700 | [diff] [blame] | 3434 | &one->oid, &two->oid, |
Stefan Beller | f359713 | 2017-06-29 17:07:00 -0700 | [diff] [blame] | 3435 | two->dirty_submodule); |
Jacob Keller | fd47ae6 | 2016-08-31 16:27:25 -0700 | [diff] [blame] | 3436 | return; |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 3437 | } |
| 3438 | |
Brandon Williams | 0d1e0e7 | 2017-10-31 11:19:11 -0700 | [diff] [blame] | 3439 | if (o->flags.allow_textconv) { |
Nguyễn Thái Ngọc Duy | bd7ad45 | 2018-11-10 06:49:06 +0100 | [diff] [blame] | 3440 | textconv_one = get_textconv(o->repo, one); |
| 3441 | textconv_two = get_textconv(o->repo, two); |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 3442 | } |
| 3443 | |
Linus Torvalds | 71b989e | 2008-10-05 15:35:15 -0400 | [diff] [blame] | 3444 | /* 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 Hamano | a5a818e | 2008-08-18 20:08:09 -0700 | [diff] [blame] | 3448 | a_one = quote_two(a_prefix, name_a + (*name_a == '/')); |
| 3449 | b_two = quote_two(b_prefix, name_b + (*name_b == '/')); |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 3450 | lbl[0] = DIFF_FILE_VALID(one) ? a_one : "/dev/null"; |
| 3451 | lbl[1] = DIFF_FILE_VALID(two) ? b_two : "/dev/null"; |
Jeff King | d9c552f | 2012-11-13 21:12:46 +0530 | [diff] [blame] | 3452 | strbuf_addf(&header, "%s%sdiff --git %s %s%s\n", line_prefix, meta, a_one, b_two, reset); |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 3453 | if (lbl[0][0] == '/') { |
| 3454 | /* /dev/null */ |
Jeff King | d9c552f | 2012-11-13 21:12:46 +0530 | [diff] [blame] | 3455 | strbuf_addf(&header, "%s%snew file mode %06o%s\n", line_prefix, meta, two->mode, reset); |
Bert Wesarg | 3746644 | 2010-05-04 00:38:07 +0200 | [diff] [blame] | 3456 | if (xfrm_msg) |
| 3457 | strbuf_addstr(&header, xfrm_msg); |
Christian Couder | 296c6bb | 2010-05-26 04:50:12 +0200 | [diff] [blame] | 3458 | must_show_header = 1; |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 3459 | } |
| 3460 | else if (lbl[1][0] == '/') { |
Jeff King | d9c552f | 2012-11-13 21:12:46 +0530 | [diff] [blame] | 3461 | strbuf_addf(&header, "%s%sdeleted file mode %06o%s\n", line_prefix, meta, one->mode, reset); |
Bert Wesarg | 3746644 | 2010-05-04 00:38:07 +0200 | [diff] [blame] | 3462 | if (xfrm_msg) |
| 3463 | strbuf_addstr(&header, xfrm_msg); |
Christian Couder | 296c6bb | 2010-05-26 04:50:12 +0200 | [diff] [blame] | 3464 | must_show_header = 1; |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 3465 | } |
| 3466 | else { |
| 3467 | if (one->mode != two->mode) { |
Jeff King | d9c552f | 2012-11-13 21:12:46 +0530 | [diff] [blame] | 3468 | 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 Couder | 296c6bb | 2010-05-26 04:50:12 +0200 | [diff] [blame] | 3470 | must_show_header = 1; |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 3471 | } |
Bert Wesarg | 3746644 | 2010-05-04 00:38:07 +0200 | [diff] [blame] | 3472 | if (xfrm_msg) |
| 3473 | strbuf_addstr(&header, xfrm_msg); |
Greg Bacon | 3e97c7c | 2009-11-19 15:12:24 -0600 | [diff] [blame] | 3474 | |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 3475 | /* |
| 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 King | 0c01857 | 2008-12-09 03:12:28 -0500 | [diff] [blame] | 3481 | if (complete_rewrite && |
Nguyễn Thái Ngọc Duy | b78ea5f | 2018-09-21 17:57:19 +0200 | [diff] [blame] | 3482 | (textconv_one || !diff_filespec_is_binary(o->repo, one)) && |
| 3483 | (textconv_two || !diff_filespec_is_binary(o->repo, two))) { |
Stefan Beller | a29b0a1 | 2017-06-29 17:06:57 -0700 | [diff] [blame] | 3484 | emit_diff_symbol(o, DIFF_SYMBOL_HEADER, |
| 3485 | header.buf, header.len, 0); |
Greg Bacon | 3e97c7c | 2009-11-19 15:12:24 -0600 | [diff] [blame] | 3486 | strbuf_reset(&header); |
Jeff King | 3aa1f7c | 2008-12-09 03:13:21 -0500 | [diff] [blame] | 3487 | emit_rewrite_diff(name_a, name_b, one, two, |
Nguyễn Thái Ngọc Duy | b78ea5f | 2018-09-21 17:57:19 +0200 | [diff] [blame] | 3488 | textconv_one, textconv_two, o); |
Johannes Schindelin | 34a5e1a | 2007-02-25 23:34:54 +0100 | [diff] [blame] | 3489 | o->found_changes = 1; |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 3490 | goto free_ab_and_return; |
| 3491 | } |
| 3492 | } |
| 3493 | |
Junio C Hamano | 467ddc1 | 2011-02-28 16:11:55 -0800 | [diff] [blame] | 3494 | if (o->irreversible_delete && lbl[1][0] == '/') { |
Stefan Beller | a29b0a1 | 2017-06-29 17:06:57 -0700 | [diff] [blame] | 3495 | emit_diff_symbol(o, DIFF_SYMBOL_HEADER, header.buf, |
| 3496 | header.len, 0); |
Junio C Hamano | 467ddc1 | 2011-02-28 16:11:55 -0800 | [diff] [blame] | 3497 | strbuf_reset(&header); |
| 3498 | goto free_ab_and_return; |
Brandon Williams | 0d1e0e7 | 2017-10-31 11:19:11 -0700 | [diff] [blame] | 3499 | } else if (!o->flags.text && |
Nguyễn Thái Ngọc Duy | b78ea5f | 2018-09-21 17:57:19 +0200 | [diff] [blame] | 3500 | ( (!textconv_one && diff_filespec_is_binary(o->repo, one)) || |
| 3501 | (!textconv_two && diff_filespec_is_binary(o->repo, two)) )) { |
Stefan Beller | 4acaaa7 | 2017-06-29 17:06:58 -0700 | [diff] [blame] | 3502 | struct strbuf sb = STRBUF_INIT; |
Nguyễn Thái Ngọc Duy | 1aaf69e | 2014-08-16 10:08:06 +0700 | [diff] [blame] | 3503 | if (!one->data && !two->data && |
| 3504 | S_ISREG(one->mode) && S_ISREG(two->mode) && |
Brandon Williams | 0d1e0e7 | 2017-10-31 11:19:11 -0700 | [diff] [blame] | 3505 | !o->flags.binary) { |
Jeff King | 4a7e27e | 2018-08-28 17:22:40 -0400 | [diff] [blame] | 3506 | if (oideq(&one->oid, &two->oid)) { |
Nguyễn Thái Ngọc Duy | 1aaf69e | 2014-08-16 10:08:06 +0700 | [diff] [blame] | 3507 | if (must_show_header) |
Stefan Beller | a29b0a1 | 2017-06-29 17:06:57 -0700 | [diff] [blame] | 3508 | emit_diff_symbol(o, DIFF_SYMBOL_HEADER, |
| 3509 | header.buf, header.len, |
| 3510 | 0); |
Nguyễn Thái Ngọc Duy | 1aaf69e | 2014-08-16 10:08:06 +0700 | [diff] [blame] | 3511 | goto free_ab_and_return; |
| 3512 | } |
Stefan Beller | a29b0a1 | 2017-06-29 17:06:57 -0700 | [diff] [blame] | 3513 | emit_diff_symbol(o, DIFF_SYMBOL_HEADER, |
| 3514 | header.buf, header.len, 0); |
Stefan Beller | 4acaaa7 | 2017-06-29 17:06:58 -0700 | [diff] [blame] | 3515 | 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 Duy | 1aaf69e | 2014-08-16 10:08:06 +0700 | [diff] [blame] | 3520 | goto free_ab_and_return; |
| 3521 | } |
Nguyễn Thái Ngọc Duy | b78ea5f | 2018-09-21 17:57:19 +0200 | [diff] [blame] | 3522 | if (fill_mmfile(o->repo, &mf1, one) < 0 || |
| 3523 | fill_mmfile(o->repo, &mf2, two) < 0) |
Jeff King | b337398 | 2010-04-01 20:14:24 -0400 | [diff] [blame] | 3524 | die("unable to read files to diff"); |
Junio C Hamano | 0660626 | 2006-05-05 02:41:53 -0700 | [diff] [blame] | 3525 | /* Quite common confusing case */ |
| 3526 | if (mf1.size == mf2.size && |
Christian Couder | 296c6bb | 2010-05-26 04:50:12 +0200 | [diff] [blame] | 3527 | !memcmp(mf1.ptr, mf2.ptr, mf1.size)) { |
| 3528 | if (must_show_header) |
Stefan Beller | a29b0a1 | 2017-06-29 17:06:57 -0700 | [diff] [blame] | 3529 | emit_diff_symbol(o, DIFF_SYMBOL_HEADER, |
| 3530 | header.buf, header.len, 0); |
Junio C Hamano | 0660626 | 2006-05-05 02:41:53 -0700 | [diff] [blame] | 3531 | goto free_ab_and_return; |
Christian Couder | 296c6bb | 2010-05-26 04:50:12 +0200 | [diff] [blame] | 3532 | } |
Stefan Beller | a29b0a1 | 2017-06-29 17:06:57 -0700 | [diff] [blame] | 3533 | emit_diff_symbol(o, DIFF_SYMBOL_HEADER, header.buf, header.len, 0); |
Greg Bacon | 3e97c7c | 2009-11-19 15:12:24 -0600 | [diff] [blame] | 3534 | strbuf_reset(&header); |
Brandon Williams | 0d1e0e7 | 2017-10-31 11:19:11 -0700 | [diff] [blame] | 3535 | if (o->flags.binary) |
Stefan Beller | 4eed0eb | 2017-06-29 17:07:01 -0700 | [diff] [blame] | 3536 | emit_binary_diff(o, &mf1, &mf2); |
Stefan Beller | 4acaaa7 | 2017-06-29 17:06:58 -0700 | [diff] [blame] | 3537 | 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 Schindelin | 34a5e1a | 2007-02-25 23:34:54 +0100 | [diff] [blame] | 3544 | o->found_changes = 1; |
Junio C Hamano | 467ddc1 | 2011-02-28 16:11:55 -0800 | [diff] [blame] | 3545 | } else { |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 3546 | /* Crazy xdl interfaces.. */ |
Jeff King | 0da0e92 | 2019-01-11 17:17:22 -0500 | [diff] [blame] | 3547 | const char *diffopts; |
Jeff King | ae021d8 | 2014-06-18 15:47:50 -0400 | [diff] [blame] | 3548 | const char *v; |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 3549 | xpparam_t xpp; |
| 3550 | xdemitconf_t xecfg; |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 3551 | struct emit_callback ecbdata; |
Jeff King | be58e70 | 2008-10-05 17:43:21 -0400 | [diff] [blame] | 3552 | const struct userdiff_funcname *pe; |
Junio C Hamano | f258475 | 2007-07-06 00:45:10 -0700 | [diff] [blame] | 3553 | |
Junio C Hamano | b3f01ff | 2012-02-29 18:14:16 -0800 | [diff] [blame] | 3554 | if (must_show_header) { |
Stefan Beller | a29b0a1 | 2017-06-29 17:06:57 -0700 | [diff] [blame] | 3555 | emit_diff_symbol(o, DIFF_SYMBOL_HEADER, |
| 3556 | header.buf, header.len, 0); |
Greg Bacon | 3e97c7c | 2009-11-19 15:12:24 -0600 | [diff] [blame] | 3557 | strbuf_reset(&header); |
| 3558 | } |
| 3559 | |
Nguyễn Thái Ngọc Duy | 6afaf80 | 2018-09-21 17:57:22 +0200 | [diff] [blame] | 3560 | mf1.size = fill_textconv(o->repo, textconv_one, one, &mf1.ptr); |
| 3561 | mf2.size = fill_textconv(o->repo, textconv_two, two, &mf2.ptr); |
Jeff King | 04427ac | 2008-10-26 00:44:53 -0400 | [diff] [blame] | 3562 | |
Nguyễn Thái Ngọc Duy | acd00ea | 2018-09-21 17:57:33 +0200 | [diff] [blame] | 3563 | pe = diff_funcname_pattern(o, one); |
Brandon Casey | 45e7ca0 | 2008-09-18 17:40:48 -0500 | [diff] [blame] | 3564 | if (!pe) |
Nguyễn Thái Ngọc Duy | acd00ea | 2018-09-21 17:57:33 +0200 | [diff] [blame] | 3565 | pe = diff_funcname_pattern(o, two); |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 3566 | |
Brian Downing | 9ccd0a8 | 2008-10-25 15:30:37 +0200 | [diff] [blame] | 3567 | memset(&xpp, 0, sizeof(xpp)); |
Johannes Schindelin | 30b2501 | 2007-07-04 19:05:46 +0100 | [diff] [blame] | 3568 | memset(&xecfg, 0, sizeof(xecfg)); |
Johannes Schindelin | cd112ce | 2006-06-13 18:45:44 +0200 | [diff] [blame] | 3569 | memset(&ecbdata, 0, sizeof(ecbdata)); |
Johannes Schindelin | 1cdde29 | 2018-08-13 04:33:11 -0700 | [diff] [blame] | 3570 | if (o->flags.suppress_diff_headers) |
| 3571 | lbl[0] = NULL; |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 3572 | ecbdata.label_path = lbl; |
Jeff King | daa0c3d | 2011-08-17 22:04:23 -0700 | [diff] [blame] | 3573 | ecbdata.color_diff = want_color(o->use_color); |
Nguyễn Thái Ngọc Duy | 26d024e | 2018-09-21 17:57:37 +0200 | [diff] [blame] | 3574 | ecbdata.ws_rule = whitespace_rule(o->repo->index, name_b); |
Junio C Hamano | 690ed84 | 2009-09-04 00:41:15 -0700 | [diff] [blame] | 3575 | if (ecbdata.ws_rule & WS_BLANK_AT_EOF) |
Junio C Hamano | d68fe26 | 2009-09-14 22:05:57 -0700 | [diff] [blame] | 3576 | check_blank_at_eof(&mf1, &mf2, &ecbdata); |
Bo Yang | a3c158d | 2010-05-26 15:08:02 +0800 | [diff] [blame] | 3577 | ecbdata.opt = o; |
Johannes Schindelin | 1cdde29 | 2018-08-13 04:33:11 -0700 | [diff] [blame] | 3578 | if (header.len && !o->flags.suppress_diff_headers) |
| 3579 | ecbdata.header = &header; |
René Scharfe | 582aa00 | 2010-05-02 15:04:41 +0200 | [diff] [blame] | 3580 | xpp.flags = o->xdl_opts; |
Jonathan Tan | 2477ab2 | 2017-11-27 11:47:47 -0800 | [diff] [blame] | 3581 | xpp.anchors = o->anchors; |
| 3582 | xpp.anchors_nr = o->anchors_nr; |
Linus Torvalds | ee1e541 | 2006-05-13 13:23:48 -0700 | [diff] [blame] | 3583 | xecfg.ctxlen = o->context; |
René Scharfe | 6d0e674 | 2008-12-28 19:45:32 +0100 | [diff] [blame] | 3584 | xecfg.interhunkctxlen = o->interhunkcontext; |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 3585 | xecfg.flags = XDL_EMIT_FUNCNAMES; |
Brandon Williams | 0d1e0e7 | 2017-10-31 11:19:11 -0700 | [diff] [blame] | 3586 | if (o->flags.funccontext) |
René Scharfe | 14937c2 | 2011-10-09 13:36:57 +0200 | [diff] [blame] | 3587 | xecfg.flags |= XDL_EMIT_FUNCCONTEXT; |
Brandon Casey | 45e7ca0 | 2008-09-18 17:40:48 -0500 | [diff] [blame] | 3588 | if (pe) |
Brandon Casey | a013585 | 2008-09-18 17:42:48 -0500 | [diff] [blame] | 3589 | xdiff_set_find_func(&xecfg, pe->pattern, pe->cflags); |
Jeff King | 0da0e92 | 2019-01-11 17:17:22 -0500 | [diff] [blame] | 3590 | |
| 3591 | diffopts = getenv("GIT_DIFF_OPTS"); |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 3592 | if (!diffopts) |
| 3593 | ; |
Jeff King | ae021d8 | 2014-06-18 15:47:50 -0400 | [diff] [blame] | 3594 | 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 King | 0da0e92 | 2019-01-11 17:17:22 -0500 | [diff] [blame] | 3598 | |
Thomas Rast | 77d1a52 | 2012-03-14 19:24:08 +0100 | [diff] [blame] | 3599 | if (o->word_diff) |
| 3600 | init_diff_words_data(&ecbdata, o, one, two); |
Jeff King | 9346d6d | 2018-11-02 02:35:45 -0400 | [diff] [blame] | 3601 | if (xdi_diff_outf(&mf1, &mf2, NULL, fn_out_consume, |
| 3602 | &ecbdata, &xpp, &xecfg)) |
Jeff King | 3efb988 | 2015-09-24 19:12:23 -0400 | [diff] [blame] | 3603 | die("unable to generate diff for %s", one->path); |
Thomas Rast | 882749a | 2010-04-14 17:59:06 +0200 | [diff] [blame] | 3604 | if (o->word_diff) |
Johannes Schindelin | f59a59e | 2006-07-28 23:56:15 +0200 | [diff] [blame] | 3605 | free_diff_words_data(&ecbdata); |
Jeff King | 04427ac | 2008-10-26 00:44:53 -0400 | [diff] [blame] | 3606 | if (textconv_one) |
| 3607 | free(mf1.ptr); |
| 3608 | if (textconv_two) |
| 3609 | free(mf2.ptr); |
René Scharfe | 8cfe5f1 | 2009-07-02 00:01:43 +0200 | [diff] [blame] | 3610 | xdiff_clear_find_func(&xecfg); |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 3611 | } |
| 3612 | |
| 3613 | free_ab_and_return: |
Greg Bacon | 3e97c7c | 2009-11-19 15:12:24 -0600 | [diff] [blame] | 3614 | strbuf_release(&header); |
Junio C Hamano | fc3abdf | 2007-05-03 13:05:48 -0700 | [diff] [blame] | 3615 | diff_free_filespec_data(one); |
| 3616 | diff_free_filespec_data(two); |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 3617 | free(a_one); |
| 3618 | free(b_two); |
| 3619 | return; |
| 3620 | } |
| 3621 | |
Nguyễn Thái Ngọc Duy | ddf88fa | 2018-02-24 21:09:59 +0700 | [diff] [blame] | 3622 | static 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 Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 3648 | static void builtin_diffstat(const char *name_a, const char *name_b, |
| 3649 | struct diff_filespec *one, |
| 3650 | struct diff_filespec *two, |
Junio C Hamano | 710158e | 2006-04-25 23:40:09 -0700 | [diff] [blame] | 3651 | struct diffstat_t *diffstat, |
Johannes Schindelin | 0d21efa | 2006-06-14 17:40:23 +0200 | [diff] [blame] | 3652 | struct diff_options *o, |
Linus Torvalds | 74faaa1 | 2012-10-17 10:00:37 -0700 | [diff] [blame] | 3653 | struct diff_filepair *p) |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 3654 | { |
| 3655 | mmfile_t mf1, mf2; |
| 3656 | struct diffstat_file *data; |
Zbigniew Jędrzejewski-Szmek | 352ca4e | 2012-05-01 19:10:15 +0200 | [diff] [blame] | 3657 | int same_contents; |
Linus Torvalds | 74faaa1 | 2012-10-17 10:00:37 -0700 | [diff] [blame] | 3658 | 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 Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 3664 | |
| 3665 | data = diffstat_add(diffstat, name_a, name_b); |
Junio C Hamano | 99bfd40 | 2012-11-27 11:17:14 -0800 | [diff] [blame] | 3666 | data->is_interesting = p->status != DIFF_STATUS_UNKNOWN; |
Nguyễn Thái Ngọc Duy | ddf88fa | 2018-02-24 21:09:59 +0700 | [diff] [blame] | 3667 | if (o->flags.stat_with_summary) |
| 3668 | data->comments = get_compact_summary(p, data->is_renamed); |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 3669 | |
| 3670 | if (!one || !two) { |
| 3671 | data->is_unmerged = 1; |
| 3672 | return; |
| 3673 | } |
Jeff King | ded0abc | 2011-02-19 03:04:56 -0500 | [diff] [blame] | 3674 | |
Jeff King | 4a7e27e | 2018-08-28 17:22:40 -0400 | [diff] [blame] | 3675 | same_contents = oideq(&one->oid, &two->oid); |
Zbigniew Jędrzejewski-Szmek | 352ca4e | 2012-05-01 19:10:15 +0200 | [diff] [blame] | 3676 | |
Nguyễn Thái Ngọc Duy | b78ea5f | 2018-09-21 17:57:19 +0200 | [diff] [blame] | 3677 | if (diff_filespec_is_binary(o->repo, one) || |
| 3678 | diff_filespec_is_binary(o->repo, two)) { |
Jeff King | ded0abc | 2011-02-19 03:04:56 -0500 | [diff] [blame] | 3679 | data->is_binary = 1; |
Zbigniew Jędrzejewski-Szmek | 352ca4e | 2012-05-01 19:10:15 +0200 | [diff] [blame] | 3680 | if (same_contents) { |
Zbigniew Jędrzejewski-Szmek | e18872b | 2012-05-01 19:10:14 +0200 | [diff] [blame] | 3681 | data->added = 0; |
| 3682 | data->deleted = 0; |
| 3683 | } else { |
Nguyễn Thái Ngọc Duy | b78ea5f | 2018-09-21 17:57:19 +0200 | [diff] [blame] | 3684 | data->added = diff_filespec_size(o->repo, two); |
| 3685 | data->deleted = diff_filespec_size(o->repo, one); |
Zbigniew Jędrzejewski-Szmek | e18872b | 2012-05-01 19:10:14 +0200 | [diff] [blame] | 3686 | } |
Jeff King | ded0abc | 2011-02-19 03:04:56 -0500 | [diff] [blame] | 3687 | } |
| 3688 | |
| 3689 | else if (complete_rewrite) { |
Nguyễn Thái Ngọc Duy | b78ea5f | 2018-09-21 17:57:19 +0200 | [diff] [blame] | 3690 | diff_populate_filespec(o->repo, one, 0); |
| 3691 | diff_populate_filespec(o->repo, two, 0); |
Junio C Hamano | 710158e | 2006-04-25 23:40:09 -0700 | [diff] [blame] | 3692 | data->deleted = count_lines(one->data, one->size); |
| 3693 | data->added = count_lines(two->data, two->size); |
Junio C Hamano | 710158e | 2006-04-25 23:40:09 -0700 | [diff] [blame] | 3694 | } |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 3695 | |
Zbigniew Jędrzejewski-Szmek | 352ca4e | 2012-05-01 19:10:15 +0200 | [diff] [blame] | 3696 | else if (!same_contents) { |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 3697 | /* Crazy xdl interfaces.. */ |
| 3698 | xpparam_t xpp; |
| 3699 | xdemitconf_t xecfg; |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 3700 | |
Nguyễn Thái Ngọc Duy | b78ea5f | 2018-09-21 17:57:19 +0200 | [diff] [blame] | 3701 | if (fill_mmfile(o->repo, &mf1, one) < 0 || |
| 3702 | fill_mmfile(o->repo, &mf2, two) < 0) |
Jeff King | ded0abc | 2011-02-19 03:04:56 -0500 | [diff] [blame] | 3703 | die("unable to read files to diff"); |
| 3704 | |
Brian Downing | 9ccd0a8 | 2008-10-25 15:30:37 +0200 | [diff] [blame] | 3705 | memset(&xpp, 0, sizeof(xpp)); |
Johannes Schindelin | 30b2501 | 2007-07-04 19:05:46 +0100 | [diff] [blame] | 3706 | memset(&xecfg, 0, sizeof(xecfg)); |
René Scharfe | 582aa00 | 2010-05-02 15:04:41 +0200 | [diff] [blame] | 3707 | xpp.flags = o->xdl_opts; |
Jonathan Tan | 2477ab2 | 2017-11-27 11:47:47 -0800 | [diff] [blame] | 3708 | xpp.anchors = o->anchors; |
| 3709 | xpp.anchors_nr = o->anchors_nr; |
Junio C Hamano | f01cae9 | 2011-09-22 10:54:47 -0700 | [diff] [blame] | 3710 | xecfg.ctxlen = o->context; |
| 3711 | xecfg.interhunkctxlen = o->interhunkcontext; |
Jeff King | 3b40a09 | 2018-11-02 02:36:06 -0400 | [diff] [blame] | 3712 | if (xdi_diff_outf(&mf1, &mf2, discard_hunk_line, |
| 3713 | diffstat_consume, diffstat, &xpp, &xecfg)) |
Jeff King | 3efb988 | 2015-09-24 19:12:23 -0400 | [diff] [blame] | 3714 | die("unable to generate diffstat for %s", one->path); |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 3715 | } |
Junio C Hamano | fc3abdf | 2007-05-03 13:05:48 -0700 | [diff] [blame] | 3716 | |
Junio C Hamano | fc3abdf | 2007-05-03 13:05:48 -0700 | [diff] [blame] | 3717 | diff_free_filespec_data(one); |
| 3718 | diff_free_filespec_data(two); |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 3719 | } |
| 3720 | |
Johannes Schindelin | 8824689 | 2006-05-20 23:43:13 +0200 | [diff] [blame] | 3721 | static void builtin_checkdiff(const char *name_a, const char *name_b, |
Junio C Hamano | cd676a5 | 2008-02-12 14:26:02 -0800 | [diff] [blame] | 3722 | const char *attr_path, |
Junio C Hamano | 5ff10dd | 2008-06-26 15:34:54 -0700 | [diff] [blame] | 3723 | struct diff_filespec *one, |
| 3724 | struct diff_filespec *two, |
| 3725 | struct diff_options *o) |
Johannes Schindelin | 8824689 | 2006-05-20 23:43:13 +0200 | [diff] [blame] | 3726 | { |
| 3727 | mmfile_t mf1, mf2; |
| 3728 | struct checkdiff_t data; |
| 3729 | |
| 3730 | if (!two) |
| 3731 | return; |
| 3732 | |
| 3733 | memset(&data, 0, sizeof(data)); |
Johannes Schindelin | 8824689 | 2006-05-20 23:43:13 +0200 | [diff] [blame] | 3734 | data.filename = name_b ? name_b : name_a; |
| 3735 | data.lineno = 0; |
Junio C Hamano | 1ba111d | 2008-06-26 15:36:34 -0700 | [diff] [blame] | 3736 | data.o = o; |
Nguyễn Thái Ngọc Duy | 26d024e | 2018-09-21 17:57:37 +0200 | [diff] [blame] | 3737 | data.ws_rule = whitespace_rule(o->repo->index, attr_path); |
Nguyễn Thái Ngọc Duy | 32eaa46 | 2018-09-21 17:57:27 +0200 | [diff] [blame] | 3738 | data.conflict_marker_size = ll_merge_marker_size(o->repo->index, attr_path); |
Johannes Schindelin | 8824689 | 2006-05-20 23:43:13 +0200 | [diff] [blame] | 3739 | |
Nguyễn Thái Ngọc Duy | b78ea5f | 2018-09-21 17:57:19 +0200 | [diff] [blame] | 3740 | if (fill_mmfile(o->repo, &mf1, one) < 0 || |
| 3741 | fill_mmfile(o->repo, &mf2, two) < 0) |
Johannes Schindelin | 8824689 | 2006-05-20 23:43:13 +0200 | [diff] [blame] | 3742 | die("unable to read files to diff"); |
| 3743 | |
Junio C Hamano | 5ff10dd | 2008-06-26 15:34:54 -0700 | [diff] [blame] | 3744 | /* |
| 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 Duy | b78ea5f | 2018-09-21 17:57:19 +0200 | [diff] [blame] | 3750 | if (diff_filespec_is_binary(o->repo, two)) |
Junio C Hamano | fc3abdf | 2007-05-03 13:05:48 -0700 | [diff] [blame] | 3751 | goto free_and_return; |
Johannes Schindelin | 8824689 | 2006-05-20 23:43:13 +0200 | [diff] [blame] | 3752 | else { |
| 3753 | /* Crazy xdl interfaces.. */ |
| 3754 | xpparam_t xpp; |
| 3755 | xdemitconf_t xecfg; |
Johannes Schindelin | 8824689 | 2006-05-20 23:43:13 +0200 | [diff] [blame] | 3756 | |
Brian Downing | 9ccd0a8 | 2008-10-25 15:30:37 +0200 | [diff] [blame] | 3757 | memset(&xpp, 0, sizeof(xpp)); |
Johannes Schindelin | 30b2501 | 2007-07-04 19:05:46 +0100 | [diff] [blame] | 3758 | memset(&xecfg, 0, sizeof(xecfg)); |
Junio C Hamano | c35539e | 2008-08-20 11:47:55 -0700 | [diff] [blame] | 3759 | xecfg.ctxlen = 1; /* at least one context line */ |
René Scharfe | 582aa00 | 2010-05-02 15:04:41 +0200 | [diff] [blame] | 3760 | xpp.flags = 0; |
Jeff King | 75ab763 | 2018-11-02 02:39:03 -0400 | [diff] [blame] | 3761 | if (xdi_diff_outf(&mf1, &mf2, checkdiff_consume_hunk, |
| 3762 | checkdiff_consume, &data, |
Jeff King | 3efb988 | 2015-09-24 19:12:23 -0400 | [diff] [blame] | 3763 | &xpp, &xecfg)) |
| 3764 | die("unable to generate checkdiff for %s", one->path); |
Junio C Hamano | 877f23c | 2008-06-26 15:36:59 -0700 | [diff] [blame] | 3765 | |
Junio C Hamano | 467babf | 2009-09-03 23:39:43 -0700 | [diff] [blame] | 3766 | if (data.ws_rule & WS_BLANK_AT_EOF) { |
Junio C Hamano | d68fe26 | 2009-09-14 22:05:57 -0700 | [diff] [blame] | 3767 | 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 Mallon | 8837d33 | 2010-10-10 19:24:06 +0200 | [diff] [blame] | 3772 | blank_at_eof = ecbdata.blank_at_eof_in_postimage; |
Junio C Hamano | d68fe26 | 2009-09-14 22:05:57 -0700 | [diff] [blame] | 3773 | |
Junio C Hamano | 467babf | 2009-09-03 23:39:43 -0700 | [diff] [blame] | 3774 | 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 Hamano | 877f23c | 2008-06-26 15:36:59 -0700 | [diff] [blame] | 3782 | } |
Johannes Schindelin | 8824689 | 2006-05-20 23:43:13 +0200 | [diff] [blame] | 3783 | } |
Junio C Hamano | fc3abdf | 2007-05-03 13:05:48 -0700 | [diff] [blame] | 3784 | free_and_return: |
| 3785 | diff_free_filespec_data(one); |
| 3786 | diff_free_filespec_data(two); |
Wincent Colaiuta | 62c6489 | 2007-12-13 21:24:52 +0100 | [diff] [blame] | 3787 | if (data.status) |
Brandon Williams | 0d1e0e7 | 2017-10-31 11:19:11 -0700 | [diff] [blame] | 3788 | o->flags.check_failed = 1; |
Johannes Schindelin | 8824689 | 2006-05-20 23:43:13 +0200 | [diff] [blame] | 3789 | } |
| 3790 | |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 3791 | struct diff_filespec *alloc_filespec(const char *path) |
| 3792 | { |
Jeff King | 96ffc06 | 2016-02-22 17:44:32 -0500 | [diff] [blame] | 3793 | struct diff_filespec *spec; |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 3794 | |
Jeff King | 96ffc06 | 2016-02-22 17:44:32 -0500 | [diff] [blame] | 3795 | FLEXPTR_ALLOC_STR(spec, path, path); |
Linus Torvalds | 9fb8841 | 2007-10-25 11:19:10 -0700 | [diff] [blame] | 3796 | spec->count = 1; |
Jeff King | 122aa6f | 2008-10-05 17:43:36 -0400 | [diff] [blame] | 3797 | spec->is_binary = -1; |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 3798 | return spec; |
| 3799 | } |
| 3800 | |
Linus Torvalds | 9fb8841 | 2007-10-25 11:19:10 -0700 | [diff] [blame] | 3801 | void free_filespec(struct diff_filespec *spec) |
| 3802 | { |
| 3803 | if (!--spec->count) { |
| 3804 | diff_free_filespec_data(spec); |
| 3805 | free(spec); |
| 3806 | } |
| 3807 | } |
| 3808 | |
Brandon Williams | f9704c2 | 2017-05-30 10:30:50 -0700 | [diff] [blame] | 3809 | void fill_filespec(struct diff_filespec *spec, const struct object_id *oid, |
| 3810 | int oid_valid, unsigned short mode) |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 3811 | { |
| 3812 | if (mode) { |
| 3813 | spec->mode = canon_mode(mode); |
Brandon Williams | f9704c2 | 2017-05-30 10:30:50 -0700 | [diff] [blame] | 3814 | oidcpy(&spec->oid, oid); |
| 3815 | spec->oid_valid = oid_valid; |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 3816 | } |
| 3817 | } |
| 3818 | |
| 3819 | /* |
Jakub Narebski | 5adf317 | 2007-05-26 00:37:40 +0200 | [diff] [blame] | 3820 | * Given a name and sha1 pair, if the index tells us the file in |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 3821 | * 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 Duy | b78ea5f | 2018-09-21 17:57:19 +0200 | [diff] [blame] | 3824 | static int reuse_worktree_file(struct index_state *istate, |
| 3825 | const char *name, |
| 3826 | const struct object_id *oid, |
| 3827 | int want_file) |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 3828 | { |
Nguyễn Thái Ngọc Duy | 9c5e6c8 | 2013-07-09 22:29:00 +0700 | [diff] [blame] | 3829 | const struct cache_entry *ce; |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 3830 | struct stat st; |
| 3831 | int pos, len; |
| 3832 | |
Junio C Hamano | 150115a | 2009-03-22 15:26:07 -0700 | [diff] [blame] | 3833 | /* |
| 3834 | * We do not read the cache ourselves here, because the |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 3835 | * 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 Duy | b78ea5f | 2018-09-21 17:57:19 +0200 | [diff] [blame] | 3846 | if (!istate->cache) |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 3847 | return 0; |
| 3848 | |
Shawn O. Pearce | 1510fea | 2006-12-14 06:15:57 -0500 | [diff] [blame] | 3849 | /* 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. carlson | 14c3c80 | 2018-05-02 00:25:33 +0000 | [diff] [blame] | 3858 | if (!FAST_WORKING_DIRECTORY && !want_file && has_object_pack(oid)) |
Shawn O. Pearce | 1510fea | 2006-12-14 06:15:57 -0500 | [diff] [blame] | 3859 | return 0; |
| 3860 | |
Jeff King | 06dec43 | 2016-07-22 11:27:53 -0400 | [diff] [blame] | 3861 | /* |
| 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 Duy | b78ea5f | 2018-09-21 17:57:19 +0200 | [diff] [blame] | 3865 | if (!want_file && would_convert_to_git(istate, name)) |
Jeff King | 06dec43 | 2016-07-22 11:27:53 -0400 | [diff] [blame] | 3866 | return 0; |
| 3867 | |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 3868 | len = strlen(name); |
Nguyễn Thái Ngọc Duy | b78ea5f | 2018-09-21 17:57:19 +0200 | [diff] [blame] | 3869 | pos = index_name_pos(istate, name, len); |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 3870 | if (pos < 0) |
| 3871 | return 0; |
Nguyễn Thái Ngọc Duy | b78ea5f | 2018-09-21 17:57:19 +0200 | [diff] [blame] | 3872 | ce = istate->cache[pos]; |
Junio C Hamano | eadb583 | 2008-01-18 23:45:24 -0800 | [diff] [blame] | 3873 | |
| 3874 | /* |
| 3875 | * This is not the sha1 we are looking for, or |
| 3876 | * unreusable because it is not a regular file. |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 3877 | */ |
Jeff King | 9001dc2 | 2018-08-28 17:22:48 -0400 | [diff] [blame] | 3878 | if (!oideq(oid, &ce->oid) || !S_ISREG(ce->ce_mode)) |
Junio C Hamano | eadb583 | 2008-01-18 23:45:24 -0800 | [diff] [blame] | 3879 | return 0; |
| 3880 | |
| 3881 | /* |
Junio C Hamano | 150115a | 2009-03-22 15:26:07 -0700 | [diff] [blame] | 3882 | * 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 Duy | b4d1690 | 2009-08-20 20:46:58 +0700 | [diff] [blame] | 3885 | if ((ce->ce_flags & CE_VALID) || ce_skip_worktree(ce)) |
Junio C Hamano | 150115a | 2009-03-22 15:26:07 -0700 | [diff] [blame] | 3886 | return 0; |
| 3887 | |
| 3888 | /* |
Junio C Hamano | eadb583 | 2008-01-18 23:45:24 -0800 | [diff] [blame] | 3889 | * 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 Duy | b78ea5f | 2018-09-21 17:57:19 +0200 | [diff] [blame] | 3892 | (!lstat(name, &st) && !ie_match_stat(istate, ce, &st, 0))) |
Junio C Hamano | eadb583 | 2008-01-18 23:45:24 -0800 | [diff] [blame] | 3893 | return 1; |
| 3894 | |
| 3895 | return 0; |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 3896 | } |
| 3897 | |
Linus Torvalds | 0478675 | 2007-04-15 11:14:28 -0700 | [diff] [blame] | 3898 | static int diff_populate_gitlink(struct diff_filespec *s, int size_only) |
| 3899 | { |
Jeff King | b1ddfb9 | 2016-02-22 17:45:08 -0500 | [diff] [blame] | 3900 | struct strbuf buf = STRBUF_INIT; |
| 3901 | char *dirty = ""; |
Junio C Hamano | 8e08b41 | 2010-01-16 18:42:53 +0100 | [diff] [blame] | 3902 | |
| 3903 | /* Are we looking at the work tree? */ |
Jens Lehmann | 85adbf2 | 2010-03-12 22:23:52 +0100 | [diff] [blame] | 3904 | if (s->dirty_submodule) |
Junio C Hamano | 8e08b41 | 2010-01-16 18:42:53 +0100 | [diff] [blame] | 3905 | dirty = "-dirty"; |
| 3906 | |
brian m. carlson | a0d12c4 | 2016-06-24 23:09:23 +0000 | [diff] [blame] | 3907 | strbuf_addf(&buf, "Subproject commit %s%s\n", |
| 3908 | oid_to_hex(&s->oid), dirty); |
Jeff King | b1ddfb9 | 2016-02-22 17:45:08 -0500 | [diff] [blame] | 3909 | s->size = buf.len; |
Linus Torvalds | 0478675 | 2007-04-15 11:14:28 -0700 | [diff] [blame] | 3910 | if (size_only) { |
| 3911 | s->data = NULL; |
Jeff King | b1ddfb9 | 2016-02-22 17:45:08 -0500 | [diff] [blame] | 3912 | strbuf_release(&buf); |
| 3913 | } else { |
| 3914 | s->data = strbuf_detach(&buf, NULL); |
| 3915 | s->should_free = 1; |
Linus Torvalds | 0478675 | 2007-04-15 11:14:28 -0700 | [diff] [blame] | 3916 | } |
| 3917 | return 0; |
| 3918 | } |
| 3919 | |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 3920 | /* |
| 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 Duy | b78ea5f | 2018-09-21 17:57:19 +0200 | [diff] [blame] | 3925 | int diff_populate_filespec(struct repository *r, |
| 3926 | struct diff_filespec *s, |
| 3927 | unsigned int flags) |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 3928 | { |
Nguyễn Thái Ngọc Duy | 8e5dd3d | 2014-08-16 10:08:04 +0700 | [diff] [blame] | 3929 | int size_only = flags & CHECK_SIZE_ONLY; |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 3930 | int err = 0; |
Torsten Bögershausen | 8462ff4 | 2018-01-13 23:49:31 +0100 | [diff] [blame] | 3931 | int conv_flags = global_conv_flags_eol; |
Junio C Hamano | 5430bb2 | 2013-06-24 14:35:04 -0700 | [diff] [blame] | 3932 | /* |
| 3933 | * demote FAIL to WARN to allow inspecting the situation |
| 3934 | * instead of refusing. |
| 3935 | */ |
Torsten Bögershausen | 8462ff4 | 2018-01-13 23:49:31 +0100 | [diff] [blame] | 3936 | if (conv_flags & CONV_EOL_RNDTRP_DIE) |
| 3937 | conv_flags = CONV_EOL_RNDTRP_WARN; |
Junio C Hamano | 5430bb2 | 2013-06-24 14:35:04 -0700 | [diff] [blame] | 3938 | |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 3939 | 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 Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 3944 | if (s->data) |
Junio C Hamano | fc3abdf | 2007-05-03 13:05:48 -0700 | [diff] [blame] | 3945 | return 0; |
Linus Torvalds | 0478675 | 2007-04-15 11:14:28 -0700 | [diff] [blame] | 3946 | |
Junio C Hamano | 6e0b8ed | 2007-05-07 01:14:21 -0700 | [diff] [blame] | 3947 | if (size_only && 0 < s->size) |
| 3948 | return 0; |
| 3949 | |
Martin Waitz | 302b928 | 2007-05-21 22:08:28 +0200 | [diff] [blame] | 3950 | if (S_ISGITLINK(s->mode)) |
Linus Torvalds | 0478675 | 2007-04-15 11:14:28 -0700 | [diff] [blame] | 3951 | return diff_populate_gitlink(s, size_only); |
| 3952 | |
brian m. carlson | 41c9560 | 2016-06-24 23:09:24 +0000 | [diff] [blame] | 3953 | if (!s->oid_valid || |
Nguyễn Thái Ngọc Duy | b78ea5f | 2018-09-21 17:57:19 +0200 | [diff] [blame] | 3954 | reuse_worktree_file(r->index, s->path, &s->oid, 0)) { |
Brandon Casey | f285a2d | 2008-10-09 14:12:12 -0500 | [diff] [blame] | 3955 | struct strbuf buf = STRBUF_INIT; |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 3956 | struct stat st; |
| 3957 | int fd; |
Linus Torvalds | 6c510be | 2007-02-13 11:07:23 -0800 | [diff] [blame] | 3958 | |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 3959 | if (lstat(s->path, &st) < 0) { |
Andrey Okoshkin | 10e0ca8 | 2017-10-27 12:33:25 +0300 | [diff] [blame] | 3960 | err_empty: |
| 3961 | err = -1; |
| 3962 | empty: |
| 3963 | s->data = (char *)""; |
| 3964 | s->size = 0; |
| 3965 | return err; |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 3966 | } |
Shawn O. Pearce | dc49cd7 | 2007-03-06 20:44:37 -0500 | [diff] [blame] | 3967 | s->size = xsize_t(st.st_size); |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 3968 | if (!s->size) |
| 3969 | goto empty; |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 3970 | if (S_ISLNK(st.st_mode)) { |
Linus Torvalds | cf219d8 | 2008-12-17 10:26:13 -0800 | [diff] [blame] | 3971 | struct strbuf sb = STRBUF_INIT; |
| 3972 | |
| 3973 | if (strbuf_readlink(&sb, s->path, s->size)) |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 3974 | goto err_empty; |
René Scharfe | 0956a6d | 2008-12-18 17:56:51 +0100 | [diff] [blame] | 3975 | s->size = sb.len; |
| 3976 | s->data = strbuf_detach(&sb, NULL); |
Linus Torvalds | cf219d8 | 2008-12-17 10:26:13 -0800 | [diff] [blame] | 3977 | s->should_free = 1; |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 3978 | return 0; |
| 3979 | } |
Junio C Hamano | 12426e1 | 2017-03-01 18:04:44 +0100 | [diff] [blame] | 3980 | |
| 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 Duy | b78ea5f | 2018-09-21 17:57:19 +0200 | [diff] [blame] | 3987 | if (size_only && !would_convert_to_git(r->index, s->path)) |
Linus Torvalds | cf219d8 | 2008-12-17 10:26:13 -0800 | [diff] [blame] | 3988 | return 0; |
Junio C Hamano | 12426e1 | 2017-03-01 18:04:44 +0100 | [diff] [blame] | 3989 | |
| 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 Duy | 6bf3b81 | 2014-08-16 10:08:05 +0700 | [diff] [blame] | 3999 | 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 Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 4004 | fd = open(s->path, O_RDONLY); |
| 4005 | if (fd < 0) |
| 4006 | goto err_empty; |
Shawn O. Pearce | c4712e4 | 2006-12-24 00:47:23 -0500 | [diff] [blame] | 4007 | s->data = xmmap(NULL, s->size, PROT_READ, MAP_PRIVATE, fd, 0); |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 4008 | close(fd); |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 4009 | s->should_munmap = 1; |
Linus Torvalds | 6c510be | 2007-02-13 11:07:23 -0800 | [diff] [blame] | 4010 | |
| 4011 | /* |
| 4012 | * Convert from working tree format to canonical git format |
| 4013 | */ |
Nguyễn Thái Ngọc Duy | b78ea5f | 2018-09-21 17:57:19 +0200 | [diff] [blame] | 4014 | if (convert_to_git(r->index, s->path, s->data, s->size, &buf, conv_flags)) { |
René Scharfe | c32f749 | 2007-10-21 11:23:49 +0200 | [diff] [blame] | 4015 | size_t size = 0; |
Linus Torvalds | 6c510be | 2007-02-13 11:07:23 -0800 | [diff] [blame] | 4016 | munmap(s->data, s->size); |
| 4017 | s->should_munmap = 0; |
René Scharfe | c32f749 | 2007-10-21 11:23:49 +0200 | [diff] [blame] | 4018 | s->data = strbuf_detach(&buf, &size); |
| 4019 | s->size = size; |
Linus Torvalds | 6c510be | 2007-02-13 11:07:23 -0800 | [diff] [blame] | 4020 | s->should_free = 1; |
| 4021 | } |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 4022 | } |
| 4023 | else { |
Nicolas Pitre | 21666f1 | 2007-02-26 14:55:59 -0500 | [diff] [blame] | 4024 | enum object_type type; |
Nguyễn Thái Ngọc Duy | 6bf3b81 | 2014-08-16 10:08:05 +0700 | [diff] [blame] | 4025 | if (size_only || (flags & CHECK_BINARY)) { |
Nguyễn Thái Ngọc Duy | b78ea5f | 2018-09-21 17:57:19 +0200 | [diff] [blame] | 4026 | type = oid_object_info(r, &s->oid, &s->size); |
Nicolas Pitre | c50c431 | 2010-10-22 00:02:27 -0400 | [diff] [blame] | 4027 | if (type < 0) |
brian m. carlson | a0d12c4 | 2016-06-24 23:09:23 +0000 | [diff] [blame] | 4028 | die("unable to read %s", |
| 4029 | oid_to_hex(&s->oid)); |
Nguyễn Thái Ngọc Duy | 6bf3b81 | 2014-08-16 10:08:05 +0700 | [diff] [blame] | 4030 | 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 Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 4036 | } |
brian m. carlson | b4f5aca | 2018-03-12 02:27:53 +0000 | [diff] [blame] | 4037 | s->data = read_object_file(&s->oid, &type, &s->size); |
Nguyễn Thái Ngọc Duy | 6bf3b81 | 2014-08-16 10:08:05 +0700 | [diff] [blame] | 4038 | if (!s->data) |
brian m. carlson | a0d12c4 | 2016-06-24 23:09:23 +0000 | [diff] [blame] | 4039 | die("unable to read %s", oid_to_hex(&s->oid)); |
Nguyễn Thái Ngọc Duy | 6bf3b81 | 2014-08-16 10:08:05 +0700 | [diff] [blame] | 4040 | s->should_free = 1; |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 4041 | } |
| 4042 | return 0; |
| 4043 | } |
| 4044 | |
Junio C Hamano | 8ae92e6 | 2007-10-02 21:01:03 -0700 | [diff] [blame] | 4045 | void diff_free_filespec_blob(struct diff_filespec *s) |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 4046 | { |
| 4047 | if (s->should_free) |
| 4048 | free(s->data); |
| 4049 | else if (s->should_munmap) |
| 4050 | munmap(s->data, s->size); |
Junio C Hamano | fc3abdf | 2007-05-03 13:05:48 -0700 | [diff] [blame] | 4051 | |
| 4052 | if (s->should_free || s->should_munmap) { |
| 4053 | s->should_free = s->should_munmap = 0; |
| 4054 | s->data = NULL; |
| 4055 | } |
Jeff King | eede7b7 | 2007-09-25 15:29:42 -0400 | [diff] [blame] | 4056 | } |
| 4057 | |
| 4058 | void diff_free_filespec_data(struct diff_filespec *s) |
| 4059 | { |
Junio C Hamano | 8ae92e6 | 2007-10-02 21:01:03 -0700 | [diff] [blame] | 4060 | diff_free_filespec_blob(s); |
Ævar Arnfjörð Bjarmason | 6a83d90 | 2017-06-15 23:15:46 +0000 | [diff] [blame] | 4061 | FREE_AND_NULL(s->cnt_data); |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 4062 | } |
| 4063 | |
Nguyễn Thái Ngọc Duy | b78ea5f | 2018-09-21 17:57:19 +0200 | [diff] [blame] | 4064 | static void prep_temp_blob(struct index_state *istate, |
| 4065 | const char *path, struct diff_tempfile *temp, |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 4066 | void *blob, |
| 4067 | unsigned long size, |
brian m. carlson | 09bdff2 | 2016-06-24 23:09:29 +0000 | [diff] [blame] | 4068 | const struct object_id *oid, |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 4069 | int mode) |
| 4070 | { |
Johannes Schindelin | 4e218f5 | 2009-03-21 12:42:52 +0100 | [diff] [blame] | 4071 | struct strbuf buf = STRBUF_INIT; |
Brandon Williams | c2a46a7 | 2018-02-14 10:59:54 -0800 | [diff] [blame] | 4072 | struct strbuf tempfile = STRBUF_INIT; |
David Aguilar | 003b33a | 2009-05-31 01:35:52 -0700 | [diff] [blame] | 4073 | char *path_dup = xstrdup(path); |
| 4074 | const char *base = basename(path_dup); |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 4075 | |
David Aguilar | 003b33a | 2009-05-31 01:35:52 -0700 | [diff] [blame] | 4076 | /* Generate "XXXXXX_basename.ext" */ |
Brandon Williams | c2a46a7 | 2018-02-14 10:59:54 -0800 | [diff] [blame] | 4077 | strbuf_addstr(&tempfile, "XXXXXX_"); |
| 4078 | strbuf_addstr(&tempfile, base); |
David Aguilar | 003b33a | 2009-05-31 01:35:52 -0700 | [diff] [blame] | 4079 | |
Brandon Williams | c2a46a7 | 2018-02-14 10:59:54 -0800 | [diff] [blame] | 4080 | temp->tempfile = mks_tempfile_ts(tempfile.buf, strlen(base) + 1); |
Jeff King | 076aa2c | 2017-09-05 08:15:08 -0400 | [diff] [blame] | 4081 | if (!temp->tempfile) |
Thomas Rast | d824cbb | 2009-06-27 17:58:46 +0200 | [diff] [blame] | 4082 | die_errno("unable to create temp-file"); |
Nguyễn Thái Ngọc Duy | b78ea5f | 2018-09-21 17:57:19 +0200 | [diff] [blame] | 4083 | if (convert_to_working_tree(istate, path, |
Johannes Schindelin | 4e218f5 | 2009-03-21 12:42:52 +0100 | [diff] [blame] | 4084 | (const char *)blob, (size_t)size, &buf)) { |
| 4085 | blob = buf.buf; |
| 4086 | size = buf.len; |
| 4087 | } |
Junio C Hamano | c50424a | 2017-09-25 15:24:06 +0900 | [diff] [blame] | 4088 | if (write_in_full(temp->tempfile->fd, blob, size) < 0 || |
Jeff King | 076aa2c | 2017-09-05 08:15:08 -0400 | [diff] [blame] | 4089 | close_tempfile_gently(temp->tempfile)) |
Thomas Rast | 0721c31 | 2009-06-27 17:58:47 +0200 | [diff] [blame] | 4090 | die_errno("unable to write temp-file"); |
Jeff King | 076aa2c | 2017-09-05 08:15:08 -0400 | [diff] [blame] | 4091 | temp->name = get_tempfile_path(temp->tempfile); |
brian m. carlson | 09bdff2 | 2016-06-24 23:09:29 +0000 | [diff] [blame] | 4092 | oid_to_hex_r(temp->hex, oid); |
Jeff King | 5096d49 | 2015-09-24 17:06:08 -0400 | [diff] [blame] | 4093 | xsnprintf(temp->mode, sizeof(temp->mode), "%06o", mode); |
Johannes Schindelin | 4e218f5 | 2009-03-21 12:42:52 +0100 | [diff] [blame] | 4094 | strbuf_release(&buf); |
Brandon Williams | c2a46a7 | 2018-02-14 10:59:54 -0800 | [diff] [blame] | 4095 | strbuf_release(&tempfile); |
David Aguilar | 003b33a | 2009-05-31 01:35:52 -0700 | [diff] [blame] | 4096 | free(path_dup); |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 4097 | } |
| 4098 | |
Nguyễn Thái Ngọc Duy | b78ea5f | 2018-09-21 17:57:19 +0200 | [diff] [blame] | 4099 | static struct diff_tempfile *prepare_temp_file(struct repository *r, |
| 4100 | const char *name, |
| 4101 | struct diff_filespec *one) |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 4102 | { |
Jeff King | 479b0ae | 2009-01-22 00:59:56 -0500 | [diff] [blame] | 4103 | struct diff_tempfile *temp = claim_diff_tempfile(); |
| 4104 | |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 4105 | 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 King | 5096d49 | 2015-09-24 17:06:08 -0400 | [diff] [blame] | 4111 | xsnprintf(temp->hex, sizeof(temp->hex), "."); |
| 4112 | xsnprintf(temp->mode, sizeof(temp->mode), "."); |
Jeff King | 479b0ae | 2009-01-22 00:59:56 -0500 | [diff] [blame] | 4113 | return temp; |
| 4114 | } |
| 4115 | |
Thomas Rast | aba4727 | 2014-02-16 17:52:34 +0100 | [diff] [blame] | 4116 | if (!S_ISGITLINK(one->mode) && |
brian m. carlson | 41c9560 | 2016-06-24 23:09:24 +0000 | [diff] [blame] | 4117 | (!one->oid_valid || |
Nguyễn Thái Ngọc Duy | b78ea5f | 2018-09-21 17:57:19 +0200 | [diff] [blame] | 4118 | reuse_worktree_file(r->index, name, &one->oid, 1))) { |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 4119 | struct stat st; |
| 4120 | if (lstat(name, &st) < 0) { |
| 4121 | if (errno == ENOENT) |
| 4122 | goto not_a_valid_file; |
Thomas Rast | d824cbb | 2009-06-27 17:58:46 +0200 | [diff] [blame] | 4123 | die_errno("stat(%s)", name); |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 4124 | } |
| 4125 | if (S_ISLNK(st.st_mode)) { |
Jeff King | 3cd7388 | 2009-05-25 06:46:09 -0400 | [diff] [blame] | 4126 | struct strbuf sb = STRBUF_INIT; |
| 4127 | if (strbuf_readlink(&sb, name, st.st_size) < 0) |
Thomas Rast | 0721c31 | 2009-06-27 17:58:47 +0200 | [diff] [blame] | 4128 | die_errno("readlink(%s)", name); |
Nguyễn Thái Ngọc Duy | b78ea5f | 2018-09-21 17:57:19 +0200 | [diff] [blame] | 4129 | prep_temp_blob(r->index, name, temp, sb.buf, sb.len, |
brian m. carlson | 41c9560 | 2016-06-24 23:09:24 +0000 | [diff] [blame] | 4130 | (one->oid_valid ? |
brian m. carlson | 09bdff2 | 2016-06-24 23:09:29 +0000 | [diff] [blame] | 4131 | &one->oid : &null_oid), |
brian m. carlson | 41c9560 | 2016-06-24 23:09:24 +0000 | [diff] [blame] | 4132 | (one->oid_valid ? |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 4133 | one->mode : S_IFLNK)); |
Jeff King | 3cd7388 | 2009-05-25 06:46:09 -0400 | [diff] [blame] | 4134 | strbuf_release(&sb); |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 4135 | } |
| 4136 | else { |
| 4137 | /* we can borrow from the file in the work tree */ |
| 4138 | temp->name = name; |
brian m. carlson | 41c9560 | 2016-06-24 23:09:24 +0000 | [diff] [blame] | 4139 | if (!one->oid_valid) |
Brandon Williams | 7401415 | 2017-05-30 10:30:52 -0700 | [diff] [blame] | 4140 | oid_to_hex_r(temp->hex, &null_oid); |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 4141 | else |
René Scharfe | 2490574 | 2017-01-28 23:03:03 +0100 | [diff] [blame] | 4142 | oid_to_hex_r(temp->hex, &one->oid); |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 4143 | /* 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 Williams | 7401415 | 2017-05-30 10:30:52 -0700 | [diff] [blame] | 4146 | * !(one->oid_valid), as long as |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 4147 | * DIFF_FILE_VALID(one). |
| 4148 | */ |
Jeff King | 5096d49 | 2015-09-24 17:06:08 -0400 | [diff] [blame] | 4149 | xsnprintf(temp->mode, sizeof(temp->mode), "%06o", one->mode); |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 4150 | } |
Jeff King | 479b0ae | 2009-01-22 00:59:56 -0500 | [diff] [blame] | 4151 | return temp; |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 4152 | } |
| 4153 | else { |
Nguyễn Thái Ngọc Duy | b78ea5f | 2018-09-21 17:57:19 +0200 | [diff] [blame] | 4154 | if (diff_populate_filespec(r, one, 0)) |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 4155 | die("cannot read data blob for %s", one->path); |
Nguyễn Thái Ngọc Duy | b78ea5f | 2018-09-21 17:57:19 +0200 | [diff] [blame] | 4156 | prep_temp_blob(r->index, name, temp, |
| 4157 | one->data, one->size, |
brian m. carlson | 09bdff2 | 2016-06-24 23:09:29 +0000 | [diff] [blame] | 4158 | &one->oid, one->mode); |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 4159 | } |
Jeff King | 479b0ae | 2009-01-22 00:59:56 -0500 | [diff] [blame] | 4160 | return temp; |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 4161 | } |
| 4162 | |
Nguyễn Thái Ngọc Duy | b78ea5f | 2018-09-21 17:57:19 +0200 | [diff] [blame] | 4163 | static void add_external_diff_name(struct repository *r, |
| 4164 | struct argv_array *argv, |
Jeff King | f3efe78 | 2014-04-19 15:22:25 -0400 | [diff] [blame] | 4165 | const char *name, |
| 4166 | struct diff_filespec *df) |
| 4167 | { |
Nguyễn Thái Ngọc Duy | b78ea5f | 2018-09-21 17:57:19 +0200 | [diff] [blame] | 4168 | struct diff_tempfile *temp = prepare_temp_file(r, name, df); |
Jeff King | f3efe78 | 2014-04-19 15:22:25 -0400 | [diff] [blame] | 4169 | argv_array_push(argv, temp->name); |
| 4170 | argv_array_push(argv, temp->hex); |
| 4171 | argv_array_push(argv, temp->mode); |
| 4172 | } |
| 4173 | |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 4174 | /* 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 | */ |
| 4180 | static 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 Klinger | ee7fb0b | 2013-12-06 10:38:46 +1100 | [diff] [blame] | 4186 | struct diff_options *o) |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 4187 | { |
Jeff King | 82fbf26 | 2014-04-19 15:17:06 -0400 | [diff] [blame] | 4188 | struct argv_array argv = ARGV_ARRAY_INIT; |
Jeff King | ae049c9 | 2014-04-19 15:17:25 -0400 | [diff] [blame] | 4189 | struct argv_array env = ARGV_ARRAY_INIT; |
Zoltan Klinger | ee7fb0b | 2013-12-06 10:38:46 +1100 | [diff] [blame] | 4190 | struct diff_queue_struct *q = &diff_queued_diff; |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 4191 | |
Jeff King | 0d4217d | 2014-04-19 15:20:46 -0400 | [diff] [blame] | 4192 | argv_array_push(&argv, pgm); |
| 4193 | argv_array_push(&argv, name); |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 4194 | |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 4195 | if (one && two) { |
Nguyễn Thái Ngọc Duy | b78ea5f | 2018-09-21 17:57:19 +0200 | [diff] [blame] | 4196 | add_external_diff_name(o->repo, &argv, name, one); |
Jeff King | f3efe78 | 2014-04-19 15:22:25 -0400 | [diff] [blame] | 4197 | if (!other) |
Nguyễn Thái Ngọc Duy | b78ea5f | 2018-09-21 17:57:19 +0200 | [diff] [blame] | 4198 | add_external_diff_name(o->repo, &argv, name, two); |
Jeff King | f3efe78 | 2014-04-19 15:22:25 -0400 | [diff] [blame] | 4199 | else { |
Nguyễn Thái Ngọc Duy | b78ea5f | 2018-09-21 17:57:19 +0200 | [diff] [blame] | 4200 | add_external_diff_name(o->repo, &argv, other, two); |
Jeff King | 82fbf26 | 2014-04-19 15:17:06 -0400 | [diff] [blame] | 4201 | argv_array_push(&argv, other); |
| 4202 | argv_array_push(&argv, xfrm_msg); |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 4203 | } |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 4204 | } |
Zoltan Klinger | ee7fb0b | 2013-12-06 10:38:46 +1100 | [diff] [blame] | 4205 | |
Jeff King | ae049c9 | 2014-04-19 15:17:25 -0400 | [diff] [blame] | 4206 | 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 Klinger | ee7fb0b | 2013-12-06 10:38:46 +1100 | [diff] [blame] | 4208 | |
Jeff King | 89294d1 | 2014-04-19 15:19:19 -0400 | [diff] [blame] | 4209 | 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 Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 4212 | remove_tempfile(); |
Jeff King | 82fbf26 | 2014-04-19 15:17:06 -0400 | [diff] [blame] | 4213 | argv_array_clear(&argv); |
Jeff King | ae049c9 | 2014-04-19 15:17:25 -0400 | [diff] [blame] | 4214 | argv_array_clear(&env); |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 4215 | } |
| 4216 | |
Junio C Hamano | b67b961 | 2009-01-26 00:08:24 -0800 | [diff] [blame] | 4217 | static int similarity_index(struct diff_filepair *p) |
| 4218 | { |
| 4219 | return p->score * 100 / MAX_SCORE; |
| 4220 | } |
| 4221 | |
Jeff King | 4f03666 | 2016-10-20 02:21:25 -0400 | [diff] [blame] | 4222 | static const char *diff_abbrev_oid(const struct object_id *oid, int abbrev) |
| 4223 | { |
| 4224 | if (startup_info->have_repository) |
brian m. carlson | aab9583 | 2018-03-12 02:27:30 +0000 | [diff] [blame] | 4225 | return find_unique_abbrev(oid, abbrev); |
Jeff King | 4f03666 | 2016-10-20 02:21:25 -0400 | [diff] [blame] | 4226 | else { |
| 4227 | char *hex = oid_to_hex(oid); |
Junio C Hamano | 0d9c527 | 2016-10-27 14:58:48 -0700 | [diff] [blame] | 4228 | if (abbrev < 0) |
| 4229 | abbrev = FALLBACK_DEFAULT_ABBREV; |
brian m. carlson | 02afca1 | 2018-07-16 01:28:05 +0000 | [diff] [blame] | 4230 | if (abbrev > the_hash_algo->hexsz) |
Johannes Schindelin | 033abf9 | 2018-05-02 11:38:39 +0200 | [diff] [blame] | 4231 | BUG("oid abbreviation out of range: %d", abbrev); |
Jack Bates | 43d1948 | 2016-12-06 09:56:14 -0700 | [diff] [blame] | 4232 | if (abbrev) |
| 4233 | hex[abbrev] = '\0'; |
Jeff King | 4f03666 | 2016-10-20 02:21:25 -0400 | [diff] [blame] | 4234 | return hex; |
| 4235 | } |
| 4236 | } |
| 4237 | |
Junio C Hamano | b67b961 | 2009-01-26 00:08:24 -0800 | [diff] [blame] | 4238 | static 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 Wesarg | 3746644 | 2010-05-04 00:38:07 +0200 | [diff] [blame] | 4244 | struct diff_filepair *p, |
Junio C Hamano | 5977744 | 2010-06-18 11:16:57 -0700 | [diff] [blame] | 4245 | int *must_show_header, |
Bert Wesarg | 3746644 | 2010-05-04 00:38:07 +0200 | [diff] [blame] | 4246 | int use_color) |
Junio C Hamano | b67b961 | 2009-01-26 00:08:24 -0800 | [diff] [blame] | 4247 | { |
Bert Wesarg | 3746644 | 2010-05-04 00:38:07 +0200 | [diff] [blame] | 4248 | const char *set = diff_get_color(use_color, DIFF_METAINFO); |
| 4249 | const char *reset = diff_get_color(use_color, DIFF_RESET); |
John Keeping | 30997bb | 2013-02-07 20:15:27 +0000 | [diff] [blame] | 4250 | const char *line_prefix = diff_line_prefix(o); |
Bo Yang | 7be5761 | 2010-05-26 15:23:54 +0800 | [diff] [blame] | 4251 | |
Christian Couder | 296c6bb | 2010-05-26 04:50:12 +0200 | [diff] [blame] | 4252 | *must_show_header = 1; |
Junio C Hamano | b67b961 | 2009-01-26 00:08:24 -0800 | [diff] [blame] | 4253 | strbuf_init(msg, PATH_MAX * 2 + 300); |
| 4254 | switch (p->status) { |
| 4255 | case DIFF_STATUS_COPIED: |
Junio C Hamano | 98ad90f | 2010-06-18 11:16:57 -0700 | [diff] [blame] | 4256 | 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 Hamano | b67b961 | 2009-01-26 00:08:24 -0800 | [diff] [blame] | 4260 | quote_c_style(name, msg, NULL, 0); |
Junio C Hamano | 98ad90f | 2010-06-18 11:16:57 -0700 | [diff] [blame] | 4261 | strbuf_addf(msg, "%s\n%s%scopy to ", reset, line_prefix, set); |
Junio C Hamano | b67b961 | 2009-01-26 00:08:24 -0800 | [diff] [blame] | 4262 | quote_c_style(other, msg, NULL, 0); |
Bert Wesarg | 3746644 | 2010-05-04 00:38:07 +0200 | [diff] [blame] | 4263 | strbuf_addf(msg, "%s\n", reset); |
Junio C Hamano | b67b961 | 2009-01-26 00:08:24 -0800 | [diff] [blame] | 4264 | break; |
| 4265 | case DIFF_STATUS_RENAMED: |
Junio C Hamano | 98ad90f | 2010-06-18 11:16:57 -0700 | [diff] [blame] | 4266 | 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 Hamano | b67b961 | 2009-01-26 00:08:24 -0800 | [diff] [blame] | 4270 | quote_c_style(name, msg, NULL, 0); |
Junio C Hamano | 98ad90f | 2010-06-18 11:16:57 -0700 | [diff] [blame] | 4271 | strbuf_addf(msg, "%s\n%s%srename to ", |
| 4272 | reset, line_prefix, set); |
Junio C Hamano | b67b961 | 2009-01-26 00:08:24 -0800 | [diff] [blame] | 4273 | quote_c_style(other, msg, NULL, 0); |
Bert Wesarg | 3746644 | 2010-05-04 00:38:07 +0200 | [diff] [blame] | 4274 | strbuf_addf(msg, "%s\n", reset); |
Junio C Hamano | b67b961 | 2009-01-26 00:08:24 -0800 | [diff] [blame] | 4275 | break; |
| 4276 | case DIFF_STATUS_MODIFIED: |
| 4277 | if (p->score) { |
Junio C Hamano | 98ad90f | 2010-06-18 11:16:57 -0700 | [diff] [blame] | 4278 | strbuf_addf(msg, "%s%sdissimilarity index %d%%%s\n", |
| 4279 | line_prefix, |
Bert Wesarg | 3746644 | 2010-05-04 00:38:07 +0200 | [diff] [blame] | 4280 | set, similarity_index(p), reset); |
Junio C Hamano | b67b961 | 2009-01-26 00:08:24 -0800 | [diff] [blame] | 4281 | break; |
| 4282 | } |
| 4283 | /* fallthru */ |
| 4284 | default: |
Christian Couder | 296c6bb | 2010-05-26 04:50:12 +0200 | [diff] [blame] | 4285 | *must_show_header = 0; |
Junio C Hamano | b67b961 | 2009-01-26 00:08:24 -0800 | [diff] [blame] | 4286 | } |
Jeff King | 9001dc2 | 2018-08-28 17:22:48 -0400 | [diff] [blame] | 4287 | if (one && two && !oideq(&one->oid, &two->oid)) { |
brian m. carlson | de1d81d | 2018-05-02 00:25:52 +0000 | [diff] [blame] | 4288 | const unsigned hexsz = the_hash_algo->hexsz; |
| 4289 | int abbrev = o->flags.full_index ? hexsz : DEFAULT_ABBREV; |
Junio C Hamano | b67b961 | 2009-01-26 00:08:24 -0800 | [diff] [blame] | 4290 | |
Brandon Williams | 0d1e0e7 | 2017-10-31 11:19:11 -0700 | [diff] [blame] | 4291 | if (o->flags.binary) { |
Junio C Hamano | b67b961 | 2009-01-26 00:08:24 -0800 | [diff] [blame] | 4292 | mmfile_t mf; |
Nguyễn Thái Ngọc Duy | b78ea5f | 2018-09-21 17:57:19 +0200 | [diff] [blame] | 4293 | 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. carlson | de1d81d | 2018-05-02 00:25:52 +0000 | [diff] [blame] | 4297 | abbrev = hexsz; |
Junio C Hamano | b67b961 | 2009-01-26 00:08:24 -0800 | [diff] [blame] | 4298 | } |
Jeff King | 4f03666 | 2016-10-20 02:21:25 -0400 | [diff] [blame] | 4299 | 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 Hamano | b67b961 | 2009-01-26 00:08:24 -0800 | [diff] [blame] | 4302 | if (one->mode == two->mode) |
| 4303 | strbuf_addf(msg, " %06o", one->mode); |
Bert Wesarg | 3746644 | 2010-05-04 00:38:07 +0200 | [diff] [blame] | 4304 | strbuf_addf(msg, "%s\n", reset); |
Junio C Hamano | b67b961 | 2009-01-26 00:08:24 -0800 | [diff] [blame] | 4305 | } |
Junio C Hamano | b67b961 | 2009-01-26 00:08:24 -0800 | [diff] [blame] | 4306 | } |
| 4307 | |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 4308 | static void run_diff_cmd(const char *pgm, |
| 4309 | const char *name, |
| 4310 | const char *other, |
Junio C Hamano | cd676a5 | 2008-02-12 14:26:02 -0800 | [diff] [blame] | 4311 | const char *attr_path, |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 4312 | struct diff_filespec *one, |
| 4313 | struct diff_filespec *two, |
Junio C Hamano | b67b961 | 2009-01-26 00:08:24 -0800 | [diff] [blame] | 4314 | struct strbuf *msg, |
Junio C Hamano | 051308f | 2006-05-04 16:51:44 -0700 | [diff] [blame] | 4315 | struct diff_options *o, |
Junio C Hamano | b67b961 | 2009-01-26 00:08:24 -0800 | [diff] [blame] | 4316 | struct diff_filepair *p) |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 4317 | { |
Junio C Hamano | b67b961 | 2009-01-26 00:08:24 -0800 | [diff] [blame] | 4318 | const char *xfrm_msg = NULL; |
| 4319 | int complete_rewrite = (p->status == DIFF_STATUS_MODIFIED) && p->score; |
Christian Couder | 296c6bb | 2010-05-26 04:50:12 +0200 | [diff] [blame] | 4320 | int must_show_header = 0; |
Junio C Hamano | b67b961 | 2009-01-26 00:08:24 -0800 | [diff] [blame] | 4321 | |
Junio C Hamano | bd8c1a9 | 2012-07-17 22:08:59 -0700 | [diff] [blame] | 4322 | |
Brandon Williams | 0d1e0e7 | 2017-10-31 11:19:11 -0700 | [diff] [blame] | 4323 | if (o->flags.allow_external) { |
Nguyễn Thái Ngọc Duy | acd00ea | 2018-09-21 17:57:33 +0200 | [diff] [blame] | 4324 | struct userdiff_driver *drv; |
| 4325 | |
| 4326 | drv = userdiff_find_by_path(o->repo->index, attr_path); |
Jeff King | be58e70 | 2008-10-05 17:43:21 -0400 | [diff] [blame] | 4327 | if (drv && drv->external) |
| 4328 | pgm = drv->external; |
Junio C Hamano | f1af60b | 2007-04-22 17:52:55 -0700 | [diff] [blame] | 4329 | } |
| 4330 | |
Bert Wesarg | 3746644 | 2010-05-04 00:38:07 +0200 | [diff] [blame] | 4331 | 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 Hamano | 5977744 | 2010-06-18 11:16:57 -0700 | [diff] [blame] | 4337 | &must_show_header, |
Jeff King | daa0c3d | 2011-08-17 22:04:23 -0700 | [diff] [blame] | 4338 | want_color(o->use_color) && !pgm); |
Bert Wesarg | 3746644 | 2010-05-04 00:38:07 +0200 | [diff] [blame] | 4339 | xfrm_msg = msg->len ? msg->buf : NULL; |
| 4340 | } |
| 4341 | |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 4342 | if (pgm) { |
Jeff King | 4bc1792 | 2019-02-14 00:49:42 -0500 | [diff] [blame] | 4343 | run_external_diff(pgm, name, other, one, two, xfrm_msg, o); |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 4344 | return; |
| 4345 | } |
| 4346 | if (one && two) |
| 4347 | builtin_diff(name, other ? other : name, |
Christian Couder | 296c6bb | 2010-05-26 04:50:12 +0200 | [diff] [blame] | 4348 | one, two, xfrm_msg, must_show_header, |
| 4349 | o, complete_rewrite); |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 4350 | else |
Daniel Barkalow | c0c7773 | 2008-03-09 22:43:39 -0400 | [diff] [blame] | 4351 | fprintf(o->file, "* Unmerged path %s\n", name); |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 4352 | } |
| 4353 | |
Nguyễn Thái Ngọc Duy | 58bf2a4 | 2018-09-21 17:57:31 +0200 | [diff] [blame] | 4354 | static void diff_fill_oid_info(struct diff_filespec *one, struct index_state *istate) |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 4355 | { |
| 4356 | if (DIFF_FILE_VALID(one)) { |
brian m. carlson | 41c9560 | 2016-06-24 23:09:24 +0000 | [diff] [blame] | 4357 | if (!one->oid_valid) { |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 4358 | struct stat st; |
Junio C Hamano | 4682d85 | 2012-06-27 20:14:47 -0700 | [diff] [blame] | 4359 | if (one->is_stdin) { |
brian m. carlson | a0d12c4 | 2016-06-24 23:09:23 +0000 | [diff] [blame] | 4360 | oidclr(&one->oid); |
Johannes Schindelin | 5332b2a | 2007-02-25 23:36:10 +0100 | [diff] [blame] | 4361 | return; |
| 4362 | } |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 4363 | if (lstat(one->path, &st) < 0) |
Thomas Rast | 0721c31 | 2009-06-27 17:58:47 +0200 | [diff] [blame] | 4364 | die_errno("stat '%s'", one->path); |
Nguyễn Thái Ngọc Duy | 58bf2a4 | 2018-09-21 17:57:31 +0200 | [diff] [blame] | 4365 | if (index_path(istate, &one->oid, one->path, &st, 0)) |
Alexander Potashev | d753070 | 2009-01-04 21:38:41 +0300 | [diff] [blame] | 4366 | die("cannot hash %s", one->path); |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 4367 | } |
| 4368 | } |
| 4369 | else |
brian m. carlson | a0d12c4 | 2016-06-24 23:09:23 +0000 | [diff] [blame] | 4370 | oidclr(&one->oid); |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 4371 | } |
| 4372 | |
Junio C Hamano | cd676a5 | 2008-02-12 14:26:02 -0800 | [diff] [blame] | 4373 | static 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 Sixt | ffd04e9 | 2018-10-19 18:58:07 +0200 | [diff] [blame] | 4376 | if (*namep && !is_absolute_path(*namep)) { |
Junio C Hamano | cd676a5 | 2008-02-12 14:26:02 -0800 | [diff] [blame] | 4377 | *namep += prefix_length; |
Jakub Narebski | d8faea9 | 2010-08-09 10:50:53 -0400 | [diff] [blame] | 4378 | if (**namep == '/') |
| 4379 | ++*namep; |
| 4380 | } |
Johannes Sixt | ffd04e9 | 2018-10-19 18:58:07 +0200 | [diff] [blame] | 4381 | if (*otherp && !is_absolute_path(*otherp)) { |
Junio C Hamano | cd676a5 | 2008-02-12 14:26:02 -0800 | [diff] [blame] | 4382 | *otherp += prefix_length; |
Jakub Narebski | d8faea9 | 2010-08-09 10:50:53 -0400 | [diff] [blame] | 4383 | if (**otherp == '/') |
| 4384 | ++*otherp; |
| 4385 | } |
Junio C Hamano | cd676a5 | 2008-02-12 14:26:02 -0800 | [diff] [blame] | 4386 | } |
| 4387 | |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 4388 | static void run_diff(struct diff_filepair *p, struct diff_options *o) |
| 4389 | { |
| 4390 | const char *pgm = external_diff(); |
Pierre Habouzit | 663af34 | 2007-09-20 00:42:15 +0200 | [diff] [blame] | 4391 | struct strbuf msg; |
Pierre Habouzit | 663af34 | 2007-09-20 00:42:15 +0200 | [diff] [blame] | 4392 | struct diff_filespec *one = p->one; |
| 4393 | struct diff_filespec *two = p->two; |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 4394 | const char *name; |
| 4395 | const char *other; |
Junio C Hamano | cd676a5 | 2008-02-12 14:26:02 -0800 | [diff] [blame] | 4396 | const char *attr_path; |
Pierre Habouzit | 663af34 | 2007-09-20 00:42:15 +0200 | [diff] [blame] | 4397 | |
Stefan Beller | f2d2a5d | 2017-06-29 17:06:46 -0700 | [diff] [blame] | 4398 | name = one->path; |
| 4399 | other = (strcmp(name, two->path) ? two->path : NULL); |
Junio C Hamano | cd676a5 | 2008-02-12 14:26:02 -0800 | [diff] [blame] | 4400 | attr_path = name; |
| 4401 | if (o->prefix_length) |
| 4402 | strip_prefix(o->prefix_length, &name, &other); |
| 4403 | |
Brandon Williams | 0d1e0e7 | 2017-10-31 11:19:11 -0700 | [diff] [blame] | 4404 | if (!o->flags.allow_external) |
Junio C Hamano | bd8c1a9 | 2012-07-17 22:08:59 -0700 | [diff] [blame] | 4405 | pgm = NULL; |
| 4406 | |
Junio C Hamano | cd676a5 | 2008-02-12 14:26:02 -0800 | [diff] [blame] | 4407 | if (DIFF_PAIR_UNMERGED(p)) { |
| 4408 | run_diff_cmd(pgm, name, NULL, attr_path, |
Junio C Hamano | b67b961 | 2009-01-26 00:08:24 -0800 | [diff] [blame] | 4409 | NULL, NULL, NULL, o, p); |
Junio C Hamano | cd676a5 | 2008-02-12 14:26:02 -0800 | [diff] [blame] | 4410 | return; |
| 4411 | } |
| 4412 | |
Nguyễn Thái Ngọc Duy | 58bf2a4 | 2018-09-21 17:57:31 +0200 | [diff] [blame] | 4413 | diff_fill_oid_info(one, o->repo->index); |
| 4414 | diff_fill_oid_info(two, o->repo->index); |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 4415 | |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 4416 | if (!pgm && |
| 4417 | DIFF_FILE_VALID(one) && DIFF_FILE_VALID(two) && |
| 4418 | (S_IFMT & one->mode) != (S_IFMT & two->mode)) { |
Junio C Hamano | b67b961 | 2009-01-26 00:08:24 -0800 | [diff] [blame] | 4419 | /* |
| 4420 | * a filepair that changes between file and symlink |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 4421 | * needs to be split into deletion and creation. |
| 4422 | */ |
| 4423 | struct diff_filespec *null = alloc_filespec(two->path); |
Junio C Hamano | cd676a5 | 2008-02-12 14:26:02 -0800 | [diff] [blame] | 4424 | run_diff_cmd(NULL, name, other, attr_path, |
Nguyễn Thái Ngọc Duy | b78ea5f | 2018-09-21 17:57:19 +0200 | [diff] [blame] | 4425 | one, null, &msg, |
| 4426 | o, p); |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 4427 | free(null); |
Junio C Hamano | b67b961 | 2009-01-26 00:08:24 -0800 | [diff] [blame] | 4428 | strbuf_release(&msg); |
| 4429 | |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 4430 | null = alloc_filespec(one->path); |
Junio C Hamano | cd676a5 | 2008-02-12 14:26:02 -0800 | [diff] [blame] | 4431 | run_diff_cmd(NULL, name, other, attr_path, |
Junio C Hamano | b67b961 | 2009-01-26 00:08:24 -0800 | [diff] [blame] | 4432 | null, two, &msg, o, p); |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 4433 | free(null); |
| 4434 | } |
| 4435 | else |
Junio C Hamano | cd676a5 | 2008-02-12 14:26:02 -0800 | [diff] [blame] | 4436 | run_diff_cmd(pgm, name, other, attr_path, |
Junio C Hamano | b67b961 | 2009-01-26 00:08:24 -0800 | [diff] [blame] | 4437 | one, two, &msg, o, p); |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 4438 | |
Pierre Habouzit | 663af34 | 2007-09-20 00:42:15 +0200 | [diff] [blame] | 4439 | strbuf_release(&msg); |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 4440 | } |
| 4441 | |
| 4442 | static 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 Duy | b78ea5f | 2018-09-21 17:57:19 +0200 | [diff] [blame] | 4450 | builtin_diffstat(p->one->path, NULL, NULL, NULL, |
| 4451 | diffstat, o, p); |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 4452 | return; |
| 4453 | } |
| 4454 | |
| 4455 | name = p->one->path; |
| 4456 | other = (strcmp(name, p->two->path) ? p->two->path : NULL); |
| 4457 | |
Junio C Hamano | cd676a5 | 2008-02-12 14:26:02 -0800 | [diff] [blame] | 4458 | if (o->prefix_length) |
| 4459 | strip_prefix(o->prefix_length, &name, &other); |
| 4460 | |
Nguyễn Thái Ngọc Duy | 58bf2a4 | 2018-09-21 17:57:31 +0200 | [diff] [blame] | 4461 | diff_fill_oid_info(p->one, o->repo->index); |
| 4462 | diff_fill_oid_info(p->two, o->repo->index); |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 4463 | |
Nguyễn Thái Ngọc Duy | b78ea5f | 2018-09-21 17:57:19 +0200 | [diff] [blame] | 4464 | builtin_diffstat(name, other, p->one, p->two, |
| 4465 | diffstat, o, p); |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 4466 | } |
| 4467 | |
Johannes Schindelin | 8824689 | 2006-05-20 23:43:13 +0200 | [diff] [blame] | 4468 | static void run_checkdiff(struct diff_filepair *p, struct diff_options *o) |
| 4469 | { |
| 4470 | const char *name; |
| 4471 | const char *other; |
Junio C Hamano | cd676a5 | 2008-02-12 14:26:02 -0800 | [diff] [blame] | 4472 | const char *attr_path; |
Johannes Schindelin | 8824689 | 2006-05-20 23:43:13 +0200 | [diff] [blame] | 4473 | |
| 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 Hamano | cd676a5 | 2008-02-12 14:26:02 -0800 | [diff] [blame] | 4481 | attr_path = other ? other : name; |
| 4482 | |
| 4483 | if (o->prefix_length) |
| 4484 | strip_prefix(o->prefix_length, &name, &other); |
Johannes Schindelin | 8824689 | 2006-05-20 23:43:13 +0200 | [diff] [blame] | 4485 | |
Nguyễn Thái Ngọc Duy | 58bf2a4 | 2018-09-21 17:57:31 +0200 | [diff] [blame] | 4486 | diff_fill_oid_info(p->one, o->repo->index); |
| 4487 | diff_fill_oid_info(p->two, o->repo->index); |
Johannes Schindelin | 8824689 | 2006-05-20 23:43:13 +0200 | [diff] [blame] | 4488 | |
Junio C Hamano | cd676a5 | 2008-02-12 14:26:02 -0800 | [diff] [blame] | 4489 | builtin_checkdiff(name, other, attr_path, p->one, p->two, o); |
Johannes Schindelin | 8824689 | 2006-05-20 23:43:13 +0200 | [diff] [blame] | 4490 | } |
| 4491 | |
Nguyễn Thái Ngọc Duy | 4a28847 | 2019-01-27 07:35:31 +0700 | [diff] [blame] | 4492 | static void prep_parse_options(struct diff_options *options); |
| 4493 | |
Nguyễn Thái Ngọc Duy | e675765 | 2018-09-21 17:57:24 +0200 | [diff] [blame] | 4494 | void repo_diff_setup(struct repository *r, struct diff_options *options) |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 4495 | { |
Johannes Schindelin | be4f2b4 | 2010-08-05 10:49:55 +0200 | [diff] [blame] | 4496 | memcpy(options, &default_diff_options, sizeof(*options)); |
Daniel Barkalow | c0c7773 | 2008-03-09 22:43:39 -0400 | [diff] [blame] | 4497 | |
| 4498 | options->file = stdout; |
Nguyễn Thái Ngọc Duy | e675765 | 2018-09-21 17:57:24 +0200 | [diff] [blame] | 4499 | options->repo = r; |
Daniel Barkalow | c0c7773 | 2008-03-09 22:43:39 -0400 | [diff] [blame] | 4500 | |
Stefan Beller | 7648b79 | 2018-08-17 13:43:52 -0700 | [diff] [blame] | 4501 | options->output_indicators[OUTPUT_INDICATOR_NEW] = '+'; |
| 4502 | options->output_indicators[OUTPUT_INDICATOR_OLD] = '-'; |
| 4503 | options->output_indicators[OUTPUT_INDICATOR_CONTEXT] = ' '; |
Jack Bates | 43d1948 | 2016-12-06 09:56:14 -0700 | [diff] [blame] | 4504 | options->abbrev = DEFAULT_ABBREV; |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 4505 | options->line_termination = '\n'; |
| 4506 | options->break_opt = -1; |
| 4507 | options->rename_limit = -1; |
Johan Herland | 712d2c7 | 2011-04-29 11:36:20 +0200 | [diff] [blame] | 4508 | options->dirstat_permille = diff_dirstat_permille_default; |
Jeff Muizelaar | 6468a4e | 2012-09-27 15:12:52 -0400 | [diff] [blame] | 4509 | options->context = diff_context_default; |
Vegard Nossum | c488867 | 2017-01-12 13:21:11 +0100 | [diff] [blame] | 4510 | options->interhunkcontext = diff_interhunk_context_default; |
Junio C Hamano | a17505f | 2016-10-04 15:26:27 -0700 | [diff] [blame] | 4511 | options->ws_error_highlight = ws_error_highlight_default; |
Brandon Williams | 0d1e0e7 | 2017-10-31 11:19:11 -0700 | [diff] [blame] | 4512 | options->flags.rename_empty = 1; |
Stefan Beller | 15af58c | 2018-01-04 14:50:42 -0800 | [diff] [blame] | 4513 | options->objfind = NULL; |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 4514 | |
Kirill Smelkov | 72441af | 2014-04-07 01:46:26 +0400 | [diff] [blame] | 4515 | /* pathchange left =NULL by default */ |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 4516 | options->change = diff_change; |
| 4517 | options->add_remove = diff_addremove; |
Jeff King | f1c9626 | 2011-08-17 22:03:12 -0700 | [diff] [blame] | 4518 | options->use_color = diff_use_color_default; |
Eric Wong | b68ea12 | 2006-07-07 04:01:23 -0700 | [diff] [blame] | 4519 | options->detect_rename = diff_detect_rename_default; |
Michal Privoznik | 07ab4de | 2013-01-16 08:51:57 +0100 | [diff] [blame] | 4520 | options->xdl_opts |= diff_algorithm; |
Michael Haggerty | 433860f | 2016-09-05 11:44:51 +0200 | [diff] [blame] | 4521 | if (diff_indent_heuristic) |
| 4522 | DIFF_XDL_SET(options, INDENT_HEURISTIC); |
Johannes Schindelin | eab9a40 | 2007-12-18 19:32:14 +0000 | [diff] [blame] | 4523 | |
Samuel Bronson | 6d8940b | 2013-12-18 19:08:12 -0500 | [diff] [blame] | 4524 | options->orderfile = diff_order_file_cfg; |
| 4525 | |
Eli Collins | f89504d | 2010-05-02 19:03:41 -0700 | [diff] [blame] | 4526 | if (diff_no_prefix) { |
| 4527 | options->a_prefix = options->b_prefix = ""; |
| 4528 | } else if (!diff_mnemonic_prefix) { |
Junio C Hamano | a5a818e | 2008-08-18 20:08:09 -0700 | [diff] [blame] | 4529 | options->a_prefix = "a/"; |
| 4530 | options->b_prefix = "b/"; |
| 4531 | } |
Stefan Beller | 2e2d5ac | 2017-06-30 13:53:07 -0700 | [diff] [blame] | 4532 | |
| 4533 | options->color_moved = diff_color_moved_default; |
Stefan Beller | 626c0b5 | 2018-07-18 12:31:56 -0700 | [diff] [blame] | 4534 | options->color_moved_ws_handling = diff_color_moved_ws_default; |
Nguyễn Thái Ngọc Duy | 4a28847 | 2019-01-27 07:35:31 +0700 | [diff] [blame] | 4535 | |
| 4536 | prep_parse_options(options); |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 4537 | } |
| 4538 | |
Thomas Rast | 2845265 | 2012-08-03 14:16:24 +0200 | [diff] [blame] | 4539 | void diff_setup_done(struct diff_options *options) |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 4540 | { |
Stefan Beller | 4d8c51a | 2018-01-04 14:50:44 -0800 | [diff] [blame] | 4541 | unsigned check_mask = DIFF_FORMAT_NAME | |
| 4542 | DIFF_FORMAT_NAME_STATUS | |
| 4543 | DIFF_FORMAT_CHECKDIFF | |
| 4544 | DIFF_FORMAT_NO_OUTPUT; |
brian m. carlson | de1d81d | 2018-05-02 00:25:52 +0000 | [diff] [blame] | 4545 | /* |
| 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 Hirvonen | d7de00f | 2006-06-24 20:26:49 +0300 | [diff] [blame] | 4550 | |
Junio C Hamano | 6c37400 | 2013-05-10 17:10:11 +0200 | [diff] [blame] | 4551 | if (options->set_default) |
| 4552 | options->set_default(options); |
| 4553 | |
Stefan Beller | 4d8c51a | 2018-01-04 14:50:44 -0800 | [diff] [blame] | 4554 | if (HAS_MULTI_BITS(options->output_format & check_mask)) |
Jean-Noël AVILA | a2f05c9 | 2016-09-20 21:04:27 +0200 | [diff] [blame] | 4555 | die(_("--name-only, --name-status, --check and -s are mutually exclusive")); |
Timo Hirvonen | d7de00f | 2006-06-24 20:26:49 +0300 | [diff] [blame] | 4556 | |
Stefan Beller | 5e50525 | 2018-01-04 14:50:43 -0800 | [diff] [blame] | 4557 | if (HAS_MULTI_BITS(options->pickaxe_opts & DIFF_PICKAXE_KINDS_MASK)) |
| 4558 | die(_("-G, -S and --find-object are mutually exclusive")); |
| 4559 | |
Junio C Hamano | f245194 | 2009-05-22 12:45:29 -0700 | [diff] [blame] | 4560 | /* |
| 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 Meyering | 97bf2a0 | 2009-08-30 22:27:02 +0200 | [diff] [blame] | 4564 | * inside contents. |
Junio C Hamano | f245194 | 2009-05-22 12:45:29 -0700 | [diff] [blame] | 4565 | */ |
| 4566 | |
Junio C Hamano | 446d12c | 2017-10-26 15:15:51 +0900 | [diff] [blame] | 4567 | if ((options->xdl_opts & XDF_WHITESPACE_FLAGS)) |
Brandon Williams | 0d1e0e7 | 2017-10-31 11:19:11 -0700 | [diff] [blame] | 4568 | options->flags.diff_from_contents = 1; |
Junio C Hamano | f245194 | 2009-05-22 12:45:29 -0700 | [diff] [blame] | 4569 | else |
Brandon Williams | 0d1e0e7 | 2017-10-31 11:19:11 -0700 | [diff] [blame] | 4570 | options->flags.diff_from_contents = 0; |
Junio C Hamano | f245194 | 2009-05-22 12:45:29 -0700 | [diff] [blame] | 4571 | |
Brandon Williams | 0d1e0e7 | 2017-10-31 11:19:11 -0700 | [diff] [blame] | 4572 | if (options->flags.find_copies_harder) |
Junio C Hamano | 03b9d56 | 2006-08-09 13:17:19 -0700 | [diff] [blame] | 4573 | options->detect_rename = DIFF_DETECT_COPY; |
| 4574 | |
Brandon Williams | 0d1e0e7 | 2017-10-31 11:19:11 -0700 | [diff] [blame] | 4575 | if (!options->flags.relative_name) |
Junio C Hamano | cd676a5 | 2008-02-12 14:26:02 -0800 | [diff] [blame] | 4576 | options->prefix = NULL; |
| 4577 | if (options->prefix) |
| 4578 | options->prefix_length = strlen(options->prefix); |
| 4579 | else |
| 4580 | options->prefix_length = 0; |
| 4581 | |
Timo Hirvonen | c674434 | 2006-06-24 20:21:53 +0300 | [diff] [blame] | 4582 | 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 Hamano | 74e2abe | 2006-10-12 03:01:00 -0700 | [diff] [blame] | 4587 | DIFF_FORMAT_NUMSTAT | |
Timo Hirvonen | c674434 | 2006-06-24 20:21:53 +0300 | [diff] [blame] | 4588 | DIFF_FORMAT_DIFFSTAT | |
Nicolas Pitre | ebd124c | 2006-12-14 23:15:44 -0500 | [diff] [blame] | 4589 | DIFF_FORMAT_SHORTSTAT | |
Linus Torvalds | 7df7c01 | 2008-02-12 13:26:31 -0800 | [diff] [blame] | 4590 | DIFF_FORMAT_DIRSTAT | |
Timo Hirvonen | c674434 | 2006-06-24 20:21:53 +0300 | [diff] [blame] | 4591 | DIFF_FORMAT_SUMMARY | |
| 4592 | DIFF_FORMAT_PATCH); |
| 4593 | |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 4594 | /* |
| 4595 | * These cases always need recursive; we do not drop caller-supplied |
| 4596 | * recursive bits for other formats here. |
| 4597 | */ |
Timo Hirvonen | c674434 | 2006-06-24 20:21:53 +0300 | [diff] [blame] | 4598 | if (options->output_format & (DIFF_FORMAT_PATCH | |
Junio C Hamano | 74e2abe | 2006-10-12 03:01:00 -0700 | [diff] [blame] | 4599 | DIFF_FORMAT_NUMSTAT | |
Timo Hirvonen | c674434 | 2006-06-24 20:21:53 +0300 | [diff] [blame] | 4600 | DIFF_FORMAT_DIFFSTAT | |
Nicolas Pitre | ebd124c | 2006-12-14 23:15:44 -0500 | [diff] [blame] | 4601 | DIFF_FORMAT_SHORTSTAT | |
Linus Torvalds | 7df7c01 | 2008-02-12 13:26:31 -0800 | [diff] [blame] | 4602 | DIFF_FORMAT_DIRSTAT | |
Johannes Schindelin | d7014dc | 2006-10-03 23:09:56 +0200 | [diff] [blame] | 4603 | DIFF_FORMAT_SUMMARY | |
Timo Hirvonen | c674434 | 2006-06-24 20:21:53 +0300 | [diff] [blame] | 4604 | DIFF_FORMAT_CHECKDIFF)) |
Brandon Williams | 0d1e0e7 | 2017-10-31 11:19:11 -0700 | [diff] [blame] | 4605 | options->flags.recursive = 1; |
Junio C Hamano | 5e36354 | 2006-05-22 00:31:02 -0700 | [diff] [blame] | 4606 | /* |
Junio C Hamano | 3969cf7 | 2006-06-27 15:08:19 -0700 | [diff] [blame] | 4607 | * Also pickaxe would not work very well if you do not say recursive |
Junio C Hamano | 5e36354 | 2006-05-22 00:31:02 -0700 | [diff] [blame] | 4608 | */ |
Stefan Beller | cf63051 | 2018-01-04 14:50:41 -0800 | [diff] [blame] | 4609 | if (options->pickaxe_opts & DIFF_PICKAXE_KINDS_MASK) |
Brandon Williams | 0d1e0e7 | 2017-10-31 11:19:11 -0700 | [diff] [blame] | 4610 | options->flags.recursive = 1; |
Jens Lehmann | ae6d5c1 | 2010-03-11 22:50:25 +0100 | [diff] [blame] | 4611 | /* |
| 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 Williams | 0d1e0e7 | 2017-10-31 11:19:11 -0700 | [diff] [blame] | 4616 | options->flags.dirty_submodules = 1; |
Junio C Hamano | 5e36354 | 2006-05-22 00:31:02 -0700 | [diff] [blame] | 4617 | |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 4618 | if (options->detect_rename && options->rename_limit < 0) |
| 4619 | options->rename_limit = diff_rename_limit_default; |
brian m. carlson | de1d81d | 2018-05-02 00:25:52 +0000 | [diff] [blame] | 4620 | if (hexsz < options->abbrev) |
| 4621 | options->abbrev = hexsz; /* full */ |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 4622 | |
Junio C Hamano | 68aacb2 | 2007-03-14 11:12:13 -0700 | [diff] [blame] | 4623 | /* |
| 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 Williams | 0d1e0e7 | 2017-10-31 11:19:11 -0700 | [diff] [blame] | 4628 | if (options->flags.quick) { |
Junio C Hamano | 68aacb2 | 2007-03-14 11:12:13 -0700 | [diff] [blame] | 4629 | options->output_format = DIFF_FORMAT_NO_OUTPUT; |
Brandon Williams | 0d1e0e7 | 2017-10-31 11:19:11 -0700 | [diff] [blame] | 4630 | options->flags.exit_with_status = 1; |
Junio C Hamano | 68aacb2 | 2007-03-14 11:12:13 -0700 | [diff] [blame] | 4631 | } |
Zoltan Klinger | ee7fb0b | 2013-12-06 10:38:46 +1100 | [diff] [blame] | 4632 | |
Jeff King | 0ea7d5b | 2013-12-16 15:02:21 -0500 | [diff] [blame] | 4633 | options->diff_path_counter = 0; |
Junio C Hamano | b0e2c99 | 2014-06-16 10:07:09 -0700 | [diff] [blame] | 4634 | |
Brandon Williams | 0d1e0e7 | 2017-10-31 11:19:11 -0700 | [diff] [blame] | 4635 | if (options->flags.follow_renames && options->pathspec.nr != 1) |
Jeff King | dd63f16 | 2014-05-20 02:49:20 -0400 | [diff] [blame] | 4636 | die(_("--follow requires exactly one pathspec")); |
Stefan Beller | 2e2d5ac | 2017-06-30 13:53:07 -0700 | [diff] [blame] | 4637 | |
| 4638 | if (!options->use_color || external_diff()) |
| 4639 | options->color_moved = 0; |
Nguyễn Thái Ngọc Duy | 4a28847 | 2019-01-27 07:35:31 +0700 | [diff] [blame] | 4640 | |
| 4641 | FREE_AND_NULL(options->parseopts); |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 4642 | } |
| 4643 | |
Matthieu Moy | dea007f | 2010-08-05 10:22:52 +0200 | [diff] [blame] | 4644 | int parse_long_opt(const char *opt, const char **argv, |
| 4645 | const char **optarg) |
| 4646 | { |
| 4647 | const char *arg = argv[0]; |
Jeff King | 95b567c | 2014-06-18 15:48:29 -0400 | [diff] [blame] | 4648 | if (!skip_prefix(arg, "--", &arg)) |
Matthieu Moy | dea007f | 2010-08-05 10:22:52 +0200 | [diff] [blame] | 4649 | return 0; |
Jeff King | 95b567c | 2014-06-18 15:48:29 -0400 | [diff] [blame] | 4650 | if (!skip_prefix(arg, opt, &arg)) |
Matthieu Moy | dea007f | 2010-08-05 10:22:52 +0200 | [diff] [blame] | 4651 | return 0; |
Nicolas Vigier | b0d12fc | 2013-10-31 12:08:28 +0100 | [diff] [blame] | 4652 | if (*arg == '=') { /* stuck form: --option=value */ |
Matthieu Moy | dea007f | 2010-08-05 10:22:52 +0200 | [diff] [blame] | 4653 | *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 Duy | 84b5089 | 2019-02-21 18:16:10 +0700 | [diff] [blame] | 4665 | static int diff_opt_stat(const struct option *opt, const char *value, int unset) |
Jonathan Nieder | 4d7f7a4 | 2010-08-05 10:22:53 +0200 | [diff] [blame] | 4666 | { |
Nguyễn Thái Ngọc Duy | 84b5089 | 2019-02-21 18:16:10 +0700 | [diff] [blame] | 4667 | struct diff_options *options = opt->value; |
Jonathan Nieder | 4d7f7a4 | 2010-08-05 10:22:53 +0200 | [diff] [blame] | 4668 | int width = options->stat_width; |
| 4669 | int name_width = options->stat_name_width; |
Zbigniew Jędrzejewski-Szmek | 969fe57 | 2012-03-01 13:26:45 +0100 | [diff] [blame] | 4670 | int graph_width = options->stat_graph_width; |
Michael J Gruber | 808e1db | 2011-05-27 14:36:41 +0200 | [diff] [blame] | 4671 | int count = options->stat_count; |
Nguyễn Thái Ngọc Duy | 84b5089 | 2019-02-21 18:16:10 +0700 | [diff] [blame] | 4672 | char *end; |
Jonathan Nieder | 4d7f7a4 | 2010-08-05 10:22:53 +0200 | [diff] [blame] | 4673 | |
Nguyễn Thái Ngọc Duy | 84b5089 | 2019-02-21 18:16:10 +0700 | [diff] [blame] | 4674 | BUG_ON_OPT_NEG(unset); |
Jonathan Nieder | 4d7f7a4 | 2010-08-05 10:22:53 +0200 | [diff] [blame] | 4675 | |
Nguyễn Thái Ngọc Duy | 84b5089 | 2019-02-21 18:16:10 +0700 | [diff] [blame] | 4676 | 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 Moy | 1e57208 | 2010-08-05 10:22:54 +0200 | [diff] [blame] | 4685 | } |
Nguyễn Thái Ngọc Duy | 84b5089 | 2019-02-21 18:16:10 +0700 | [diff] [blame] | 4686 | } 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 Nieder | 4d7f7a4 | 2010-08-05 10:22:53 +0200 | [diff] [blame] | 4708 | |
Jonathan Nieder | 4d7f7a4 | 2010-08-05 10:22:53 +0200 | [diff] [blame] | 4709 | options->output_format |= DIFF_FORMAT_DIFFSTAT; |
| 4710 | options->stat_name_width = name_width; |
Zbigniew Jędrzejewski-Szmek | 969fe57 | 2012-03-01 13:26:45 +0100 | [diff] [blame] | 4711 | options->stat_graph_width = graph_width; |
Jonathan Nieder | 4d7f7a4 | 2010-08-05 10:22:53 +0200 | [diff] [blame] | 4712 | options->stat_width = width; |
Michael J Gruber | 808e1db | 2011-05-27 14:36:41 +0200 | [diff] [blame] | 4713 | options->stat_count = count; |
Nguyễn Thái Ngọc Duy | 84b5089 | 2019-02-21 18:16:10 +0700 | [diff] [blame] | 4714 | return 0; |
Jonathan Nieder | 4d7f7a4 | 2010-08-05 10:22:53 +0200 | [diff] [blame] | 4715 | } |
| 4716 | |
Johan Herland | 333f3fb | 2011-04-29 11:36:18 +0200 | [diff] [blame] | 4717 | static int parse_dirstat_opt(struct diff_options *options, const char *params) |
| 4718 | { |
Johan Herland | 51670fc | 2011-04-29 11:36:22 +0200 | [diff] [blame] | 4719 | struct strbuf errmsg = STRBUF_INIT; |
| 4720 | if (parse_dirstat_params(options, params, &errmsg)) |
Johan Herland | 7478ac5 | 2011-04-29 11:36:23 +0200 | [diff] [blame] | 4721 | die(_("Failed to parse --dirstat/-X option parameter:\n%s"), |
Johan Herland | 51670fc | 2011-04-29 11:36:22 +0200 | [diff] [blame] | 4722 | errmsg.buf); |
| 4723 | strbuf_release(&errmsg); |
Johan Herland | 333f3fb | 2011-04-29 11:36:18 +0200 | [diff] [blame] | 4724 | /* |
| 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 Hamano | 1ecc1cb | 2013-07-17 15:05:46 -0700 | [diff] [blame] | 4732 | static 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 | |
| 4746 | static unsigned int filter_bit['Z' + 1]; |
| 4747 | |
| 4748 | static 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 | |
| 4758 | static 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 Duy | cdb5330 | 2019-03-24 15:20:14 +0700 | [diff] [blame] | 4763 | unsigned diff_filter_bit(char status) |
Junio C Hamano | 1ecc1cb | 2013-07-17 15:05:46 -0700 | [diff] [blame] | 4764 | { |
Nguyễn Thái Ngọc Duy | cdb5330 | 2019-03-24 15:20:14 +0700 | [diff] [blame] | 4765 | prepare_filter_bits(); |
| 4766 | return filter_bit[(int) status]; |
| 4767 | } |
| 4768 | |
Nguyễn Thái Ngọc Duy | d2d3f27 | 2019-03-24 15:20:03 +0700 | [diff] [blame] | 4769 | static int diff_opt_diff_filter(const struct option *option, |
| 4770 | const char *optarg, int unset) |
Junio C Hamano | 1ecc1cb | 2013-07-17 15:05:46 -0700 | [diff] [blame] | 4771 | { |
Nguyễn Thái Ngọc Duy | d2d3f27 | 2019-03-24 15:20:03 +0700 | [diff] [blame] | 4772 | struct diff_options *opt = option->value; |
Junio C Hamano | 1ecc1cb | 2013-07-17 15:05:46 -0700 | [diff] [blame] | 4773 | int i, optch; |
| 4774 | |
Nguyễn Thái Ngọc Duy | d2d3f27 | 2019-03-24 15:20:03 +0700 | [diff] [blame] | 4775 | BUG_ON_OPT_NEG(unset); |
Junio C Hamano | 1ecc1cb | 2013-07-17 15:05:46 -0700 | [diff] [blame] | 4776 | prepare_filter_bits(); |
Junio C Hamano | 7f2ea5f | 2013-07-17 16:19:19 -0700 | [diff] [blame] | 4777 | |
| 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 Hamano | 1ecc1cb | 2013-07-17 15:05:46 -0700 | [diff] [blame] | 4793 | for (i = 0; (optch = optarg[i]) != '\0'; i++) { |
| 4794 | unsigned int bit; |
Junio C Hamano | 7f2ea5f | 2013-07-17 16:19:19 -0700 | [diff] [blame] | 4795 | int negate; |
| 4796 | |
| 4797 | if ('a' <= optch && optch <= 'z') { |
| 4798 | negate = 1; |
| 4799 | optch = toupper(optch); |
| 4800 | } else { |
| 4801 | negate = 0; |
| 4802 | } |
Junio C Hamano | 1ecc1cb | 2013-07-17 15:05:46 -0700 | [diff] [blame] | 4803 | |
| 4804 | bit = (0 <= optch && optch <= 'Z') ? filter_bit[optch] : 0; |
| 4805 | if (!bit) |
Nguyễn Thái Ngọc Duy | d2d3f27 | 2019-03-24 15:20:03 +0700 | [diff] [blame] | 4806 | return error(_("unknown change class '%c' in --diff-filter=%s"), |
| 4807 | optarg[i], optarg); |
Junio C Hamano | 7f2ea5f | 2013-07-17 16:19:19 -0700 | [diff] [blame] | 4808 | if (negate) |
| 4809 | opt->filter &= ~bit; |
| 4810 | else |
| 4811 | opt->filter |= bit; |
Junio C Hamano | 1ecc1cb | 2013-07-17 15:05:46 -0700 | [diff] [blame] | 4812 | } |
| 4813 | return 0; |
| 4814 | } |
| 4815 | |
Nguyễn Thái Ngọc Duy | 3b33576 | 2018-12-09 11:25:21 +0100 | [diff] [blame] | 4816 | static void enable_patch_output(int *fmt) |
| 4817 | { |
Matthieu Moy | 71482d3 | 2013-07-16 10:05:37 +0200 | [diff] [blame] | 4818 | *fmt &= ~DIFF_FORMAT_NO_OUTPUT; |
| 4819 | *fmt |= DIFF_FORMAT_PATCH; |
| 4820 | } |
| 4821 | |
Nguyễn Thái Ngọc Duy | 5a749d9 | 2019-03-24 15:19:55 +0700 | [diff] [blame] | 4822 | static int diff_opt_ws_error_highlight(const struct option *option, |
| 4823 | const char *arg, int unset) |
Junio C Hamano | b8767f7 | 2015-05-26 10:11:28 -0700 | [diff] [blame] | 4824 | { |
Nguyễn Thái Ngọc Duy | 5a749d9 | 2019-03-24 15:19:55 +0700 | [diff] [blame] | 4825 | struct diff_options *opt = option->value; |
Junio C Hamano | 077965f | 2016-10-04 15:03:33 -0700 | [diff] [blame] | 4826 | int val = parse_ws_error_highlight(arg); |
Junio C Hamano | b8767f7 | 2015-05-26 10:11:28 -0700 | [diff] [blame] | 4827 | |
Nguyễn Thái Ngọc Duy | 5a749d9 | 2019-03-24 15:19:55 +0700 | [diff] [blame] | 4828 | 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 Hamano | b8767f7 | 2015-05-26 10:11:28 -0700 | [diff] [blame] | 4832 | opt->ws_error_highlight = val; |
Nguyễn Thái Ngọc Duy | 5a749d9 | 2019-03-24 15:19:55 +0700 | [diff] [blame] | 4833 | return 0; |
Junio C Hamano | b8767f7 | 2015-05-26 10:11:28 -0700 | [diff] [blame] | 4834 | } |
| 4835 | |
Nguyễn Thái Ngọc Duy | a75f28c | 2019-03-24 15:20:02 +0700 | [diff] [blame] | 4836 | static int diff_opt_find_object(const struct option *option, |
| 4837 | const char *arg, int unset) |
Stefan Beller | 15af58c | 2018-01-04 14:50:42 -0800 | [diff] [blame] | 4838 | { |
Nguyễn Thái Ngọc Duy | a75f28c | 2019-03-24 15:20:02 +0700 | [diff] [blame] | 4839 | struct diff_options *opt = option->value; |
Stefan Beller | 15af58c | 2018-01-04 14:50:42 -0800 | [diff] [blame] | 4840 | struct object_id oid; |
| 4841 | |
Nguyễn Thái Ngọc Duy | a75f28c | 2019-03-24 15:20:02 +0700 | [diff] [blame] | 4842 | BUG_ON_OPT_NEG(unset); |
Stefan Beller | 15af58c | 2018-01-04 14:50:42 -0800 | [diff] [blame] | 4843 | if (get_oid(arg, &oid)) |
Nguyễn Thái Ngọc Duy | a75f28c | 2019-03-24 15:20:02 +0700 | [diff] [blame] | 4844 | return error(_("unable to resolve '%s'"), arg); |
Stefan Beller | 15af58c | 2018-01-04 14:50:42 -0800 | [diff] [blame] | 4845 | |
| 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 Duy | a75f28c | 2019-03-24 15:20:02 +0700 | [diff] [blame] | 4853 | return 0; |
Stefan Beller | 15af58c | 2018-01-04 14:50:42 -0800 | [diff] [blame] | 4854 | } |
| 4855 | |
Nguyễn Thái Ngọc Duy | df84a43 | 2019-03-05 19:30:11 +0700 | [diff] [blame] | 4856 | static 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 Duy | 6d9af6f | 2019-03-05 19:30:12 +0700 | [diff] [blame] | 4869 | static 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 Duy | ced4e17 | 2019-02-21 18:16:13 +0700 | [diff] [blame] | 4881 | static 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 Duy | af2f368 | 2019-02-21 18:16:12 +0700 | [diff] [blame] | 4905 | static 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 Duy | 59311a9 | 2019-03-24 15:20:09 +0700 | [diff] [blame] | 4918 | static 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 Duy | 8ce2020 | 2019-03-24 15:20:10 +0700 | [diff] [blame] | 4939 | static 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 Duy | bb98729 | 2019-03-24 15:20:11 +0700 | [diff] [blame] | 4945 | if (unset) { |
| 4946 | options->color_moved_ws_handling = 0; |
| 4947 | return 0; |
| 4948 | } |
| 4949 | |
Nguyễn Thái Ngọc Duy | 8ce2020 | 2019-03-24 15:20:10 +0700 | [diff] [blame] | 4950 | 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 Duy | 212db69 | 2019-03-05 19:30:20 +0700 | [diff] [blame] | 4957 | static 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 Duy | 7d7942b | 2019-02-21 18:16:11 +0700 | [diff] [blame] | 4969 | static 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 Duy | 10f35b1 | 2019-03-05 19:30:10 +0700 | [diff] [blame] | 4984 | static 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 Duy | 4ce7aab | 2019-02-21 18:16:03 +0700 | [diff] [blame] | 5002 | static 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 Duy | 7f64850 | 2019-02-21 18:16:16 +0700 | [diff] [blame] | 5018 | static 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 Duy | f476308 | 2019-02-21 18:16:14 +0700 | [diff] [blame] | 5038 | static 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 Duy | 1e9250b | 2019-03-05 19:30:16 +0700 | [diff] [blame] | 5054 | static 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 Duy | b680ee1 | 2019-03-05 19:30:25 +0700 | [diff] [blame] | 5069 | static 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 Duy | 2f81cf9 | 2019-03-24 15:20:06 +0700 | [diff] [blame] | 5082 | static 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 Duy | 11c659d | 2019-03-24 15:20:07 +0700 | [diff] [blame] | 5094 | static 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 Duy | af2f368 | 2019-02-21 18:16:12 +0700 | [diff] [blame] | 5106 | static 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 Duy | 31fd640 | 2019-03-05 19:30:08 +0700 | [diff] [blame] | 5123 | static 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 Duy | a41cfb3 | 2019-03-24 15:19:59 +0700 | [diff] [blame] | 5143 | static 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 | |
| 5154 | static 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 Duy | 0b1c5b5 | 2019-02-21 18:16:19 +0700 | [diff] [blame] | 5165 | static 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 Duy | 125dcea | 2019-03-05 19:30:26 +0700 | [diff] [blame] | 5177 | static 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 Duy | 8ab7697 | 2019-03-05 19:30:24 +0700 | [diff] [blame] | 5191 | static 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 Duy | d473e2e | 2019-01-27 07:35:33 +0700 | [diff] [blame] | 5206 | static 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 Duy | e9fb39b | 2019-03-05 19:30:18 +0700 | [diff] [blame] | 5222 | static 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 Duy | 797df11 | 2019-03-05 19:30:19 +0700 | [diff] [blame] | 5248 | static 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 Duy | 4a28847 | 2019-01-27 07:35:31 +0700 | [diff] [blame] | 5260 | static void prep_parse_options(struct diff_options *options) |
| 5261 | { |
| 5262 | struct option parseopts[] = { |
Nguyễn Thái Ngọc Duy | cc013c2 | 2019-01-27 07:35:32 +0700 | [diff] [blame] | 5263 | 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 Duy | e01df7a | 2019-02-21 18:16:09 +0700 | [diff] [blame] | 5267 | 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 Duy | cc013c2 | 2019-01-27 07:35:32 +0700 | [diff] [blame] | 5270 | 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 Duy | d473e2e | 2019-01-27 07:35:33 +0700 | [diff] [blame] | 5273 | 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 Duy | 7fd9a1b | 2019-01-27 07:35:34 +0700 | [diff] [blame] | 5276 | OPT_BOOL('W', "function-context", &options->flags.funccontext, |
| 5277 | N_("generate diffs with <n> lines context")), |
Nguyễn Thái Ngọc Duy | ed88148 | 2019-01-27 07:35:35 +0700 | [diff] [blame] | 5278 | 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 Duy | c659f30 | 2019-02-16 18:36:35 +0700 | [diff] [blame] | 5281 | 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 Duy | e550f58 | 2019-02-21 18:16:06 +0700 | [diff] [blame] | 5285 | 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 Duy | e567362 | 2019-02-16 18:36:36 +0700 | [diff] [blame] | 5289 | 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 Duy | 4ce7aab | 2019-02-21 18:16:03 +0700 | [diff] [blame] | 5295 | 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 Duy | fc6af3e | 2019-02-21 18:16:04 +0700 | [diff] [blame] | 5307 | 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 Duy | 70a3041 | 2019-02-21 18:16:05 +0700 | [diff] [blame] | 5310 | 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 Duy | 0e840e2 | 2019-02-21 18:16:07 +0700 | [diff] [blame] | 5313 | 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 Duy | a238747 | 2019-02-21 18:16:08 +0700 | [diff] [blame] | 5316 | 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 Duy | 84b5089 | 2019-02-21 18:16:10 +0700 | [diff] [blame] | 5319 | 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 Duy | 7d7942b | 2019-02-21 18:16:11 +0700 | [diff] [blame] | 5334 | 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 Duy | 6d9af6f | 2019-03-05 19:30:12 +0700 | [diff] [blame] | 5337 | 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 Duy | 4fe0167 | 2019-03-05 19:30:13 +0700 | [diff] [blame] | 5340 | 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 Duy | 8b81c26 | 2019-03-05 19:30:17 +0700 | [diff] [blame] | 5342 | OPT_COLOR_FLAG(0, "color", &options->use_color, |
| 5343 | N_("show colored diff")), |
Nguyễn Thái Ngọc Duy | 5a749d9 | 2019-03-24 15:19:55 +0700 | [diff] [blame] | 5344 | 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 Duy | 1a1eb16 | 2019-03-24 15:19:57 +0700 | [diff] [blame] | 5347 | 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 Duy | d877418 | 2019-03-24 15:20:04 +0700 | [diff] [blame] | 5350 | OPT__ABBREV(&options->abbrev), |
Nguyễn Thái Ngọc Duy | 31fba9d | 2019-03-24 15:20:05 +0700 | [diff] [blame] | 5351 | 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 Duy | 2f81cf9 | 2019-03-24 15:20:06 +0700 | [diff] [blame] | 5357 | 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 Duy | 11c659d | 2019-03-24 15:20:07 +0700 | [diff] [blame] | 5360 | 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 Duy | 16ed6c9 | 2019-03-24 15:20:08 +0700 | [diff] [blame] | 5363 | 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 Duy | af2f368 | 2019-02-21 18:16:12 +0700 | [diff] [blame] | 5366 | 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 Duy | ced4e17 | 2019-02-21 18:16:13 +0700 | [diff] [blame] | 5382 | 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 Duy | f476308 | 2019-02-21 18:16:14 +0700 | [diff] [blame] | 5387 | 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 Duy | 1e53329 | 2019-02-21 18:16:15 +0700 | [diff] [blame] | 5391 | 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 Duy | 7f64850 | 2019-02-21 18:16:16 +0700 | [diff] [blame] | 5394 | 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 Duy | bdd4741 | 2019-02-21 18:16:17 +0700 | [diff] [blame] | 5398 | 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 Duy | cdc43eb | 2019-02-21 18:16:18 +0700 | [diff] [blame] | 5400 | 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 Duy | 1e9250b | 2019-03-05 19:30:16 +0700 | [diff] [blame] | 5405 | 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 Duy | bffee74 | 2019-03-24 15:19:58 +0700 | [diff] [blame] | 5408 | 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 Duy | ced4e17 | 2019-02-21 18:16:13 +0700 | [diff] [blame] | 5410 | |
Nguyễn Thái Ngọc Duy | 2e75f92 | 2019-02-21 18:16:20 +0700 | [diff] [blame] | 5411 | 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 Duy | 87649a1 | 2019-02-21 18:16:21 +0700 | [diff] [blame] | 5415 | 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 Duy | 06f7751 | 2019-03-05 19:30:07 +0700 | [diff] [blame] | 5430 | 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 Duy | 31fd640 | 2019-03-05 19:30:08 +0700 | [diff] [blame] | 5433 | 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 Duy | f1e68ef | 2019-03-05 19:30:09 +0700 | [diff] [blame] | 5437 | 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 Duy | 10f35b1 | 2019-03-05 19:30:10 +0700 | [diff] [blame] | 5440 | 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 Duy | df84a43 | 2019-03-05 19:30:11 +0700 | [diff] [blame] | 5443 | 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 Duy | e9fb39b | 2019-03-05 19:30:18 +0700 | [diff] [blame] | 5446 | 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 Duy | 797df11 | 2019-03-05 19:30:19 +0700 | [diff] [blame] | 5449 | 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 Duy | 212db69 | 2019-03-05 19:30:20 +0700 | [diff] [blame] | 5452 | 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 Duy | 59311a9 | 2019-03-24 15:20:09 +0700 | [diff] [blame] | 5455 | 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 Duy | 8ce2020 | 2019-03-24 15:20:10 +0700 | [diff] [blame] | 5458 | 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 Duy | bb98729 | 2019-03-24 15:20:11 +0700 | [diff] [blame] | 5460 | 0, diff_opt_color_moved_ws), |
Nguyễn Thái Ngọc Duy | 2e75f92 | 2019-02-21 18:16:20 +0700 | [diff] [blame] | 5461 | |
Nguyễn Thái Ngọc Duy | af2f368 | 2019-02-21 18:16:12 +0700 | [diff] [blame] | 5462 | OPT_GROUP(N_("Diff other options")), |
Nguyễn Thái Ngọc Duy | 0b1c5b5 | 2019-02-21 18:16:19 +0700 | [diff] [blame] | 5463 | 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 Duy | c37d4c0 | 2019-03-05 19:30:14 +0700 | [diff] [blame] | 5467 | OPT_BOOL('a', "text", &options->flags.text, |
| 5468 | N_("treat all files as text")), |
Nguyễn Thái Ngọc Duy | 4f99f29 | 2019-03-05 19:30:15 +0700 | [diff] [blame] | 5469 | OPT_BOOL('R', NULL, &options->flags.reverse_diff, |
| 5470 | N_("swap two inputs, reverse the diff")), |
Nguyễn Thái Ngọc Duy | 1086ea0 | 2019-03-05 19:30:21 +0700 | [diff] [blame] | 5471 | 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 Duy | 9bbaf1c | 2019-03-05 19:30:22 +0700 | [diff] [blame] | 5473 | OPT_BOOL(0, "quiet", &options->flags.quick, |
| 5474 | N_("disable all output of the program")), |
Nguyễn Thái Ngọc Duy | 0cda100 | 2019-03-05 19:30:23 +0700 | [diff] [blame] | 5475 | 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 Duy | 8ab7697 | 2019-03-05 19:30:24 +0700 | [diff] [blame] | 5477 | 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 Duy | b680ee1 | 2019-03-05 19:30:25 +0700 | [diff] [blame] | 5480 | 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 Duy | 125dcea | 2019-03-05 19:30:26 +0700 | [diff] [blame] | 5484 | 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 Duy | 96860e4 | 2019-03-24 15:19:56 +0700 | [diff] [blame] | 5488 | 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 Duy | a41cfb3 | 2019-03-24 15:19:59 +0700 | [diff] [blame] | 5494 | 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 Duy | 85f8e88 | 2019-03-24 15:20:00 +0700 | [diff] [blame] | 5500 | 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 Duy | f731814 | 2019-03-24 15:20:01 +0700 | [diff] [blame] | 5506 | OPT_FILENAME('O', NULL, &options->orderfile, |
| 5507 | N_("control the order in which files appear in the output")), |
Nguyễn Thái Ngọc Duy | a75f28c | 2019-03-24 15:20:02 +0700 | [diff] [blame] | 5508 | 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 Duy | d2d3f27 | 2019-03-24 15:20:03 +0700 | [diff] [blame] | 5511 | 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 Duy | af2f368 | 2019-02-21 18:16:12 +0700 | [diff] [blame] | 5514 | { 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 Duy | 4a28847 | 2019-01-27 07:35:31 +0700 | [diff] [blame] | 5518 | OPT_END() |
| 5519 | }; |
| 5520 | |
| 5521 | ALLOC_ARRAY(options->parseopts, ARRAY_SIZE(parseopts)); |
| 5522 | memcpy(options->parseopts, parseopts, sizeof(parseopts)); |
| 5523 | } |
| 5524 | |
Duy Nguyen | a97262c | 2016-01-21 18:48:44 +0700 | [diff] [blame] | 5525 | int diff_opt_parse(struct diff_options *options, |
| 5526 | const char **av, int ac, const char *prefix) |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 5527 | { |
Duy Nguyen | a97262c | 2016-01-21 18:48:44 +0700 | [diff] [blame] | 5528 | if (!prefix) |
| 5529 | prefix = ""; |
| 5530 | |
Nguyễn Thái Ngọc Duy | 4a28847 | 2019-01-27 07:35:31 +0700 | [diff] [blame] | 5531 | 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 Duy | 8ce2020 | 2019-03-24 15:20:10 +0700 | [diff] [blame] | 5538 | return ac; |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 5539 | } |
| 5540 | |
Kevin Ballard | 10ae752 | 2010-09-27 16:58:25 -0700 | [diff] [blame] | 5541 | int parse_rename_score(const char **cp_p) |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 5542 | { |
| 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 Gianforcaro | eeefa7c | 2009-09-01 01:35:10 -0400 | [diff] [blame] | 5550 | for (;;) { |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 5551 | 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. Pearce | dc49cd7 | 2007-03-06 20:44:37 -0500 | [diff] [blame] | 5574 | return (int)((num >= scale) ? MAX_SCORE : (MAX_SCORE * num / scale)); |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 5575 | } |
| 5576 | |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 5577 | struct diff_queue_struct diff_queued_diff; |
| 5578 | |
| 5579 | void diff_q(struct diff_queue_struct *queue, struct diff_filepair *dp) |
| 5580 | { |
Dmitry S. Dolzhenko | 4c960a4 | 2014-03-04 02:31:53 +0400 | [diff] [blame] | 5581 | ALLOC_GROW(queue->queue, queue->nr + 1, queue->alloc); |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 5582 | queue->queue[queue->nr++] = dp; |
| 5583 | } |
| 5584 | |
| 5585 | struct diff_filepair *diff_queue(struct diff_queue_struct *queue, |
| 5586 | struct diff_filespec *one, |
| 5587 | struct diff_filespec *two) |
| 5588 | { |
Junio C Hamano | ef67768 | 2006-08-03 12:01:01 -0700 | [diff] [blame] | 5589 | struct diff_filepair *dp = xcalloc(1, sizeof(*dp)); |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 5590 | dp->one = one; |
| 5591 | dp->two = two; |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 5592 | if (queue) |
| 5593 | diff_q(queue, dp); |
| 5594 | return dp; |
| 5595 | } |
| 5596 | |
| 5597 | void diff_free_filepair(struct diff_filepair *p) |
| 5598 | { |
Linus Torvalds | 9fb8841 | 2007-10-25 11:19:10 -0700 | [diff] [blame] | 5599 | free_filespec(p->one); |
| 5600 | free_filespec(p->two); |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 5601 | free(p); |
| 5602 | } |
| 5603 | |
Jeff King | d6cece5 | 2016-10-20 02:20:07 -0400 | [diff] [blame] | 5604 | const char *diff_aligned_abbrev(const struct object_id *oid, int len) |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 5605 | { |
| 5606 | int abblen; |
| 5607 | const char *abbrev; |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 5608 | |
Ann T Ropea | 7cb6ac1 | 2017-12-03 22:27:42 +0100 | [diff] [blame] | 5609 | /* Do we want all 40 hex characters? */ |
brian m. carlson | 02afca1 | 2018-07-16 01:28:05 +0000 | [diff] [blame] | 5610 | if (len == the_hash_algo->hexsz) |
Jeff King | d6cece5 | 2016-10-20 02:20:07 -0400 | [diff] [blame] | 5611 | return oid_to_hex(oid); |
| 5612 | |
Ann T Ropea | 7cb6ac1 | 2017-12-03 22:27:42 +0100 | [diff] [blame] | 5613 | /* An abbreviated value is fine, possibly followed by an ellipsis. */ |
Jeff King | 4f03666 | 2016-10-20 02:21:25 -0400 | [diff] [blame] | 5614 | abbrev = diff_abbrev_oid(oid, len); |
Ann T Ropea | 7cb6ac1 | 2017-12-03 22:27:42 +0100 | [diff] [blame] | 5615 | |
| 5616 | if (!print_sha1_ellipsis()) |
| 5617 | return abbrev; |
| 5618 | |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 5619 | abblen = strlen(abbrev); |
Junio C Hamano | d709f1f | 2016-09-30 10:42:05 -0700 | [diff] [blame] | 5620 | |
| 5621 | /* |
Ann T Ropea | 7cb6ac1 | 2017-12-03 22:27:42 +0100 | [diff] [blame] | 5622 | * In well-behaved cases, where the abbreviated result is the |
Junio C Hamano | d709f1f | 2016-09-30 10:42:05 -0700 | [diff] [blame] | 5623 | * 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. carlson | 02afca1 | 2018-07-16 01:28:05 +0000 | [diff] [blame] | 5640 | if (abblen < the_hash_algo->hexsz - 3) { |
brian m. carlson | dc01505 | 2017-03-26 16:01:24 +0000 | [diff] [blame] | 5641 | static char hex[GIT_MAX_HEXSZ + 1]; |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 5642 | if (len < abblen && abblen <= len + 2) |
Jeff King | 5096d49 | 2015-09-24 17:06:08 -0400 | [diff] [blame] | 5643 | xsnprintf(hex, sizeof(hex), "%s%.*s", abbrev, len+3-abblen, ".."); |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 5644 | else |
Jeff King | 5096d49 | 2015-09-24 17:06:08 -0400 | [diff] [blame] | 5645 | xsnprintf(hex, sizeof(hex), "%s...", abbrev); |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 5646 | return hex; |
| 5647 | } |
Jeff King | d6cece5 | 2016-10-20 02:20:07 -0400 | [diff] [blame] | 5648 | |
| 5649 | return oid_to_hex(oid); |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 5650 | } |
| 5651 | |
Pierre Habouzit | 663af34 | 2007-09-20 00:42:15 +0200 | [diff] [blame] | 5652 | static void diff_flush_raw(struct diff_filepair *p, struct diff_options *opt) |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 5653 | { |
Pierre Habouzit | 663af34 | 2007-09-20 00:42:15 +0200 | [diff] [blame] | 5654 | int line_termination = opt->line_termination; |
| 5655 | int inter_name_termination = line_termination ? '\t' : '\0'; |
Timo Hirvonen | c674434 | 2006-06-24 20:21:53 +0300 | [diff] [blame] | 5656 | |
John Keeping | 30997bb | 2013-02-07 20:15:27 +0000 | [diff] [blame] | 5657 | fprintf(opt->file, "%s", diff_line_prefix(opt)); |
Pierre Habouzit | 663af34 | 2007-09-20 00:42:15 +0200 | [diff] [blame] | 5658 | if (!(opt->output_format & DIFF_FORMAT_NAME_STATUS)) { |
Daniel Barkalow | c0c7773 | 2008-03-09 22:43:39 -0400 | [diff] [blame] | 5659 | fprintf(opt->file, ":%06o %06o %s ", p->one->mode, p->two->mode, |
Jeff King | d6cece5 | 2016-10-20 02:20:07 -0400 | [diff] [blame] | 5660 | diff_aligned_abbrev(&p->one->oid, opt->abbrev)); |
brian m. carlson | a0d12c4 | 2016-06-24 23:09:23 +0000 | [diff] [blame] | 5661 | fprintf(opt->file, "%s ", |
Jeff King | d6cece5 | 2016-10-20 02:20:07 -0400 | [diff] [blame] | 5662 | diff_aligned_abbrev(&p->two->oid, opt->abbrev)); |
Pierre Habouzit | 663af34 | 2007-09-20 00:42:15 +0200 | [diff] [blame] | 5663 | } |
| 5664 | if (p->score) { |
Daniel Barkalow | c0c7773 | 2008-03-09 22:43:39 -0400 | [diff] [blame] | 5665 | fprintf(opt->file, "%c%03d%c", p->status, similarity_index(p), |
| 5666 | inter_name_termination); |
Pierre Habouzit | 663af34 | 2007-09-20 00:42:15 +0200 | [diff] [blame] | 5667 | } else { |
Daniel Barkalow | c0c7773 | 2008-03-09 22:43:39 -0400 | [diff] [blame] | 5668 | fprintf(opt->file, "%c%c", p->status, inter_name_termination); |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 5669 | } |
| 5670 | |
Junio C Hamano | cd676a5 | 2008-02-12 14:26:02 -0800 | [diff] [blame] | 5671 | 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 Barkalow | c0c7773 | 2008-03-09 22:43:39 -0400 | [diff] [blame] | 5677 | write_name_quoted(name_a, opt->file, inter_name_termination); |
| 5678 | write_name_quoted(name_b, opt->file, line_termination); |
Pierre Habouzit | 663af34 | 2007-09-20 00:42:15 +0200 | [diff] [blame] | 5679 | } else { |
Junio C Hamano | cd676a5 | 2008-02-12 14:26:02 -0800 | [diff] [blame] | 5680 | 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 Barkalow | c0c7773 | 2008-03-09 22:43:39 -0400 | [diff] [blame] | 5684 | write_name_quoted(name_a, opt->file, line_termination); |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 5685 | } |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 5686 | } |
| 5687 | |
| 5688 | int 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 Habouzit | 663af34 | 2007-09-20 00:42:15 +0200 | [diff] [blame] | 5695 | struct diff_filespec *one = p->one, *two = p->two; |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 5696 | |
| 5697 | if (DIFF_PAIR_UNMERGED(p)) |
| 5698 | return 0; /* unmerged is interesting */ |
| 5699 | |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 5700 | /* 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. carlson | 41c9560 | 2016-06-24 23:09:24 +0000 | [diff] [blame] | 5711 | if (one->oid_valid && two->oid_valid && |
Jeff King | 4a7e27e | 2018-08-28 17:22:40 -0400 | [diff] [blame] | 5712 | oideq(&one->oid, &two->oid) && |
Jens Lehmann | 85adbf2 | 2010-03-12 22:23:52 +0100 | [diff] [blame] | 5713 | !one->dirty_submodule && !two->dirty_submodule) |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 5714 | return 1; /* no change */ |
brian m. carlson | 41c9560 | 2016-06-24 23:09:24 +0000 | [diff] [blame] | 5715 | if (!one->oid_valid && !two->oid_valid) |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 5716 | return 1; /* both look at the same file on the filesystem. */ |
| 5717 | return 0; |
| 5718 | } |
| 5719 | |
| 5720 | static 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 | |
| 5732 | static 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 Dirson | c3fced6 | 2010-10-24 23:03:10 +0200 | [diff] [blame] | 5740 | return; /* no useful stat for tree diffs */ |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 5741 | |
| 5742 | run_diffstat(p, o, diffstat); |
| 5743 | } |
| 5744 | |
Johannes Schindelin | 8824689 | 2006-05-20 23:43:13 +0200 | [diff] [blame] | 5745 | static 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 Dirson | c3fced6 | 2010-10-24 23:03:10 +0200 | [diff] [blame] | 5753 | return; /* nothing to check in tree diffs */ |
Johannes Schindelin | 8824689 | 2006-05-20 23:43:13 +0200 | [diff] [blame] | 5754 | |
| 5755 | run_checkdiff(p, o); |
| 5756 | } |
| 5757 | |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 5758 | int 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 |
| 5769 | void 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. carlson | 41c9560 | 2016-06-24 23:09:24 +0000 | [diff] [blame] | 5776 | s->oid_valid ? oid_to_hex(&s->oid) : ""); |
Jeff King | 428d52a | 2014-01-16 20:21:59 -0500 | [diff] [blame] | 5777 | fprintf(stderr, "queue[%d] %s size %lu\n", |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 5778 | x, one ? one : "", |
Jeff King | 428d52a | 2014-01-16 20:21:59 -0500 | [diff] [blame] | 5779 | s->size); |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 5780 | } |
| 5781 | |
| 5782 | void 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 Torvalds | 6447971 | 2007-10-25 11:20:56 -0700 | [diff] [blame] | 5786 | fprintf(stderr, "score %d, status %c rename_used %d broken %d\n", |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 5787 | p->score, p->status ? p->status : '?', |
Linus Torvalds | 6447971 | 2007-10-25 11:20:56 -0700 | [diff] [blame] | 5788 | p->one->rename_used, p->broken_pair); |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 5789 | } |
| 5790 | |
| 5791 | void 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 | |
| 5804 | static void diff_resolve_rename_copy(void) |
| 5805 | { |
Linus Torvalds | 6447971 | 2007-10-25 11:20:56 -0700 | [diff] [blame] | 5806 | int i; |
| 5807 | struct diff_filepair *p; |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 5808 | 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 Torvalds | 6447971 | 2007-10-25 11:20:56 -0700 | [diff] [blame] | 5829 | /* |
| 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 Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 5838 | */ |
Linus Torvalds | 6447971 | 2007-10-25 11:20:56 -0700 | [diff] [blame] | 5839 | if (!strcmp(p->one->path, p->two->path)) |
| 5840 | p->status = DIFF_STATUS_MODIFIED; |
| 5841 | else if (--p->one->rename_used > 0) |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 5842 | p->status = DIFF_STATUS_COPIED; |
Linus Torvalds | 6447971 | 2007-10-25 11:20:56 -0700 | [diff] [blame] | 5843 | else |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 5844 | p->status = DIFF_STATUS_RENAMED; |
| 5845 | } |
Jeff King | 9001dc2 | 2018-08-28 17:22:48 -0400 | [diff] [blame] | 5846 | else if (!oideq(&p->one->oid, &p->two->oid) || |
Johannes Schindelin | d516c2d | 2007-02-22 21:50:10 +0100 | [diff] [blame] | 5847 | p->one->mode != p->two->mode || |
Jens Lehmann | 85adbf2 | 2010-03-12 22:23:52 +0100 | [diff] [blame] | 5848 | p->one->dirty_submodule || |
| 5849 | p->two->dirty_submodule || |
brian m. carlson | a0d12c4 | 2016-06-24 23:09:23 +0000 | [diff] [blame] | 5850 | is_null_oid(&p->one->oid)) |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 5851 | 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 Hirvonen | c674434 | 2006-06-24 20:21:53 +0300 | [diff] [blame] | 5864 | static int check_pair_status(struct diff_filepair *p) |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 5865 | { |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 5866 | switch (p->status) { |
| 5867 | case DIFF_STATUS_UNKNOWN: |
Timo Hirvonen | c674434 | 2006-06-24 20:21:53 +0300 | [diff] [blame] | 5868 | return 0; |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 5869 | case 0: |
| 5870 | die("internal error in diff-resolve-rename-copy"); |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 5871 | default: |
Timo Hirvonen | c674434 | 2006-06-24 20:21:53 +0300 | [diff] [blame] | 5872 | return 1; |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 5873 | } |
| 5874 | } |
| 5875 | |
Timo Hirvonen | c674434 | 2006-06-24 20:21:53 +0300 | [diff] [blame] | 5876 | static 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 Hamano | cd676a5 | 2008-02-12 14:26:02 -0800 | [diff] [blame] | 5884 | 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 King | f5022b5 | 2017-02-08 15:31:15 -0500 | [diff] [blame] | 5889 | fprintf(opt->file, "%s", diff_line_prefix(opt)); |
Daniel Barkalow | c0c7773 | 2008-03-09 22:43:39 -0400 | [diff] [blame] | 5890 | write_name_quoted(name_a, opt->file, opt->line_termination); |
Junio C Hamano | cd676a5 | 2008-02-12 14:26:02 -0800 | [diff] [blame] | 5891 | } |
Timo Hirvonen | c674434 | 2006-06-24 20:21:53 +0300 | [diff] [blame] | 5892 | } |
| 5893 | |
Stefan Beller | 146fdb0 | 2017-06-29 17:07:05 -0700 | [diff] [blame] | 5894 | static void show_file_mode_name(struct diff_options *opt, const char *newdelete, struct diff_filespec *fs) |
Sean | 4bbd261 | 2006-05-14 08:13:49 -0400 | [diff] [blame] | 5895 | { |
Stefan Beller | 146fdb0 | 2017-06-29 17:07:05 -0700 | [diff] [blame] | 5896 | struct strbuf sb = STRBUF_INIT; |
Sean | 4bbd261 | 2006-05-14 08:13:49 -0400 | [diff] [blame] | 5897 | if (fs->mode) |
Stefan Beller | 146fdb0 | 2017-06-29 17:07:05 -0700 | [diff] [blame] | 5898 | strbuf_addf(&sb, " %s mode %06o ", newdelete, fs->mode); |
Sean | 4bbd261 | 2006-05-14 08:13:49 -0400 | [diff] [blame] | 5899 | else |
Stefan Beller | 146fdb0 | 2017-06-29 17:07:05 -0700 | [diff] [blame] | 5900 | 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); |
Sean | 4bbd261 | 2006-05-14 08:13:49 -0400 | [diff] [blame] | 5907 | } |
| 5908 | |
Stefan Beller | 146fdb0 | 2017-06-29 17:07:05 -0700 | [diff] [blame] | 5909 | static void show_mode_change(struct diff_options *opt, struct diff_filepair *p, |
| 5910 | int show_name) |
Sean | 4bbd261 | 2006-05-14 08:13:49 -0400 | [diff] [blame] | 5911 | { |
| 5912 | if (p->one->mode && p->two->mode && p->one->mode != p->two->mode) { |
Stefan Beller | 146fdb0 | 2017-06-29 17:07:05 -0700 | [diff] [blame] | 5913 | struct strbuf sb = STRBUF_INIT; |
| 5914 | strbuf_addf(&sb, " mode change %06o => %06o", |
| 5915 | p->one->mode, p->two->mode); |
Alexandre Julliard | 0d26a64 | 2007-02-10 15:37:48 +0100 | [diff] [blame] | 5916 | if (show_name) { |
Stefan Beller | 146fdb0 | 2017-06-29 17:07:05 -0700 | [diff] [blame] | 5917 | strbuf_addch(&sb, ' '); |
| 5918 | quote_c_style(p->two->path, &sb, NULL, 0); |
Alexandre Julliard | 0d26a64 | 2007-02-10 15:37:48 +0100 | [diff] [blame] | 5919 | } |
Stefan Beller | 58aaced | 2017-09-27 15:51:26 -0700 | [diff] [blame] | 5920 | strbuf_addch(&sb, '\n'); |
Stefan Beller | 146fdb0 | 2017-06-29 17:07:05 -0700 | [diff] [blame] | 5921 | emit_diff_symbol(opt, DIFF_SYMBOL_SUMMARY, |
| 5922 | sb.buf, sb.len, 0); |
| 5923 | strbuf_release(&sb); |
Sean | 4bbd261 | 2006-05-14 08:13:49 -0400 | [diff] [blame] | 5924 | } |
| 5925 | } |
| 5926 | |
Stefan Beller | 146fdb0 | 2017-06-29 17:07:05 -0700 | [diff] [blame] | 5927 | static void show_rename_copy(struct diff_options *opt, const char *renamecopy, |
| 5928 | struct diff_filepair *p) |
Sean | 4bbd261 | 2006-05-14 08:13:49 -0400 | [diff] [blame] | 5929 | { |
Stefan Beller | 146fdb0 | 2017-06-29 17:07:05 -0700 | [diff] [blame] | 5930 | struct strbuf sb = STRBUF_INIT; |
Nguyễn Thái Ngọc Duy | c905cbc | 2018-02-01 20:02:20 +0700 | [diff] [blame] | 5931 | struct strbuf names = STRBUF_INIT; |
| 5932 | |
| 5933 | pprint_rename(&names, p->one->path, p->two->path); |
Stefan Beller | 146fdb0 | 2017-06-29 17:07:05 -0700 | [diff] [blame] | 5934 | strbuf_addf(&sb, " %s %s (%d%%)\n", |
Nguyễn Thái Ngọc Duy | c905cbc | 2018-02-01 20:02:20 +0700 | [diff] [blame] | 5935 | renamecopy, names.buf, similarity_index(p)); |
| 5936 | strbuf_release(&names); |
Stefan Beller | 146fdb0 | 2017-06-29 17:07:05 -0700 | [diff] [blame] | 5937 | emit_diff_symbol(opt, DIFF_SYMBOL_SUMMARY, |
| 5938 | sb.buf, sb.len, 0); |
| 5939 | show_mode_change(opt, p, 0); |
Rene Scharfe | 348eda2 | 2017-08-30 19:49:42 +0200 | [diff] [blame] | 5940 | strbuf_release(&sb); |
Sean | 4bbd261 | 2006-05-14 08:13:49 -0400 | [diff] [blame] | 5941 | } |
| 5942 | |
Bo Yang | 7be5761 | 2010-05-26 15:23:54 +0800 | [diff] [blame] | 5943 | static void diff_summary(struct diff_options *opt, struct diff_filepair *p) |
Sean | 4bbd261 | 2006-05-14 08:13:49 -0400 | [diff] [blame] | 5944 | { |
| 5945 | switch(p->status) { |
| 5946 | case DIFF_STATUS_DELETED: |
Stefan Beller | 146fdb0 | 2017-06-29 17:07:05 -0700 | [diff] [blame] | 5947 | show_file_mode_name(opt, "delete", p->one); |
Sean | 4bbd261 | 2006-05-14 08:13:49 -0400 | [diff] [blame] | 5948 | break; |
| 5949 | case DIFF_STATUS_ADDED: |
Stefan Beller | 146fdb0 | 2017-06-29 17:07:05 -0700 | [diff] [blame] | 5950 | show_file_mode_name(opt, "create", p->two); |
Sean | 4bbd261 | 2006-05-14 08:13:49 -0400 | [diff] [blame] | 5951 | break; |
| 5952 | case DIFF_STATUS_COPIED: |
Stefan Beller | 146fdb0 | 2017-06-29 17:07:05 -0700 | [diff] [blame] | 5953 | show_rename_copy(opt, "copy", p); |
Sean | 4bbd261 | 2006-05-14 08:13:49 -0400 | [diff] [blame] | 5954 | break; |
| 5955 | case DIFF_STATUS_RENAMED: |
Stefan Beller | 146fdb0 | 2017-06-29 17:07:05 -0700 | [diff] [blame] | 5956 | show_rename_copy(opt, "rename", p); |
Sean | 4bbd261 | 2006-05-14 08:13:49 -0400 | [diff] [blame] | 5957 | break; |
| 5958 | default: |
| 5959 | if (p->score) { |
Stefan Beller | 146fdb0 | 2017-06-29 17:07:05 -0700 | [diff] [blame] | 5960 | 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 Scharfe | fa842d8 | 2017-08-30 19:49:41 +0200 | [diff] [blame] | 5966 | strbuf_release(&sb); |
Pierre Habouzit | 663af34 | 2007-09-20 00:42:15 +0200 | [diff] [blame] | 5967 | } |
Stefan Beller | 146fdb0 | 2017-06-29 17:07:05 -0700 | [diff] [blame] | 5968 | show_mode_change(opt, p, !p->score); |
Sean | 4bbd261 | 2006-05-14 08:13:49 -0400 | [diff] [blame] | 5969 | break; |
| 5970 | } |
| 5971 | } |
| 5972 | |
Johannes Schindelin | fcb3d0a | 2006-06-25 03:51:08 +0200 | [diff] [blame] | 5973 | struct patch_id_t { |
Nicolas Pitre | 9126f00 | 2008-10-01 14:05:20 -0400 | [diff] [blame] | 5974 | git_SHA_CTX *ctx; |
Johannes Schindelin | fcb3d0a | 2006-06-25 03:51:08 +0200 | [diff] [blame] | 5975 | int patchlen; |
| 5976 | }; |
| 5977 | |
| 5978 | static int remove_space(char *line, int len) |
| 5979 | { |
| 5980 | int i; |
Pierre Habouzit | 663af34 | 2007-09-20 00:42:15 +0200 | [diff] [blame] | 5981 | char *dst = line; |
| 5982 | unsigned char c; |
Johannes Schindelin | fcb3d0a | 2006-06-25 03:51:08 +0200 | [diff] [blame] | 5983 | |
Pierre Habouzit | 663af34 | 2007-09-20 00:42:15 +0200 | [diff] [blame] | 5984 | for (i = 0; i < len; i++) |
| 5985 | if (!isspace((c = line[i]))) |
| 5986 | *dst++ = c; |
Johannes Schindelin | fcb3d0a | 2006-06-25 03:51:08 +0200 | [diff] [blame] | 5987 | |
Pierre Habouzit | 663af34 | 2007-09-20 00:42:15 +0200 | [diff] [blame] | 5988 | return dst - line; |
Johannes Schindelin | fcb3d0a | 2006-06-25 03:51:08 +0200 | [diff] [blame] | 5989 | } |
| 5990 | |
| 5991 | static 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 Schindelin | fcb3d0a | 2006-06-25 03:51:08 +0200 | [diff] [blame] | 5996 | new_len = remove_space(line, len); |
| 5997 | |
Nicolas Pitre | 9126f00 | 2008-10-01 14:05:20 -0400 | [diff] [blame] | 5998 | git_SHA1_Update(data->ctx, line, new_len); |
Johannes Schindelin | fcb3d0a | 2006-06-25 03:51:08 +0200 | [diff] [blame] | 5999 | data->patchlen += new_len; |
| 6000 | } |
| 6001 | |
Jeff King | 977db6b | 2017-03-30 14:26:05 -0400 | [diff] [blame] | 6002 | static void patch_id_add_string(git_SHA_CTX *ctx, const char *str) |
| 6003 | { |
| 6004 | git_SHA1_Update(ctx, str, strlen(str)); |
| 6005 | } |
| 6006 | |
| 6007 | static 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 Schindelin | fcb3d0a | 2006-06-25 03:51:08 +0200 | [diff] [blame] | 6015 | /* returns 0 upon success, and writes result into sha1 */ |
Brandon Williams | bd25f28 | 2017-05-30 10:30:54 -0700 | [diff] [blame] | 6016 | static int diff_get_patch_id(struct diff_options *options, struct object_id *oid, int diff_header_only) |
Johannes Schindelin | fcb3d0a | 2006-06-25 03:51:08 +0200 | [diff] [blame] | 6017 | { |
| 6018 | struct diff_queue_struct *q = &diff_queued_diff; |
| 6019 | int i; |
Nicolas Pitre | 9126f00 | 2008-10-01 14:05:20 -0400 | [diff] [blame] | 6020 | git_SHA_CTX ctx; |
Johannes Schindelin | fcb3d0a | 2006-06-25 03:51:08 +0200 | [diff] [blame] | 6021 | struct patch_id_t data; |
Johannes Schindelin | fcb3d0a | 2006-06-25 03:51:08 +0200 | [diff] [blame] | 6022 | |
Nicolas Pitre | 9126f00 | 2008-10-01 14:05:20 -0400 | [diff] [blame] | 6023 | git_SHA1_Init(&ctx); |
Johannes Schindelin | fcb3d0a | 2006-06-25 03:51:08 +0200 | [diff] [blame] | 6024 | memset(&data, 0, sizeof(struct patch_id_t)); |
| 6025 | data.ctx = &ctx; |
Johannes Schindelin | fcb3d0a | 2006-06-25 03:51:08 +0200 | [diff] [blame] | 6026 | |
| 6027 | for (i = 0; i < q->nr; i++) { |
| 6028 | xpparam_t xpp; |
| 6029 | xdemitconf_t xecfg; |
Johannes Schindelin | fcb3d0a | 2006-06-25 03:51:08 +0200 | [diff] [blame] | 6030 | mmfile_t mf1, mf2; |
| 6031 | struct diff_filepair *p = q->queue[i]; |
| 6032 | int len1, len2; |
| 6033 | |
Brian Downing | 9ccd0a8 | 2008-10-25 15:30:37 +0200 | [diff] [blame] | 6034 | memset(&xpp, 0, sizeof(xpp)); |
Johannes Schindelin | 30b2501 | 2007-07-04 19:05:46 +0100 | [diff] [blame] | 6035 | memset(&xecfg, 0, sizeof(xecfg)); |
Johannes Schindelin | fcb3d0a | 2006-06-25 03:51:08 +0200 | [diff] [blame] | 6036 | 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 Duy | 58bf2a4 | 2018-09-21 17:57:31 +0200 | [diff] [blame] | 6048 | diff_fill_oid_info(p->one, options->repo->index); |
| 6049 | diff_fill_oid_info(p->two, options->repo->index); |
Johannes Schindelin | fcb3d0a | 2006-06-25 03:51:08 +0200 | [diff] [blame] | 6050 | |
Johannes Schindelin | fcb3d0a | 2006-06-25 03:51:08 +0200 | [diff] [blame] | 6051 | len1 = remove_space(p->one->path, strlen(p->one->path)); |
| 6052 | len2 = remove_space(p->two->path, strlen(p->two->path)); |
Jeff King | 977db6b | 2017-03-30 14:26:05 -0400 | [diff] [blame] | 6053 | 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 Schindelin | fcb3d0a | 2006-06-25 03:51:08 +0200 | [diff] [blame] | 6077 | |
Kevin Willford | 3e8e32c | 2016-07-29 12:19:19 -0400 | [diff] [blame] | 6078 | if (diff_header_only) |
| 6079 | continue; |
| 6080 | |
Nguyễn Thái Ngọc Duy | b78ea5f | 2018-09-21 17:57:19 +0200 | [diff] [blame] | 6081 | if (fill_mmfile(options->repo, &mf1, p->one) < 0 || |
| 6082 | fill_mmfile(options->repo, &mf2, p->two) < 0) |
Kevin Willford | 3e8e32c | 2016-07-29 12:19:19 -0400 | [diff] [blame] | 6083 | return error("unable to read files to diff"); |
| 6084 | |
Nguyễn Thái Ngọc Duy | b78ea5f | 2018-09-21 17:57:19 +0200 | [diff] [blame] | 6085 | if (diff_filespec_is_binary(options->repo, p->one) || |
| 6086 | diff_filespec_is_binary(options->repo, p->two)) { |
brian m. carlson | a0d12c4 | 2016-06-24 23:09:23 +0000 | [diff] [blame] | 6087 | git_SHA1_Update(&ctx, oid_to_hex(&p->one->oid), |
Brandon Williams | bd25f28 | 2017-05-30 10:30:54 -0700 | [diff] [blame] | 6088 | GIT_SHA1_HEXSZ); |
brian m. carlson | a0d12c4 | 2016-06-24 23:09:23 +0000 | [diff] [blame] | 6089 | git_SHA1_Update(&ctx, oid_to_hex(&p->two->oid), |
Brandon Williams | bd25f28 | 2017-05-30 10:30:54 -0700 | [diff] [blame] | 6090 | GIT_SHA1_HEXSZ); |
Clemens Buchacher | 34597c1 | 2010-08-15 09:20:43 +0200 | [diff] [blame] | 6091 | continue; |
| 6092 | } |
| 6093 | |
René Scharfe | 582aa00 | 2010-05-02 15:04:41 +0200 | [diff] [blame] | 6094 | xpp.flags = 0; |
Johannes Schindelin | fcb3d0a | 2006-06-25 03:51:08 +0200 | [diff] [blame] | 6095 | xecfg.ctxlen = 3; |
Clemens Buchacher | ad14b45 | 2010-09-19 11:59:28 +0200 | [diff] [blame] | 6096 | xecfg.flags = 0; |
Jeff King | b135739 | 2018-11-02 02:36:36 -0400 | [diff] [blame] | 6097 | if (xdi_diff_outf(&mf1, &mf2, discard_hunk_line, |
| 6098 | patch_id_consume, &data, &xpp, &xecfg)) |
Jeff King | 3efb988 | 2015-09-24 19:12:23 -0400 | [diff] [blame] | 6099 | return error("unable to generate patch-id diff for %s", |
| 6100 | p->one->path); |
Johannes Schindelin | fcb3d0a | 2006-06-25 03:51:08 +0200 | [diff] [blame] | 6101 | } |
| 6102 | |
Brandon Williams | bd25f28 | 2017-05-30 10:30:54 -0700 | [diff] [blame] | 6103 | git_SHA1_Final(oid->hash, &ctx); |
Johannes Schindelin | fcb3d0a | 2006-06-25 03:51:08 +0200 | [diff] [blame] | 6104 | return 0; |
| 6105 | } |
| 6106 | |
Brandon Williams | bd25f28 | 2017-05-30 10:30:54 -0700 | [diff] [blame] | 6107 | int diff_flush_patch_id(struct diff_options *options, struct object_id *oid, int diff_header_only) |
Johannes Schindelin | fcb3d0a | 2006-06-25 03:51:08 +0200 | [diff] [blame] | 6108 | { |
| 6109 | struct diff_queue_struct *q = &diff_queued_diff; |
| 6110 | int i; |
Brandon Williams | bd25f28 | 2017-05-30 10:30:54 -0700 | [diff] [blame] | 6111 | int result = diff_get_patch_id(options, oid, diff_header_only); |
Johannes Schindelin | fcb3d0a | 2006-06-25 03:51:08 +0200 | [diff] [blame] | 6112 | |
| 6113 | for (i = 0; i < q->nr; i++) |
| 6114 | diff_free_filepair(q->queue[i]); |
| 6115 | |
| 6116 | free(q->queue); |
Bo Yang | 9ca5df9 | 2010-05-06 21:52:27 -0700 | [diff] [blame] | 6117 | DIFF_QUEUE_CLEAR(q); |
Johannes Schindelin | fcb3d0a | 2006-06-25 03:51:08 +0200 | [diff] [blame] | 6118 | |
| 6119 | return result; |
| 6120 | } |
| 6121 | |
Timo Hirvonen | 946c378 | 2006-06-27 15:09:17 +0300 | [diff] [blame] | 6122 | static 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 Hamano | f31027c | 2011-01-06 13:50:06 -0800 | [diff] [blame] | 6147 | static const char rename_limit_warning[] = |
Vasco Almeida | db42497 | 2016-10-17 13:15:29 +0000 | [diff] [blame] | 6148 | N_("inexact rename detection was skipped due to too many files."); |
Junio C Hamano | f31027c | 2011-01-06 13:50:06 -0800 | [diff] [blame] | 6149 | |
| 6150 | static const char degrade_cc_to_c_warning[] = |
Vasco Almeida | db42497 | 2016-10-17 13:15:29 +0000 | [diff] [blame] | 6151 | N_("only found copies from modified paths due to too many files."); |
Junio C Hamano | f31027c | 2011-01-06 13:50:06 -0800 | [diff] [blame] | 6152 | |
| 6153 | static const char rename_limit_advice[] = |
Vasco Almeida | db42497 | 2016-10-17 13:15:29 +0000 | [diff] [blame] | 6154 | N_("you may want to set your %s variable to at least " |
| 6155 | "%d and retry the command."); |
Junio C Hamano | f31027c | 2011-01-06 13:50:06 -0800 | [diff] [blame] | 6156 | |
| 6157 | void diff_warn_rename_limit(const char *varname, int needed, int degraded_cc) |
| 6158 | { |
Nguyễn Thái Ngọc Duy | 4e056c9 | 2018-01-16 16:23:49 +0700 | [diff] [blame] | 6159 | fflush(stdout); |
Junio C Hamano | f31027c | 2011-01-06 13:50:06 -0800 | [diff] [blame] | 6160 | if (degraded_cc) |
Vasco Almeida | db42497 | 2016-10-17 13:15:29 +0000 | [diff] [blame] | 6161 | warning(_(degrade_cc_to_c_warning)); |
Junio C Hamano | f31027c | 2011-01-06 13:50:06 -0800 | [diff] [blame] | 6162 | else if (needed) |
Vasco Almeida | db42497 | 2016-10-17 13:15:29 +0000 | [diff] [blame] | 6163 | warning(_(rename_limit_warning)); |
Junio C Hamano | f31027c | 2011-01-06 13:50:06 -0800 | [diff] [blame] | 6164 | else |
| 6165 | return; |
Elijah Newren | 9f7e4bf | 2017-11-13 12:15:59 -0800 | [diff] [blame] | 6166 | if (0 < needed) |
Vasco Almeida | db42497 | 2016-10-17 13:15:29 +0000 | [diff] [blame] | 6167 | warning(_(rename_limit_advice), varname, needed); |
Junio C Hamano | f31027c | 2011-01-06 13:50:06 -0800 | [diff] [blame] | 6168 | } |
| 6169 | |
Stefan Beller | ec33150 | 2017-06-29 17:06:48 -0700 | [diff] [blame] | 6170 | static void diff_flush_patch_all_file_pairs(struct diff_options *o) |
| 6171 | { |
| 6172 | int i; |
Stefan Beller | e6e045f | 2017-06-29 17:07:06 -0700 | [diff] [blame] | 6173 | static struct emitted_diff_symbols esm = EMITTED_DIFF_SYMBOLS_INIT; |
Stefan Beller | ec33150 | 2017-06-29 17:06:48 -0700 | [diff] [blame] | 6174 | struct diff_queue_struct *q = &diff_queued_diff; |
Stefan Beller | 091f8e2 | 2017-06-29 17:06:53 -0700 | [diff] [blame] | 6175 | |
| 6176 | if (WSEH_NEW & WS_RULE_MASK) |
Johannes Schindelin | 033abf9 | 2018-05-02 11:38:39 +0200 | [diff] [blame] | 6177 | BUG("WS rules bit mask overlaps with diff symbol flags"); |
Stefan Beller | 091f8e2 | 2017-06-29 17:06:53 -0700 | [diff] [blame] | 6178 | |
Stefan Beller | 2e2d5ac | 2017-06-30 13:53:07 -0700 | [diff] [blame] | 6179 | if (o->color_moved) |
| 6180 | o->emitted_symbols = &esm; |
Stefan Beller | e6e045f | 2017-06-29 17:07:06 -0700 | [diff] [blame] | 6181 | |
Stefan Beller | ec33150 | 2017-06-29 17:06:48 -0700 | [diff] [blame] | 6182 | 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 Beller | e6e045f | 2017-06-29 17:07:06 -0700 | [diff] [blame] | 6187 | |
| 6188 | if (o->emitted_symbols) { |
Stefan Beller | 2e2d5ac | 2017-06-30 13:53:07 -0700 | [diff] [blame] | 6189 | if (o->color_moved) { |
| 6190 | struct hashmap add_lines, del_lines; |
| 6191 | |
Stefan Beller | ca1f4ae | 2018-07-18 12:31:55 -0700 | [diff] [blame] | 6192 | if (o->color_moved_ws_handling & |
| 6193 | COLOR_MOVED_WS_ALLOW_INDENTATION_CHANGE) |
| 6194 | o->color_moved_ws_handling |= XDF_IGNORE_WHITESPACE; |
| 6195 | |
Stefan Beller | ee1df66 | 2018-07-16 16:05:38 -0700 | [diff] [blame] | 6196 | hashmap_init(&del_lines, moved_entry_cmp, o, 0); |
| 6197 | hashmap_init(&add_lines, moved_entry_cmp, o, 0); |
Stefan Beller | 2e2d5ac | 2017-06-30 13:53:07 -0700 | [diff] [blame] | 6198 | |
| 6199 | add_lines_to_move_detection(o, &add_lines, &del_lines); |
| 6200 | mark_color_as_moved(o, &add_lines, &del_lines); |
Stefan Beller | 86b452e | 2017-06-30 13:53:09 -0700 | [diff] [blame] | 6201 | if (o->color_moved == COLOR_MOVED_ZEBRA_DIM) |
| 6202 | dim_moved_lines(o); |
Stefan Beller | 2e2d5ac | 2017-06-30 13:53:07 -0700 | [diff] [blame] | 6203 | |
Phillip Wood | 47cb16a | 2018-10-04 11:07:45 +0100 | [diff] [blame] | 6204 | hashmap_free(&add_lines, 1); |
| 6205 | hashmap_free(&del_lines, 1); |
Stefan Beller | 2e2d5ac | 2017-06-30 13:53:07 -0700 | [diff] [blame] | 6206 | } |
| 6207 | |
Stefan Beller | e6e045f | 2017-06-29 17:07:06 -0700 | [diff] [blame] | 6208 | 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 King | 48edf3a | 2019-01-24 07:32:41 -0500 | [diff] [blame] | 6213 | esm.nr = 0; |
| 6214 | |
| 6215 | o->emitted_symbols = NULL; |
Stefan Beller | e6e045f | 2017-06-29 17:07:06 -0700 | [diff] [blame] | 6216 | } |
Stefan Beller | ec33150 | 2017-06-29 17:06:48 -0700 | [diff] [blame] | 6217 | } |
| 6218 | |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 6219 | void diff_flush(struct diff_options *options) |
| 6220 | { |
| 6221 | struct diff_queue_struct *q = &diff_queued_diff; |
Timo Hirvonen | c674434 | 2006-06-24 20:21:53 +0300 | [diff] [blame] | 6222 | int i, output_format = options->output_format; |
Timo Hirvonen | 946c378 | 2006-06-27 15:09:17 +0300 | [diff] [blame] | 6223 | int separator = 0; |
Johan Herland | 1c57a62 | 2011-04-29 11:36:21 +0200 | [diff] [blame] | 6224 | int dirstat_by_line = 0; |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 6225 | |
Timo Hirvonen | c674434 | 2006-06-24 20:21:53 +0300 | [diff] [blame] | 6226 | /* |
| 6227 | * Order: raw, stat, summary, patch |
| 6228 | * or: name/name-status/checkdiff (other bits clear) |
| 6229 | */ |
Timo Hirvonen | 946c378 | 2006-06-27 15:09:17 +0300 | [diff] [blame] | 6230 | if (!q->nr) |
| 6231 | goto free_queue; |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 6232 | |
Timo Hirvonen | c674434 | 2006-06-24 20:21:53 +0300 | [diff] [blame] | 6233 | if (output_format & (DIFF_FORMAT_RAW | |
| 6234 | DIFF_FORMAT_NAME | |
| 6235 | DIFF_FORMAT_NAME_STATUS | |
| 6236 | DIFF_FORMAT_CHECKDIFF)) { |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 6237 | for (i = 0; i < q->nr; i++) { |
| 6238 | struct diff_filepair *p = q->queue[i]; |
Timo Hirvonen | c674434 | 2006-06-24 20:21:53 +0300 | [diff] [blame] | 6239 | if (check_pair_status(p)) |
| 6240 | flush_one_pair(p, options); |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 6241 | } |
Timo Hirvonen | 946c378 | 2006-06-27 15:09:17 +0300 | [diff] [blame] | 6242 | separator++; |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 6243 | } |
Timo Hirvonen | c674434 | 2006-06-24 20:21:53 +0300 | [diff] [blame] | 6244 | |
Brandon Williams | 0d1e0e7 | 2017-10-31 11:19:11 -0700 | [diff] [blame] | 6245 | if (output_format & DIFF_FORMAT_DIRSTAT && options->flags.dirstat_by_line) |
Johan Herland | 1c57a62 | 2011-04-29 11:36:21 +0200 | [diff] [blame] | 6246 | dirstat_by_line = 1; |
| 6247 | |
| 6248 | if (output_format & (DIFF_FORMAT_DIFFSTAT|DIFF_FORMAT_SHORTSTAT|DIFF_FORMAT_NUMSTAT) || |
| 6249 | dirstat_by_line) { |
Timo Hirvonen | 5e2b063 | 2006-06-25 14:28:19 +0300 | [diff] [blame] | 6250 | struct diffstat_t diffstat; |
Timo Hirvonen | c674434 | 2006-06-24 20:21:53 +0300 | [diff] [blame] | 6251 | |
Timo Hirvonen | 5e2b063 | 2006-06-25 14:28:19 +0300 | [diff] [blame] | 6252 | memset(&diffstat, 0, sizeof(struct diffstat_t)); |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 6253 | for (i = 0; i < q->nr; i++) { |
| 6254 | struct diff_filepair *p = q->queue[i]; |
Timo Hirvonen | c674434 | 2006-06-24 20:21:53 +0300 | [diff] [blame] | 6255 | if (check_pair_status(p)) |
Timo Hirvonen | 5e2b063 | 2006-06-25 14:28:19 +0300 | [diff] [blame] | 6256 | diff_flush_stat(p, options, &diffstat); |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 6257 | } |
Junio C Hamano | 74e2abe | 2006-10-12 03:01:00 -0700 | [diff] [blame] | 6258 | 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 Hamano | f604652 | 2007-12-11 23:46:30 -0800 | [diff] [blame] | 6262 | if (output_format & DIFF_FORMAT_SHORTSTAT) |
Daniel Barkalow | c0c7773 | 2008-03-09 22:43:39 -0400 | [diff] [blame] | 6263 | show_shortstats(&diffstat, options); |
Mårten Kongstad | ab27389 | 2015-03-02 16:05:39 +0100 | [diff] [blame] | 6264 | if (output_format & DIFF_FORMAT_DIRSTAT && dirstat_by_line) |
Johan Herland | 1c57a62 | 2011-04-29 11:36:21 +0200 | [diff] [blame] | 6265 | show_dirstat_by_line(&diffstat, options); |
Junio C Hamano | f604652 | 2007-12-11 23:46:30 -0800 | [diff] [blame] | 6266 | free_diffstat_info(&diffstat); |
Junio C Hamano | 3969cf7 | 2006-06-27 15:08:19 -0700 | [diff] [blame] | 6267 | separator++; |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 6268 | } |
Johan Herland | 1c57a62 | 2011-04-29 11:36:21 +0200 | [diff] [blame] | 6269 | if ((output_format & DIFF_FORMAT_DIRSTAT) && !dirstat_by_line) |
Junio C Hamano | c04a715 | 2008-02-12 17:06:58 -0800 | [diff] [blame] | 6270 | show_dirstat(options); |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 6271 | |
Timo Hirvonen | 946c378 | 2006-06-27 15:09:17 +0300 | [diff] [blame] | 6272 | if (output_format & DIFF_FORMAT_SUMMARY && !is_summary_empty(q)) { |
Bo Yang | 7be5761 | 2010-05-26 15:23:54 +0800 | [diff] [blame] | 6273 | for (i = 0; i < q->nr; i++) { |
| 6274 | diff_summary(options, q->queue[i]); |
| 6275 | } |
Junio C Hamano | 3969cf7 | 2006-06-27 15:08:19 -0700 | [diff] [blame] | 6276 | separator++; |
Sean | 4bbd261 | 2006-05-14 08:13:49 -0400 | [diff] [blame] | 6277 | } |
| 6278 | |
Larry D'Anna | 6977c25 | 2010-02-16 01:55:21 -0500 | [diff] [blame] | 6279 | if (output_format & DIFF_FORMAT_NO_OUTPUT && |
Brandon Williams | 0d1e0e7 | 2017-10-31 11:19:11 -0700 | [diff] [blame] | 6280 | options->flags.exit_with_status && |
| 6281 | options->flags.diff_from_contents) { |
Larry D'Anna | 6977c25 | 2010-02-16 01:55:21 -0500 | [diff] [blame] | 6282 | /* |
| 6283 | * run diff_flush_patch for the exit status. setting |
Ondřej Bílka | 749f763 | 2013-07-22 23:02:23 +0200 | [diff] [blame] | 6284 | * options->file to /dev/null should be safe, because we |
Larry D'Anna | 6977c25 | 2010-02-16 01:55:21 -0500 | [diff] [blame] | 6285 | * aren't supposed to produce any output anyway. |
| 6286 | */ |
| 6287 | if (options->close_file) |
| 6288 | fclose(options->file); |
Nguyễn Thái Ngọc Duy | 23a9e07 | 2017-05-03 17:16:46 +0700 | [diff] [blame] | 6289 | options->file = xfopen("/dev/null", "w"); |
Larry D'Anna | 6977c25 | 2010-02-16 01:55:21 -0500 | [diff] [blame] | 6290 | options->close_file = 1; |
Stefan Beller | 2e2d5ac | 2017-06-30 13:53:07 -0700 | [diff] [blame] | 6291 | options->color_moved = 0; |
Larry D'Anna | 6977c25 | 2010-02-16 01:55:21 -0500 | [diff] [blame] | 6292 | 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 Hirvonen | c674434 | 2006-06-24 20:21:53 +0300 | [diff] [blame] | 6301 | if (output_format & DIFF_FORMAT_PATCH) { |
Timo Hirvonen | 946c378 | 2006-06-27 15:09:17 +0300 | [diff] [blame] | 6302 | if (separator) { |
Stefan Beller | 091f8e2 | 2017-06-29 17:06:53 -0700 | [diff] [blame] | 6303 | emit_diff_symbol(options, DIFF_SYMBOL_SEPARATOR, NULL, 0, 0); |
Stefan Beller | 30b7e1e | 2017-06-29 17:07:04 -0700 | [diff] [blame] | 6304 | if (options->stat_sep) |
Timo Hirvonen | 946c378 | 2006-06-27 15:09:17 +0300 | [diff] [blame] | 6305 | /* attach patch instead of inline */ |
Stefan Beller | 30b7e1e | 2017-06-29 17:07:04 -0700 | [diff] [blame] | 6306 | emit_diff_symbol(options, DIFF_SYMBOL_STAT_SEP, |
| 6307 | NULL, 0, 0); |
Timo Hirvonen | c674434 | 2006-06-24 20:21:53 +0300 | [diff] [blame] | 6308 | } |
| 6309 | |
Stefan Beller | ec33150 | 2017-06-29 17:06:48 -0700 | [diff] [blame] | 6310 | diff_flush_patch_all_file_pairs(options); |
Timo Hirvonen | c674434 | 2006-06-24 20:21:53 +0300 | [diff] [blame] | 6311 | } |
| 6312 | |
Jeff King | 0424558 | 2006-09-07 02:35:42 -0400 | [diff] [blame] | 6313 | if (output_format & DIFF_FORMAT_CALLBACK) |
| 6314 | options->format_callback(q, options, options->format_callback_data); |
| 6315 | |
Timo Hirvonen | c674434 | 2006-06-24 20:21:53 +0300 | [diff] [blame] | 6316 | for (i = 0; i < q->nr; i++) |
| 6317 | diff_free_filepair(q->queue[i]); |
Timo Hirvonen | 946c378 | 2006-06-27 15:09:17 +0300 | [diff] [blame] | 6318 | free_queue: |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 6319 | free(q->queue); |
Bo Yang | 9ca5df9 | 2010-05-06 21:52:27 -0700 | [diff] [blame] | 6320 | DIFF_QUEUE_CLEAR(q); |
Daniel Barkalow | c0c7773 | 2008-03-09 22:43:39 -0400 | [diff] [blame] | 6321 | if (options->close_file) |
| 6322 | fclose(options->file); |
Junio C Hamano | f245194 | 2009-05-22 12:45:29 -0700 | [diff] [blame] | 6323 | |
| 6324 | /* |
Jim Meyering | 97bf2a0 | 2009-08-30 22:27:02 +0200 | [diff] [blame] | 6325 | * Report the content-level differences with HAS_CHANGES; |
Junio C Hamano | f245194 | 2009-05-22 12:45:29 -0700 | [diff] [blame] | 6326 | * diff_addremove/diff_change does not set the bit when |
| 6327 | * DIFF_FROM_CONTENTS is in effect (e.g. with -w). |
| 6328 | */ |
Brandon Williams | 0d1e0e7 | 2017-10-31 11:19:11 -0700 | [diff] [blame] | 6329 | if (options->flags.diff_from_contents) { |
Junio C Hamano | f245194 | 2009-05-22 12:45:29 -0700 | [diff] [blame] | 6330 | if (options->found_changes) |
Brandon Williams | 0d1e0e7 | 2017-10-31 11:19:11 -0700 | [diff] [blame] | 6331 | options->flags.has_changes = 1; |
Junio C Hamano | f245194 | 2009-05-22 12:45:29 -0700 | [diff] [blame] | 6332 | else |
Brandon Williams | 0d1e0e7 | 2017-10-31 11:19:11 -0700 | [diff] [blame] | 6333 | options->flags.has_changes = 0; |
Junio C Hamano | f245194 | 2009-05-22 12:45:29 -0700 | [diff] [blame] | 6334 | } |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 6335 | } |
| 6336 | |
Junio C Hamano | 08578fa | 2013-07-17 15:09:34 -0700 | [diff] [blame] | 6337 | static 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 Hamano | 1ecc1cb | 2013-07-17 15:05:46 -0700 | [diff] [blame] | 6341 | filter_bit_tst(DIFF_STATUS_FILTER_BROKEN, options)) || |
Junio C Hamano | 08578fa | 2013-07-17 15:09:34 -0700 | [diff] [blame] | 6342 | (!p->score && |
Junio C Hamano | 1ecc1cb | 2013-07-17 15:05:46 -0700 | [diff] [blame] | 6343 | filter_bit_tst(DIFF_STATUS_MODIFIED, options)))) || |
Junio C Hamano | 08578fa | 2013-07-17 15:09:34 -0700 | [diff] [blame] | 6344 | ((p->status != DIFF_STATUS_MODIFIED) && |
Junio C Hamano | 1ecc1cb | 2013-07-17 15:05:46 -0700 | [diff] [blame] | 6345 | filter_bit_tst(p->status, options))); |
Junio C Hamano | 08578fa | 2013-07-17 15:09:34 -0700 | [diff] [blame] | 6346 | } |
| 6347 | |
Junio C Hamano | 949226f | 2013-07-17 14:19:24 -0700 | [diff] [blame] | 6348 | static void diffcore_apply_filter(struct diff_options *options) |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 6349 | { |
| 6350 | int i; |
| 6351 | struct diff_queue_struct *q = &diff_queued_diff; |
| 6352 | struct diff_queue_struct outq; |
Junio C Hamano | 949226f | 2013-07-17 14:19:24 -0700 | [diff] [blame] | 6353 | |
Bo Yang | 9ca5df9 | 2010-05-06 21:52:27 -0700 | [diff] [blame] | 6354 | DIFF_QUEUE_CLEAR(&outq); |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 6355 | |
Junio C Hamano | 1ecc1cb | 2013-07-17 15:05:46 -0700 | [diff] [blame] | 6356 | if (!options->filter) |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 6357 | return; |
| 6358 | |
Junio C Hamano | 1ecc1cb | 2013-07-17 15:05:46 -0700 | [diff] [blame] | 6359 | if (filter_bit_tst(DIFF_STATUS_FILTER_AON, options)) { |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 6360 | int found; |
| 6361 | for (i = found = 0; !found && i < q->nr; i++) { |
Junio C Hamano | 08578fa | 2013-07-17 15:09:34 -0700 | [diff] [blame] | 6362 | if (match_filter(options, q->queue[i])) |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 6363 | 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 Hamano | 08578fa | 2013-07-17 15:09:34 -0700 | [diff] [blame] | 6380 | if (match_filter(options, p)) |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 6381 | diff_q(&outq, p); |
| 6382 | else |
| 6383 | diff_free_filepair(p); |
| 6384 | } |
| 6385 | } |
| 6386 | free(q->queue); |
| 6387 | *q = outq; |
| 6388 | } |
| 6389 | |
Sven Verdoolaege | 5701115 | 2007-09-08 12:30:22 +0200 | [diff] [blame] | 6390 | /* Check whether two filespecs with the same mode and size are identical */ |
Nguyễn Thái Ngọc Duy | b78ea5f | 2018-09-21 17:57:19 +0200 | [diff] [blame] | 6391 | static int diff_filespec_is_identical(struct repository *r, |
| 6392 | struct diff_filespec *one, |
Sven Verdoolaege | 5701115 | 2007-09-08 12:30:22 +0200 | [diff] [blame] | 6393 | struct diff_filespec *two) |
| 6394 | { |
Junio C Hamano | 2b459b4 | 2008-03-02 00:07:59 -0800 | [diff] [blame] | 6395 | if (S_ISGITLINK(one->mode)) |
| 6396 | return 0; |
Nguyễn Thái Ngọc Duy | b78ea5f | 2018-09-21 17:57:19 +0200 | [diff] [blame] | 6397 | if (diff_populate_filespec(r, one, 0)) |
Sven Verdoolaege | 5701115 | 2007-09-08 12:30:22 +0200 | [diff] [blame] | 6398 | return 0; |
Nguyễn Thái Ngọc Duy | b78ea5f | 2018-09-21 17:57:19 +0200 | [diff] [blame] | 6399 | if (diff_populate_filespec(r, two, 0)) |
Sven Verdoolaege | 5701115 | 2007-09-08 12:30:22 +0200 | [diff] [blame] | 6400 | return 0; |
| 6401 | return !memcmp(one->data, two->data, one->size); |
| 6402 | } |
| 6403 | |
Nguyễn Thái Ngọc Duy | b78ea5f | 2018-09-21 17:57:19 +0200 | [diff] [blame] | 6404 | static int diff_filespec_check_stat_unmatch(struct repository *r, |
| 6405 | struct diff_filepair *p) |
Nguyễn Thái Ngọc Duy | fceb907 | 2014-01-25 13:46:49 +0700 | [diff] [blame] | 6406 | { |
Nguyễn Thái Ngọc Duy | f34b205 | 2014-01-25 13:46:50 +0700 | [diff] [blame] | 6407 | 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 Duy | fceb907 | 2014-01-25 13:46:49 +0700 | [diff] [blame] | 6412 | /* |
| 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. carlson | 41c9560 | 2016-06-24 23:09:24 +0000 | [diff] [blame] | 6427 | (p->one->oid_valid && p->two->oid_valid) || |
Nguyễn Thái Ngọc Duy | fceb907 | 2014-01-25 13:46:49 +0700 | [diff] [blame] | 6428 | (p->one->mode != p->two->mode) || |
Nguyễn Thái Ngọc Duy | b78ea5f | 2018-09-21 17:57:19 +0200 | [diff] [blame] | 6429 | 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 Duy | fceb907 | 2014-01-25 13:46:49 +0700 | [diff] [blame] | 6431 | (p->one->size != p->two->size) || |
Nguyễn Thái Ngọc Duy | b78ea5f | 2018-09-21 17:57:19 +0200 | [diff] [blame] | 6432 | !diff_filespec_is_identical(r, p->one, p->two)) /* (2) */ |
Nguyễn Thái Ngọc Duy | f34b205 | 2014-01-25 13:46:50 +0700 | [diff] [blame] | 6433 | p->skip_stat_unmatch_result = 1; |
| 6434 | return p->skip_stat_unmatch_result; |
Nguyễn Thái Ngọc Duy | fceb907 | 2014-01-25 13:46:49 +0700 | [diff] [blame] | 6435 | } |
| 6436 | |
Junio C Hamano | fb13227 | 2007-08-03 13:33:31 -0700 | [diff] [blame] | 6437 | static 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 Yang | 9ca5df9 | 2010-05-06 21:52:27 -0700 | [diff] [blame] | 6442 | DIFF_QUEUE_CLEAR(&outq); |
Junio C Hamano | fb13227 | 2007-08-03 13:33:31 -0700 | [diff] [blame] | 6443 | |
| 6444 | for (i = 0; i < q->nr; i++) { |
| 6445 | struct diff_filepair *p = q->queue[i]; |
| 6446 | |
Nguyễn Thái Ngọc Duy | b78ea5f | 2018-09-21 17:57:19 +0200 | [diff] [blame] | 6447 | if (diff_filespec_check_stat_unmatch(diffopt->repo, p)) |
Junio C Hamano | fb13227 | 2007-08-03 13:33:31 -0700 | [diff] [blame] | 6448 | 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 Williams | 0d1e0e7 | 2017-10-31 11:19:11 -0700 | [diff] [blame] | 6455 | if (!diffopt->flags.no_index) |
René Scharfe | 6d2d9e8 | 2007-08-15 00:41:00 +0200 | [diff] [blame] | 6456 | diffopt->skip_stat_unmatch++; |
Junio C Hamano | fb13227 | 2007-08-03 13:33:31 -0700 | [diff] [blame] | 6457 | diff_free_filepair(p); |
| 6458 | } |
| 6459 | } |
| 6460 | free(q->queue); |
| 6461 | *q = outq; |
| 6462 | } |
| 6463 | |
Junio C Hamano | 730f728 | 2009-09-20 00:03:39 -0700 | [diff] [blame] | 6464 | static 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 King | 784c0da | 2019-02-14 00:48:03 -0500 | [diff] [blame] | 6475 | void diffcore_fix_diff_index(void) |
Junio C Hamano | 730f728 | 2009-09-20 00:03:39 -0700 | [diff] [blame] | 6476 | { |
| 6477 | struct diff_queue_struct *q = &diff_queued_diff; |
René Scharfe | 9ed0d8d | 2016-09-29 17:27:31 +0200 | [diff] [blame] | 6478 | QSORT(q->queue, q->nr, diffnamecmp); |
Junio C Hamano | 730f728 | 2009-09-20 00:03:39 -0700 | [diff] [blame] | 6479 | } |
| 6480 | |
Jonathan Tan | 7fbbcb2 | 2019-04-05 10:09:34 -0700 | [diff] [blame] | 6481 | static 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 Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 6491 | void diffcore_std(struct diff_options *options) |
| 6492 | { |
Jonathan Tan | 7fbbcb2 | 2019-04-05 10:09:34 -0700 | [diff] [blame] | 6493 | 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 Smelkov | 7195fbf | 2014-02-24 20:21:51 +0400 | [diff] [blame] | 6516 | /* NOTE please keep the following in sync with diff_tree_combined() */ |
Junio C Hamano | 9d86535 | 2008-09-06 19:09:16 -0700 | [diff] [blame] | 6517 | if (options->skip_stat_unmatch) |
Junio C Hamano | fb13227 | 2007-08-03 13:33:31 -0700 | [diff] [blame] | 6518 | diffcore_skip_stat_unmatch(options); |
Junio C Hamano | 44c48a9 | 2010-08-13 12:17:45 -0700 | [diff] [blame] | 6519 | 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 Duy | b78ea5f | 2018-09-21 17:57:19 +0200 | [diff] [blame] | 6522 | diffcore_break(options->repo, |
| 6523 | options->break_opt); |
Junio C Hamano | 44c48a9 | 2010-08-13 12:17:45 -0700 | [diff] [blame] | 6524 | if (options->detect_rename) |
| 6525 | diffcore_rename(options); |
| 6526 | if (options->break_opt != -1) |
| 6527 | diffcore_merge_broken(); |
| 6528 | } |
Stefan Beller | cf63051 | 2018-01-04 14:50:41 -0800 | [diff] [blame] | 6529 | if (options->pickaxe_opts & DIFF_PICKAXE_KINDS_MASK) |
Junio C Hamano | 382f013 | 2010-08-31 13:44:39 -0700 | [diff] [blame] | 6530 | diffcore_pickaxe(options); |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 6531 | if (options->orderfile) |
| 6532 | diffcore_order(options->orderfile); |
Junio C Hamano | 44c48a9 | 2010-08-13 12:17:45 -0700 | [diff] [blame] | 6533 | if (!options->found_follow) |
| 6534 | /* See try_to_follow_renames() in tree-diff.c */ |
| 6535 | diff_resolve_rename_copy(); |
Junio C Hamano | 949226f | 2013-07-17 14:19:24 -0700 | [diff] [blame] | 6536 | diffcore_apply_filter(options); |
Junio C Hamano | 68aacb2 | 2007-03-14 11:12:13 -0700 | [diff] [blame] | 6537 | |
Brandon Williams | 0d1e0e7 | 2017-10-31 11:19:11 -0700 | [diff] [blame] | 6538 | if (diff_queued_diff.nr && !options->flags.diff_from_contents) |
| 6539 | options->flags.has_changes = 1; |
Pierre Habouzit | 8f67f8a | 2007-11-10 20:05:14 +0100 | [diff] [blame] | 6540 | else |
Brandon Williams | 0d1e0e7 | 2017-10-31 11:19:11 -0700 | [diff] [blame] | 6541 | options->flags.has_changes = 0; |
Bo Yang | 1da6175 | 2010-05-06 21:52:28 -0700 | [diff] [blame] | 6542 | |
Junio C Hamano | 44c48a9 | 2010-08-13 12:17:45 -0700 | [diff] [blame] | 6543 | options->found_follow = 0; |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 6544 | } |
| 6545 | |
Junio C Hamano | da31b35 | 2007-12-13 23:40:27 -0800 | [diff] [blame] | 6546 | int diff_result_code(struct diff_options *opt, int status) |
| 6547 | { |
| 6548 | int result = 0; |
Junio C Hamano | f31027c | 2011-01-06 13:50:06 -0800 | [diff] [blame] | 6549 | |
Max Nanasy | c9fc441 | 2013-03-21 12:53:38 -0700 | [diff] [blame] | 6550 | diff_warn_rename_limit("diff.renameLimit", |
Junio C Hamano | f31027c | 2011-01-06 13:50:06 -0800 | [diff] [blame] | 6551 | opt->needed_rename_limit, |
| 6552 | opt->degraded_cc_to_c); |
Brandon Williams | 0d1e0e7 | 2017-10-31 11:19:11 -0700 | [diff] [blame] | 6553 | if (!opt->flags.exit_with_status && |
Junio C Hamano | da31b35 | 2007-12-13 23:40:27 -0800 | [diff] [blame] | 6554 | !(opt->output_format & DIFF_FORMAT_CHECKDIFF)) |
| 6555 | return status; |
Brandon Williams | 0d1e0e7 | 2017-10-31 11:19:11 -0700 | [diff] [blame] | 6556 | if (opt->flags.exit_with_status && |
| 6557 | opt->flags.has_changes) |
Junio C Hamano | da31b35 | 2007-12-13 23:40:27 -0800 | [diff] [blame] | 6558 | result |= 01; |
| 6559 | if ((opt->output_format & DIFF_FORMAT_CHECKDIFF) && |
Brandon Williams | 0d1e0e7 | 2017-10-31 11:19:11 -0700 | [diff] [blame] | 6560 | opt->flags.check_failed) |
Junio C Hamano | da31b35 | 2007-12-13 23:40:27 -0800 | [diff] [blame] | 6561 | result |= 02; |
| 6562 | return result; |
| 6563 | } |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 6564 | |
Junio C Hamano | 28b9264 | 2011-05-31 09:14:17 -0700 | [diff] [blame] | 6565 | int diff_can_quit_early(struct diff_options *opt) |
| 6566 | { |
Brandon Williams | 0d1e0e7 | 2017-10-31 11:19:11 -0700 | [diff] [blame] | 6567 | return (opt->flags.quick && |
Junio C Hamano | 28b9264 | 2011-05-31 09:14:17 -0700 | [diff] [blame] | 6568 | !opt->filter && |
Brandon Williams | 0d1e0e7 | 2017-10-31 11:19:11 -0700 | [diff] [blame] | 6569 | opt->flags.has_changes); |
Junio C Hamano | 28b9264 | 2011-05-31 09:14:17 -0700 | [diff] [blame] | 6570 | } |
| 6571 | |
Jens Lehmann | aee9c7d | 2010-08-06 00:39:25 +0200 | [diff] [blame] | 6572 | /* |
| 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 | */ |
| 6578 | static int is_submodule_ignored(const char *path, struct diff_options *options) |
| 6579 | { |
| 6580 | int ignored = 0; |
Brandon Williams | 02f2f56 | 2017-10-31 11:19:05 -0700 | [diff] [blame] | 6581 | struct diff_flags orig_flags = options->flags; |
Brandon Williams | 0d1e0e7 | 2017-10-31 11:19:11 -0700 | [diff] [blame] | 6582 | if (!options->flags.override_submodule_config) |
Jens Lehmann | aee9c7d | 2010-08-06 00:39:25 +0200 | [diff] [blame] | 6583 | set_diffopt_flags_from_submodule_config(options, path); |
Brandon Williams | 0d1e0e7 | 2017-10-31 11:19:11 -0700 | [diff] [blame] | 6584 | if (options->flags.ignore_submodules) |
Jens Lehmann | aee9c7d | 2010-08-06 00:39:25 +0200 | [diff] [blame] | 6585 | ignored = 1; |
| 6586 | options->flags = orig_flags; |
| 6587 | return ignored; |
| 6588 | } |
| 6589 | |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 6590 | void diff_addremove(struct diff_options *options, |
| 6591 | int addremove, unsigned mode, |
Brandon Williams | c26022e | 2017-05-30 10:30:47 -0700 | [diff] [blame] | 6592 | const struct object_id *oid, |
| 6593 | int oid_valid, |
Jens Lehmann | e3d42c4 | 2010-01-18 21:26:18 +0100 | [diff] [blame] | 6594 | const char *concatpath, unsigned dirty_submodule) |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 6595 | { |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 6596 | struct diff_filespec *one, *two; |
| 6597 | |
Jens Lehmann | aee9c7d | 2010-08-06 00:39:25 +0200 | [diff] [blame] | 6598 | if (S_ISGITLINK(mode) && is_submodule_ignored(concatpath, options)) |
Johannes Schindelin | 50fd9bd | 2008-05-14 18:03:31 +0100 | [diff] [blame] | 6599 | return; |
| 6600 | |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 6601 | /* 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 Hamano | a6080a0 | 2007-06-07 00:04:01 -0700 | [diff] [blame] | 6608 | * Feeding the same new and old to diff_change() |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 6609 | * 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 Williams | 0d1e0e7 | 2017-10-31 11:19:11 -0700 | [diff] [blame] | 6613 | if (options->flags.reverse_diff) |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 6614 | addremove = (addremove == '+' ? '-' : |
| 6615 | addremove == '-' ? '+' : addremove); |
| 6616 | |
Junio C Hamano | cd676a5 | 2008-02-12 14:26:02 -0800 | [diff] [blame] | 6617 | if (options->prefix && |
| 6618 | strncmp(concatpath, options->prefix, options->prefix_length)) |
| 6619 | return; |
| 6620 | |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 6621 | one = alloc_filespec(concatpath); |
| 6622 | two = alloc_filespec(concatpath); |
| 6623 | |
| 6624 | if (addremove != '+') |
Brandon Williams | f9704c2 | 2017-05-30 10:30:50 -0700 | [diff] [blame] | 6625 | fill_filespec(one, oid, oid_valid, mode); |
Jens Lehmann | e3d42c4 | 2010-01-18 21:26:18 +0100 | [diff] [blame] | 6626 | if (addremove != '-') { |
Brandon Williams | f9704c2 | 2017-05-30 10:30:50 -0700 | [diff] [blame] | 6627 | fill_filespec(two, oid, oid_valid, mode); |
Jens Lehmann | e3d42c4 | 2010-01-18 21:26:18 +0100 | [diff] [blame] | 6628 | two->dirty_submodule = dirty_submodule; |
| 6629 | } |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 6630 | |
| 6631 | diff_queue(&diff_queued_diff, one, two); |
Brandon Williams | 0d1e0e7 | 2017-10-31 11:19:11 -0700 | [diff] [blame] | 6632 | if (!options->flags.diff_from_contents) |
| 6633 | options->flags.has_changes = 1; |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 6634 | } |
| 6635 | |
| 6636 | void diff_change(struct diff_options *options, |
| 6637 | unsigned old_mode, unsigned new_mode, |
Brandon Williams | 94a0097 | 2017-05-30 10:30:49 -0700 | [diff] [blame] | 6638 | const struct object_id *old_oid, |
| 6639 | const struct object_id *new_oid, |
| 6640 | int old_oid_valid, int new_oid_valid, |
Jens Lehmann | e3d42c4 | 2010-01-18 21:26:18 +0100 | [diff] [blame] | 6641 | const char *concatpath, |
| 6642 | unsigned old_dirty_submodule, unsigned new_dirty_submodule) |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 6643 | { |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 6644 | struct diff_filespec *one, *two; |
Nguyễn Thái Ngọc Duy | f34b205 | 2014-01-25 13:46:50 +0700 | [diff] [blame] | 6645 | struct diff_filepair *p; |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 6646 | |
Jens Lehmann | aee9c7d | 2010-08-06 00:39:25 +0200 | [diff] [blame] | 6647 | if (S_ISGITLINK(old_mode) && S_ISGITLINK(new_mode) && |
| 6648 | is_submodule_ignored(concatpath, options)) |
Johannes Schindelin | 50fd9bd | 2008-05-14 18:03:31 +0100 | [diff] [blame] | 6649 | return; |
| 6650 | |
Brandon Williams | 0d1e0e7 | 2017-10-31 11:19:11 -0700 | [diff] [blame] | 6651 | if (options->flags.reverse_diff) { |
René Scharfe | 35d803b | 2017-01-28 22:40:58 +0100 | [diff] [blame] | 6652 | SWAP(old_mode, new_mode); |
Brandon Williams | 94a0097 | 2017-05-30 10:30:49 -0700 | [diff] [blame] | 6653 | SWAP(old_oid, new_oid); |
| 6654 | SWAP(old_oid_valid, new_oid_valid); |
René Scharfe | 35d803b | 2017-01-28 22:40:58 +0100 | [diff] [blame] | 6655 | SWAP(old_dirty_submodule, new_dirty_submodule); |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 6656 | } |
Junio C Hamano | cd676a5 | 2008-02-12 14:26:02 -0800 | [diff] [blame] | 6657 | |
| 6658 | if (options->prefix && |
| 6659 | strncmp(concatpath, options->prefix, options->prefix_length)) |
| 6660 | return; |
| 6661 | |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 6662 | one = alloc_filespec(concatpath); |
| 6663 | two = alloc_filespec(concatpath); |
Brandon Williams | f9704c2 | 2017-05-30 10:30:50 -0700 | [diff] [blame] | 6664 | fill_filespec(one, old_oid, old_oid_valid, old_mode); |
| 6665 | fill_filespec(two, new_oid, new_oid_valid, new_mode); |
Jens Lehmann | e3d42c4 | 2010-01-18 21:26:18 +0100 | [diff] [blame] | 6666 | one->dirty_submodule = old_dirty_submodule; |
| 6667 | two->dirty_submodule = new_dirty_submodule; |
Nguyễn Thái Ngọc Duy | f34b205 | 2014-01-25 13:46:50 +0700 | [diff] [blame] | 6668 | p = diff_queue(&diff_queued_diff, one, two); |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 6669 | |
Brandon Williams | 0d1e0e7 | 2017-10-31 11:19:11 -0700 | [diff] [blame] | 6670 | if (options->flags.diff_from_contents) |
Nguyễn Thái Ngọc Duy | f34b205 | 2014-01-25 13:46:50 +0700 | [diff] [blame] | 6671 | return; |
| 6672 | |
Brandon Williams | 0d1e0e7 | 2017-10-31 11:19:11 -0700 | [diff] [blame] | 6673 | if (options->flags.quick && options->skip_stat_unmatch && |
Nguyễn Thái Ngọc Duy | b78ea5f | 2018-09-21 17:57:19 +0200 | [diff] [blame] | 6674 | !diff_filespec_check_stat_unmatch(options->repo, p)) |
Nguyễn Thái Ngọc Duy | f34b205 | 2014-01-25 13:46:50 +0700 | [diff] [blame] | 6675 | return; |
| 6676 | |
Brandon Williams | 0d1e0e7 | 2017-10-31 11:19:11 -0700 | [diff] [blame] | 6677 | options->flags.has_changes = 1; |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 6678 | } |
| 6679 | |
Junio C Hamano | fa7b290 | 2011-04-22 16:05:58 -0700 | [diff] [blame] | 6680 | struct diff_filepair *diff_unmerge(struct diff_options *options, const char *path) |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 6681 | { |
Junio C Hamano | 76399c0 | 2011-04-22 15:55:55 -0700 | [diff] [blame] | 6682 | struct diff_filepair *pair; |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 6683 | struct diff_filespec *one, *two; |
Junio C Hamano | cd676a5 | 2008-02-12 14:26:02 -0800 | [diff] [blame] | 6684 | |
| 6685 | if (options->prefix && |
| 6686 | strncmp(path, options->prefix, options->prefix_length)) |
Junio C Hamano | 76399c0 | 2011-04-22 15:55:55 -0700 | [diff] [blame] | 6687 | return NULL; |
Junio C Hamano | cd676a5 | 2008-02-12 14:26:02 -0800 | [diff] [blame] | 6688 | |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 6689 | one = alloc_filespec(path); |
| 6690 | two = alloc_filespec(path); |
Junio C Hamano | 76399c0 | 2011-04-22 15:55:55 -0700 | [diff] [blame] | 6691 | pair = diff_queue(&diff_queued_diff, one, two); |
| 6692 | pair->is_unmerged = 1; |
| 6693 | return pair; |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 6694 | } |
Jeff King | 9cb92c3 | 2008-10-05 17:43:45 -0400 | [diff] [blame] | 6695 | |
Nguyễn Thái Ngọc Duy | b78ea5f | 2018-09-21 17:57:19 +0200 | [diff] [blame] | 6696 | static char *run_textconv(struct repository *r, |
| 6697 | const char *pgm, |
| 6698 | struct diff_filespec *spec, |
| 6699 | size_t *outsize) |
Jeff King | 9cb92c3 | 2008-10-05 17:43:45 -0400 | [diff] [blame] | 6700 | { |
Jeff King | 479b0ae | 2009-01-22 00:59:56 -0500 | [diff] [blame] | 6701 | struct diff_tempfile *temp; |
Jeff King | 9cb92c3 | 2008-10-05 17:43:45 -0400 | [diff] [blame] | 6702 | const char *argv[3]; |
| 6703 | const char **arg = argv; |
René Scharfe | d318027 | 2014-08-19 21:09:35 +0200 | [diff] [blame] | 6704 | struct child_process child = CHILD_PROCESS_INIT; |
Jeff King | 9cb92c3 | 2008-10-05 17:43:45 -0400 | [diff] [blame] | 6705 | struct strbuf buf = STRBUF_INIT; |
Johannes Sixt | da1fbed | 2010-03-30 19:36:03 +0200 | [diff] [blame] | 6706 | int err = 0; |
Jeff King | 9cb92c3 | 2008-10-05 17:43:45 -0400 | [diff] [blame] | 6707 | |
Nguyễn Thái Ngọc Duy | b78ea5f | 2018-09-21 17:57:19 +0200 | [diff] [blame] | 6708 | temp = prepare_temp_file(r, spec->path, spec); |
Jeff King | 9cb92c3 | 2008-10-05 17:43:45 -0400 | [diff] [blame] | 6709 | *arg++ = pgm; |
Jeff King | 479b0ae | 2009-01-22 00:59:56 -0500 | [diff] [blame] | 6710 | *arg++ = temp->name; |
Jeff King | 9cb92c3 | 2008-10-05 17:43:45 -0400 | [diff] [blame] | 6711 | *arg = NULL; |
| 6712 | |
Jeff King | 41a457e | 2009-12-30 06:01:09 -0500 | [diff] [blame] | 6713 | child.use_shell = 1; |
Jeff King | 9cb92c3 | 2008-10-05 17:43:45 -0400 | [diff] [blame] | 6714 | child.argv = argv; |
| 6715 | child.out = -1; |
Johannes Sixt | da1fbed | 2010-03-30 19:36:03 +0200 | [diff] [blame] | 6716 | if (start_command(&child)) { |
Jeff King | 479b0ae | 2009-01-22 00:59:56 -0500 | [diff] [blame] | 6717 | remove_tempfile(); |
Jeff King | 9cb92c3 | 2008-10-05 17:43:45 -0400 | [diff] [blame] | 6718 | return NULL; |
| 6719 | } |
Johannes Sixt | da1fbed | 2010-03-30 19:36:03 +0200 | [diff] [blame] | 6720 | |
| 6721 | if (strbuf_read(&buf, child.out, 0) < 0) |
| 6722 | err = error("error reading from textconv command '%s'", pgm); |
Jeff King | 70d7099 | 2009-12-30 04:02:53 -0500 | [diff] [blame] | 6723 | close(child.out); |
Johannes Sixt | da1fbed | 2010-03-30 19:36:03 +0200 | [diff] [blame] | 6724 | |
| 6725 | if (finish_command(&child) || err) { |
| 6726 | strbuf_release(&buf); |
| 6727 | remove_tempfile(); |
| 6728 | return NULL; |
| 6729 | } |
Jeff King | 479b0ae | 2009-01-22 00:59:56 -0500 | [diff] [blame] | 6730 | remove_tempfile(); |
Jeff King | 9cb92c3 | 2008-10-05 17:43:45 -0400 | [diff] [blame] | 6731 | |
| 6732 | return strbuf_detach(&buf, outsize); |
| 6733 | } |
Jeff King | 840383b | 2010-04-01 20:09:26 -0400 | [diff] [blame] | 6734 | |
Nguyễn Thái Ngọc Duy | 6afaf80 | 2018-09-21 17:57:22 +0200 | [diff] [blame] | 6735 | size_t fill_textconv(struct repository *r, |
| 6736 | struct userdiff_driver *driver, |
Axel Bonnet | a788d7d | 2010-06-07 17:23:36 +0200 | [diff] [blame] | 6737 | struct diff_filespec *df, |
| 6738 | char **outbuf) |
Jeff King | 840383b | 2010-04-01 20:09:26 -0400 | [diff] [blame] | 6739 | { |
| 6740 | size_t size; |
| 6741 | |
Jeff King | a64e6a4 | 2016-02-22 13:28:54 -0500 | [diff] [blame] | 6742 | if (!driver) { |
Jeff King | 840383b | 2010-04-01 20:09:26 -0400 | [diff] [blame] | 6743 | if (!DIFF_FILE_VALID(df)) { |
| 6744 | *outbuf = ""; |
| 6745 | return 0; |
| 6746 | } |
Nguyễn Thái Ngọc Duy | b78ea5f | 2018-09-21 17:57:19 +0200 | [diff] [blame] | 6747 | if (diff_populate_filespec(r, df, 0)) |
Jeff King | 840383b | 2010-04-01 20:09:26 -0400 | [diff] [blame] | 6748 | die("unable to read files to diff"); |
| 6749 | *outbuf = df->data; |
| 6750 | return df->size; |
| 6751 | } |
| 6752 | |
Jeff King | a64e6a4 | 2016-02-22 13:28:54 -0500 | [diff] [blame] | 6753 | if (!driver->textconv) |
Johannes Schindelin | 033abf9 | 2018-05-02 11:38:39 +0200 | [diff] [blame] | 6754 | BUG("fill_textconv called with non-textconv driver"); |
Jeff King | a64e6a4 | 2016-02-22 13:28:54 -0500 | [diff] [blame] | 6755 | |
brian m. carlson | 41c9560 | 2016-06-24 23:09:24 +0000 | [diff] [blame] | 6756 | if (driver->textconv_cache && df->oid_valid) { |
brian m. carlson | a0d12c4 | 2016-06-24 23:09:23 +0000 | [diff] [blame] | 6757 | *outbuf = notes_cache_get(driver->textconv_cache, |
brian m. carlson | 569aa37 | 2017-05-06 22:09:58 +0000 | [diff] [blame] | 6758 | &df->oid, |
Jeff King | d9bae1a | 2010-04-01 20:12:15 -0400 | [diff] [blame] | 6759 | &size); |
| 6760 | if (*outbuf) |
| 6761 | return size; |
| 6762 | } |
| 6763 | |
Nguyễn Thái Ngọc Duy | b78ea5f | 2018-09-21 17:57:19 +0200 | [diff] [blame] | 6764 | *outbuf = run_textconv(r, driver->textconv, df, &size); |
Jeff King | 840383b | 2010-04-01 20:09:26 -0400 | [diff] [blame] | 6765 | if (!*outbuf) |
| 6766 | die("unable to read files to diff"); |
Jeff King | d9bae1a | 2010-04-01 20:12:15 -0400 | [diff] [blame] | 6767 | |
brian m. carlson | 41c9560 | 2016-06-24 23:09:24 +0000 | [diff] [blame] | 6768 | if (driver->textconv_cache && df->oid_valid) { |
Jeff King | d9bae1a | 2010-04-01 20:12:15 -0400 | [diff] [blame] | 6769 | /* ignore errors, as we might be in a readonly repository */ |
brian m. carlson | 569aa37 | 2017-05-06 22:09:58 +0000 | [diff] [blame] | 6770 | notes_cache_put(driver->textconv_cache, &df->oid, *outbuf, |
Jeff King | d9bae1a | 2010-04-01 20:12:15 -0400 | [diff] [blame] | 6771 | 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 King | 840383b | 2010-04-01 20:09:26 -0400 | [diff] [blame] | 6781 | return size; |
| 6782 | } |
Nguyễn Thái Ngọc Duy | 4914c96 | 2012-10-26 22:53:52 +0700 | [diff] [blame] | 6783 | |
Nguyễn Thái Ngọc Duy | 6afaf80 | 2018-09-21 17:57:22 +0200 | [diff] [blame] | 6784 | int textconv_object(struct repository *r, |
| 6785 | const char *path, |
Jeff Smith | 3a35cb2 | 2017-05-24 00:15:10 -0500 | [diff] [blame] | 6786 | 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 Hamano | a6f38c1 | 2017-06-19 12:38:44 -0700 | [diff] [blame] | 6796 | fill_filespec(df, oid, oid_valid, mode); |
Nguyễn Thái Ngọc Duy | bd7ad45 | 2018-11-10 06:49:06 +0100 | [diff] [blame] | 6797 | textconv = get_textconv(r, df); |
Jeff Smith | 3a35cb2 | 2017-05-24 00:15:10 -0500 | [diff] [blame] | 6798 | if (!textconv) { |
| 6799 | free_filespec(df); |
| 6800 | return 0; |
| 6801 | } |
| 6802 | |
Nguyễn Thái Ngọc Duy | 6afaf80 | 2018-09-21 17:57:22 +0200 | [diff] [blame] | 6803 | *buf_size = fill_textconv(r, textconv, df, buf); |
Jeff Smith | 3a35cb2 | 2017-05-24 00:15:10 -0500 | [diff] [blame] | 6804 | free_filespec(df); |
| 6805 | return 1; |
| 6806 | } |
| 6807 | |
Nguyễn Thái Ngọc Duy | 4914c96 | 2012-10-26 22:53:52 +0700 | [diff] [blame] | 6808 | void 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 Williams | 0d1e0e7 | 2017-10-31 11:19:11 -0700 | [diff] [blame] | 6819 | if (!opt->flags.exit_with_status && |
Nguyễn Thái Ngọc Duy | 4914c96 | 2012-10-26 22:53:52 +0700 | [diff] [blame] | 6820 | check_pager_config("diff") != 0) |
| 6821 | setup_pager(); |
| 6822 | } |