🌐 AI搜索 & 代理 主页
Google Git
Sign in
chromium / external / github.com / git / git / refs/tags/v2.2.0-rc0 / . / diff.h
blob: b4a624d235748bf13be44e7479f086880dcf574f [file] [log] [blame]
Junio C Hamanobe3cfa82005-04-26 16:25:05[diff] [blame]1/*
2 * Copyright (C) 2005 Junio C Hamano
3 */
Junio C Hamano86436c22005-04-26 01:22:47[diff] [blame]4#ifndef DIFF_H
5#define DIFF_H
6
Junio C Hamano1b0c7172006-03-30 06:55:43[diff] [blame]7#include "tree-walk.h"
Nguyễn Thái Ngọc Duy64acde92013-07-14 08:35:25[diff] [blame]8#include "pathspec.h"
Linus Torvalds50f9a852006-01-31 22:10:56[diff] [blame]9
Linus Torvalds91539832006-04-17 18:59:32[diff] [blame]10struct rev_info;
Linus Torvaldsac1b3d12005-10-21 04:05:05[diff] [blame]11struct diff_options;
Jeff King04245582006-09-07 06:35:42[diff] [blame]12struct diff_queue_struct;
Bo Yanga3c158d2010-05-26 07:08:02[diff] [blame]13struct strbuf;
Axel Bonneta788d7d2010-06-07 15:23:36[diff] [blame]14struct diff_filespec;
15struct userdiff_driver;
René Scharfe0041f092011-12-17 10:15:48[diff] [blame]16struct sha1_array;
René Scharfe82889292011-12-17 10:20:07[diff] [blame]17struct commit;
Kirill Smelkov72441af2014-04-06 21:46:26[diff] [blame]18struct combine_diff_path;
19
20typedef int (*pathchange_fn_t)(struct diff_options *options,
21 struct combine_diff_path *path);
Linus Torvaldsac1b3d12005-10-21 04:05:05[diff] [blame]22
23typedef void (*change_fn_t)(struct diff_options *options,
24 unsigned old_mode, unsigned new_mode,
25 const unsigned char *old_sha1,
26 const unsigned char *new_sha1,
Jeff Kinge5450102012-07-28 15:03:01[diff] [blame]27 int old_sha1_valid, int new_sha1_valid,
Jens Lehmanne3d42c42010-01-18 20:26:18[diff] [blame]28 const char *fullpath,
29 unsigned old_dirty_submodule, unsigned new_dirty_submodule);
Linus Torvaldsac1b3d12005-10-21 04:05:05[diff] [blame]30
31typedef void (*add_remove_fn_t)(struct diff_options *options,
32 int addremove, unsigned mode,
33 const unsigned char *sha1,
Jeff Kinge5450102012-07-28 15:03:01[diff] [blame]34 int sha1_valid,
Jens Lehmanne3d42c42010-01-18 20:26:18[diff] [blame]35 const char *fullpath, unsigned dirty_submodule);
Linus Torvaldsac1b3d12005-10-21 04:05:05[diff] [blame]36
Jeff King04245582006-09-07 06:35:42[diff] [blame]37typedef void (*diff_format_fn_t)(struct diff_queue_struct *q,
38 struct diff_options *options, void *data);
39
Bo Yanga3c158d2010-05-26 07:08:02[diff] [blame]40typedef struct strbuf *(*diff_prefix_fn_t)(struct diff_options *opt, void *data);
41
Timo Hirvonenc6744342006-06-24 17:21:53[diff] [blame]42#define DIFF_FORMAT_RAW 0x0001
43#define DIFF_FORMAT_DIFFSTAT 0x0002
Junio C Hamano74e2abe2006-10-12 10:01:00[diff] [blame]44#define DIFF_FORMAT_NUMSTAT 0x0004
45#define DIFF_FORMAT_SUMMARY 0x0008
46#define DIFF_FORMAT_PATCH 0x0010
Nicolas Pitreebd124c2006-12-15 04:15:44[diff] [blame]47#define DIFF_FORMAT_SHORTSTAT 0x0020
Linus Torvalds7df7c012008-02-12 21:26:31[diff] [blame]48#define DIFF_FORMAT_DIRSTAT 0x0040
Timo Hirvonenc6744342006-06-24 17:21:53[diff] [blame]49
50/* These override all above */
Junio C Hamano74e2abe2006-10-12 10:01:00[diff] [blame]51#define DIFF_FORMAT_NAME 0x0100
52#define DIFF_FORMAT_NAME_STATUS 0x0200
53#define DIFF_FORMAT_CHECKDIFF 0x0400
Timo Hirvonenc6744342006-06-24 17:21:53[diff] [blame]54
55/* Same as output_format = 0 but we know that -s flag was given
56 * and we should not give default value to output_format.
57 */
Junio C Hamano74e2abe2006-10-12 10:01:00[diff] [blame]58#define DIFF_FORMAT_NO_OUTPUT 0x0800
Timo Hirvonenc6744342006-06-24 17:21:53[diff] [blame]59
Junio C Hamano74e2abe2006-10-12 10:01:00[diff] [blame]60#define DIFF_FORMAT_CALLBACK 0x1000
Jeff King04245582006-09-07 06:35:42[diff] [blame]61
Pierre Habouzit8f67f8a2007-11-10 19:05:14[diff] [blame]62#define DIFF_OPT_RECURSIVE (1 << 0)
63#define DIFF_OPT_TREE_IN_RECURSIVE (1 << 1)
64#define DIFF_OPT_BINARY (1 << 2)
65#define DIFF_OPT_TEXT (1 << 3)
66#define DIFF_OPT_FULL_INDEX (1 << 4)
67#define DIFF_OPT_SILENT_ON_REMOVE (1 << 5)
68#define DIFF_OPT_FIND_COPIES_HARDER (1 << 6)
69#define DIFF_OPT_FOLLOW_RENAMES (1 << 7)
Jeff King90d43b02012-03-22 22:52:13[diff] [blame]70#define DIFF_OPT_RENAME_EMPTY (1 << 8)
Thomas Rast882749a2010-04-14 15:59:06[diff] [blame]71/* (1 << 9) unused */
Pierre Habouzit8f67f8a2007-11-10 19:05:14[diff] [blame]72#define DIFF_OPT_HAS_CHANGES (1 << 10)
Junio C Hamano90b19942009-05-23 08:15:35[diff] [blame]73#define DIFF_OPT_QUICK (1 << 11)
Pierre Habouzit8f67f8a2007-11-10 19:05:14[diff] [blame]74#define DIFF_OPT_NO_INDEX (1 << 12)
75#define DIFF_OPT_ALLOW_EXTERNAL (1 << 13)
76#define DIFF_OPT_EXIT_WITH_STATUS (1 << 14)
77#define DIFF_OPT_REVERSE_DIFF (1 << 15)
Wincent Colaiuta62c64892007-12-13 20:24:52[diff] [blame]78#define DIFF_OPT_CHECK_FAILED (1 << 16)
Junio C Hamanocd676a52008-02-12 22:26:02[diff] [blame]79#define DIFF_OPT_RELATIVE_NAME (1 << 17)
Johannes Schindelin50fd9bd2008-05-14 17:03:31[diff] [blame]80#define DIFF_OPT_IGNORE_SUBMODULES (1 << 18)
Junio C Hamanof88d2252008-09-03 00:28:59[diff] [blame]81#define DIFF_OPT_DIRSTAT_CUMULATIVE (1 << 19)
Heikki Orsilafd337772008-09-05 19:27:35[diff] [blame]82#define DIFF_OPT_DIRSTAT_BY_FILE (1 << 20)
Jeff Kingc7534ef2008-10-26 04:45:55[diff] [blame]83#define DIFF_OPT_ALLOW_TEXTCONV (1 << 21)
Junio C Hamanof2451942009-05-22 19:45:29[diff] [blame]84#define DIFF_OPT_DIFF_FROM_CONTENTS (1 << 22)
Johannes Schindelin752c0c22009-10-19 12:38:32[diff] [blame]85#define DIFF_OPT_SUBMODULE_LOG (1 << 23)
Jens Lehmann9297f77e62010-03-08 12:53:19[diff] [blame]86#define DIFF_OPT_DIRTY_SUBMODULES (1 << 24)
Jens Lehmann3bfc4502010-03-13 22:00:27[diff] [blame]87#define DIFF_OPT_IGNORE_UNTRACKED_IN_SUBMODULES (1 << 25)
Junio C Hamano4af574d2010-06-27 19:07:44[diff] [blame]88#define DIFF_OPT_IGNORE_DIRTY_SUBMODULES (1 << 26)
Jens Lehmannaee9c7d2010-08-05 22:39:25[diff] [blame]89#define DIFF_OPT_OVERRIDE_SUBMODULE_CONFIG (1 << 27)
Johan Herland1c57a622011-04-29 09:36:21[diff] [blame]90#define DIFF_OPT_DIRSTAT_BY_LINE (1 << 28)
René Scharfe14937c22011-10-09 11:36:57[diff] [blame]91#define DIFF_OPT_FUNCCONTEXT (1 << 29)
Junio C Hamanoaccccde2012-02-21 09:02:46[diff] [blame]92#define DIFF_OPT_PICKAXE_IGNORE_CASE (1 << 30)
Johannes Schindelin752c0c22009-10-19 12:38:32[diff] [blame]93
Pierre Habouzit8f67f8a2007-11-10 19:05:14[diff] [blame]94#define DIFF_OPT_TST(opts, flag) ((opts)->flags & DIFF_OPT_##flag)
Junio C Hamano6c374002013-05-10 15:10:11[diff] [blame]95#define DIFF_OPT_TOUCHED(opts, flag) ((opts)->touched_flags & DIFF_OPT_##flag)
96#define DIFF_OPT_SET(opts, flag) (((opts)->flags |= DIFF_OPT_##flag),((opts)->touched_flags |= DIFF_OPT_##flag))
97#define DIFF_OPT_CLR(opts, flag) (((opts)->flags &= ~DIFF_OPT_##flag),((opts)->touched_flags |= DIFF_OPT_##flag))
Keith Cascio628d5c22009-02-17 03:26:49[diff] [blame]98#define DIFF_XDL_TST(opts, flag) ((opts)->xdl_opts & XDF_##flag)
99#define DIFF_XDL_SET(opts, flag) ((opts)->xdl_opts |= XDF_##flag)
100#define DIFF_XDL_CLR(opts, flag) ((opts)->xdl_opts &= ~XDF_##flag)
Pierre Habouzit8f67f8a2007-11-10 19:05:14[diff] [blame]101
Junio C Hamano307ab202012-02-19 23:36:55[diff] [blame]102#define DIFF_WITH_ALG(opts, flag) (((opts)->xdl_opts & ~XDF_DIFF_ALGORITHM_MASK) | XDF_##flag)
103
Thomas Rast882749a2010-04-14 15:59:06[diff] [blame]104enum diff_words_type {
105 DIFF_WORDS_NONE = 0,
106 DIFF_WORDS_PORCELAIN,
107 DIFF_WORDS_PLAIN,
108 DIFF_WORDS_COLOR
109};
110
Junio C Hamano6b5ee132005-09-21 07:00:47[diff] [blame]111struct diff_options {
Junio C Hamano6b5ee132005-09-21 07:00:47[diff] [blame]112 const char *orderfile;
113 const char *pickaxe;
Junio C Hamano2f3f8b22006-11-02 08:02:11[diff] [blame]114 const char *single_follow;
Johannes Schindelineab9a402007-12-18 19:32:14[diff] [blame]115 const char *a_prefix, *b_prefix;
Pierre Habouzit8f67f8a2007-11-10 19:05:14[diff] [blame]116 unsigned flags;
Junio C Hamano6c374002013-05-10 15:10:11[diff] [blame]117 unsigned touched_flags;
Junio C Hamano1ecc1cb2013-07-17 22:05:46[diff] [blame]118
119 /* diff-filter bits */
120 unsigned int filter;
121
Jeff Kingf1c96262011-08-18 05:03:12[diff] [blame]122 int use_color;
Linus Torvaldsee1e5412006-05-13 20:23:48[diff] [blame]123 int context;
René Scharfe6d0e6742008-12-28 18:45:32[diff] [blame]124 int interhunkcontext;
Junio C Hamano6b5ee132005-09-21 07:00:47[diff] [blame]125 int break_opt;
126 int detect_rename;
Junio C Hamano467ddc12011-03-01 00:11:55[diff] [blame]127 int irreversible_delete;
Junio C Hamanofb132272007-08-03 20:33:31[diff] [blame]128 int skip_stat_unmatch;
Junio C Hamano6b5ee132005-09-21 07:00:47[diff] [blame]129 int line_termination;
130 int output_format;
131 int pickaxe_opts;
132 int rename_score;
Junio C Hamano8082d8d2005-09-21 07:18:27[diff] [blame]133 int rename_limit;
Jeff Kingbf0ab102011-02-19 10:20:51[diff] [blame]134 int needed_rename_limit;
Junio C Hamanof31027c2011-01-06 21:50:06[diff] [blame]135 int degraded_cc_to_c;
Jeff King3ac942d2011-02-20 09:51:16[diff] [blame]136 int show_rename_progress;
Johan Herland712d2c72011-04-29 09:36:20[diff] [blame]137 int dirstat_permille;
Junio C Hamano6b5ee132005-09-21 07:00:47[diff] [blame]138 int setup;
Junio C Hamano47dd0d52005-12-14 01:21:41[diff] [blame]139 int abbrev;
Junio C Hamanocd676a52008-02-12 22:26:02[diff] [blame]140 const char *prefix;
141 int prefix_length;
Johannes Schindelin698ce6f2006-05-20 13:40:29[diff] [blame]142 const char *stat_sep;
Johannes Schindelin0d21efa2006-06-14 15:40:23[diff] [blame]143 long xdl_opts;
Linus Torvaldsac1b3d12005-10-21 04:05:05[diff] [blame]144
Junio C Hamanoa2540022006-09-27 01:53:02[diff] [blame]145 int stat_width;
146 int stat_name_width;
Zbigniew Jędrzejewski-Szmek969fe572012-03-01 12:26:45[diff] [blame]147 int stat_graph_width;
Michael J Gruber808e1db2011-05-27 12:36:41[diff] [blame]148 int stat_count;
Johannes Schindelin2b6a5412009-01-17 16:29:45[diff] [blame]149 const char *word_regex;
Thomas Rast882749a2010-04-14 15:59:06[diff] [blame]150 enum diff_words_type word_diff;
Junio C Hamanoa2540022006-09-27 01:53:02[diff] [blame]151
Johannes Schindelin34a5e1a2007-02-25 22:34:54[diff] [blame]152 /* this is set by diffcore for DIFF_FORMAT_PATCH */
153 int found_changes;
154
Junio C Hamano44c48a92010-08-13 19:17:45[diff] [blame]155 /* to support internal diff recursion by --follow hack*/
156 int found_follow;
157
Junio C Hamano6c374002013-05-10 15:10:11[diff] [blame]158 void (*set_default)(struct diff_options *);
159
Daniel Barkalowc0c77732008-03-10 02:43:39[diff] [blame]160 FILE *file;
161 int close_file;
162
Nguyễn Thái Ngọc Duy66f13622010-12-15 15:02:38[diff] [blame]163 struct pathspec pathspec;
Kirill Smelkov72441af2014-04-06 21:46:26[diff] [blame]164 pathchange_fn_t pathchange;
Linus Torvaldsac1b3d12005-10-21 04:05:05[diff] [blame]165 change_fn_t change;
166 add_remove_fn_t add_remove;
Jeff King04245582006-09-07 06:35:42[diff] [blame]167 diff_format_fn_t format_callback;
168 void *format_callback_data;
Bo Yanga3c158d2010-05-26 07:08:02[diff] [blame]169 diff_prefix_fn_t output_prefix;
Lucian Poston5e71a842012-04-16 10:44:50[diff] [blame]170 int output_prefix_length;
Bo Yanga3c158d2010-05-26 07:08:02[diff] [blame]171 void *output_prefix_data;
Zoltan Klingeree7fb0b2013-12-05 23:38:46[diff] [blame]172
173 int diff_path_counter;
Junio C Hamano6b5ee132005-09-21 07:00:47[diff] [blame]174};
175
Jeff Kingce436972006-07-23 09:24:18[diff] [blame]176enum color_diff {
177 DIFF_RESET = 0,
178 DIFF_PLAIN = 1,
179 DIFF_METAINFO = 2,
180 DIFF_FRAGINFO = 3,
181 DIFF_FILE_OLD = 4,
182 DIFF_FILE_NEW = 5,
183 DIFF_COMMIT = 6,
Junio C Hamano448c3ef2006-09-23 05:48:39[diff] [blame]184 DIFF_WHITESPACE = 7,
Gary V. Vaughan4b055482010-05-14 09:31:35[diff] [blame]185 DIFF_FUNCINFO = 8
Jeff Kingce436972006-07-23 09:24:18[diff] [blame]186};
187const char *diff_get_color(int diff_use_color, enum color_diff ix);
Pierre Habouzit8f67f8a2007-11-10 19:05:14[diff] [blame]188#define diff_get_color_opt(o, ix) \
Jeff Kingf1c96262011-08-18 05:03:12[diff] [blame]189 diff_get_color((o)->use_color, ix)
Pierre Habouzit8f67f8a2007-11-10 19:05:14[diff] [blame]190
Jeff Kingce436972006-07-23 09:24:18[diff] [blame]191
John Keepingf1922232013-02-07 20:15:26[diff] [blame]192const char *diff_line_prefix(struct diff_options *);
193
194
Johannes Schindelin698ce6f2006-05-20 13:40:29[diff] [blame]195extern const char mime_boundary_leader[];
196
Kirill Smelkov72441af2014-04-06 21:46:26[diff] [blame]197extern struct combine_diff_path *diff_tree_paths(
198 struct combine_diff_path *p, const unsigned char *sha1,
199 const unsigned char **parent_sha1, int nparent,
200 struct strbuf *base, struct diff_options *opt);
Linus Torvaldsac1b3d12005-10-21 04:05:05[diff] [blame]201extern int diff_tree_sha1(const unsigned char *old, const unsigned char *new,
202 const char *base, struct diff_options *opt);
Rene Scharfe2b603562006-10-26 16:52:39[diff] [blame]203extern int diff_root_tree_sha1(const unsigned char *new, const char *base,
204 struct diff_options *opt);
Linus Torvaldsac1b3d12005-10-21 04:05:05[diff] [blame]205
Junio C Hamanoea726d02006-01-28 08:03:38[diff] [blame]206struct combine_diff_path {
207 struct combine_diff_path *next;
Junio C Hamanoea726d02006-01-28 08:03:38[diff] [blame]208 char *path;
Junio C Hamano2454c962006-02-06 20:53:07[diff] [blame]209 unsigned int mode;
Junio C Hamanoea726d02006-01-28 08:03:38[diff] [blame]210 unsigned char sha1[20];
Junio C Hamano2454c962006-02-06 20:53:07[diff] [blame]211 struct combine_diff_parent {
Junio C Hamanod416df82006-02-10 10:30:52[diff] [blame]212 char status;
Junio C Hamano2454c962006-02-06 20:53:07[diff] [blame]213 unsigned int mode;
214 unsigned char sha1[20];
215 } parent[FLEX_ARRAY];
Junio C Hamanoea726d02006-01-28 08:03:38[diff] [blame]216};
Junio C Hamano2454c962006-02-06 20:53:07[diff] [blame]217#define combine_diff_path_size(n, l) \
218 (sizeof(struct combine_diff_path) + \
219 sizeof(struct combine_diff_parent) * (n) + (l) + 1)
Junio C Hamanoea726d02006-01-28 08:03:38[diff] [blame]220
Linus Torvalds91539832006-04-17 18:59:32[diff] [blame]221extern void show_combined_diff(struct combine_diff_path *elem, int num_parent,
222 int dense, struct rev_info *);
Junio C Hamanoea726d02006-01-28 08:03:38[diff] [blame]223
René Scharfe0041f092011-12-17 10:15:48[diff] [blame]224extern void diff_tree_combined(const unsigned char *sha1, const struct sha1_array *parents, int dense, struct rev_info *rev);
Junio C Hamano0fe7c1d2006-04-29 08:24:49[diff] [blame]225
René Scharfe82889292011-12-17 10:20:07[diff] [blame]226extern void diff_tree_combined_merge(const struct commit *commit, int dense, struct rev_info *rev);
Junio C Hamanoaf3feef2006-01-24 09:22:04[diff] [blame]227
Junio C Hamanoa5a818e2008-08-19 03:08:09[diff] [blame]228void diff_set_mnemonic_prefix(struct diff_options *options, const char *a, const char *b);
229
Junio C Hamano28b92642011-05-31 16:14:17[diff] [blame]230extern int diff_can_quit_early(struct diff_options *);
231
Junio C Hamano6b5ee132005-09-21 07:00:47[diff] [blame]232extern void diff_addremove(struct diff_options *,
233 int addremove,
Junio C Hamano77eb2722005-04-27 16:21:00[diff] [blame]234 unsigned mode,
235 const unsigned char *sha1,
Jeff Kinge5450102012-07-28 15:03:01[diff] [blame]236 int sha1_valid,
Jens Lehmanne3d42c42010-01-18 20:26:18[diff] [blame]237 const char *fullpath, unsigned dirty_submodule);
Junio C Hamano77eb2722005-04-27 16:21:00[diff] [blame]238
Junio C Hamano6b5ee132005-09-21 07:00:47[diff] [blame]239extern void diff_change(struct diff_options *,
240 unsigned mode1, unsigned mode2,
241 const unsigned char *sha1,
242 const unsigned char *sha2,
Jeff Kinge5450102012-07-28 15:03:01[diff] [blame]243 int sha1_valid,
244 int sha2_valid,
Jens Lehmanne3d42c42010-01-18 20:26:18[diff] [blame]245 const char *fullpath,
246 unsigned dirty_submodule1, unsigned dirty_submodule2);
Junio C Hamano77eb2722005-04-27 16:21:00[diff] [blame]247
Junio C Hamanofa7b2902011-04-22 23:05:58[diff] [blame]248extern struct diff_filepair *diff_unmerge(struct diff_options *, const char *path);
Junio C Hamano77eb2722005-04-27 16:21:00[diff] [blame]249
Junio C Hamano19feebc2005-05-27 22:54:37[diff] [blame]250#define DIFF_SETUP_REVERSE 1
Junio C Hamanof0c6b2a2005-05-27 22:56:38[diff] [blame]251#define DIFF_SETUP_USE_CACHE 2
252#define DIFF_SETUP_USE_SIZE_CACHE 4
Junio C Hamanoce240672005-06-03 08:36:43[diff] [blame]253
Matthieu Moydea007f2010-08-05 08:22:52[diff] [blame]254/*
Nicolas Vigierb0d12fc2013-10-31 11:08:28[diff] [blame]255 * Poor man's alternative to parse-option, to allow both stuck form
Matthieu Moydea007f2010-08-05 08:22:52[diff] [blame]256 * (--option=value) and separate form (--option value).
257 */
258extern int parse_long_opt(const char *opt, const char **argv,
259 const char **optarg);
260
Johannes Schindelinef90d6d2008-05-14 17:46:53[diff] [blame]261extern int git_diff_basic_config(const char *var, const char *value, void *cb);
262extern int git_diff_ui_config(const char *var, const char *value, void *cb);
Junio C Hamano6b5ee132005-09-21 07:00:47[diff] [blame]263extern void diff_setup(struct diff_options *);
264extern int diff_opt_parse(struct diff_options *, const char **, int);
Thomas Rast28452652012-08-03 12:16:24[diff] [blame]265extern void diff_setup_done(struct diff_options *);
Junio C Hamano86436c22005-04-26 01:22:47[diff] [blame]266
Junio C Hamano6b14d7f2005-05-22 17:04:37[diff] [blame]267#define DIFF_DETECT_RENAME 1
268#define DIFF_DETECT_COPY 2
269
Junio C Hamano367cec12005-05-27 22:55:28[diff] [blame]270#define DIFF_PICKAXE_ALL 1
Petr Baudisd01d8c62006-03-29 00:16:33[diff] [blame]271#define DIFF_PICKAXE_REGEX 2
Junio C Hamanof345b0a2005-05-30 07:08:37[diff] [blame]272
Junio C Hamanof506b8e2010-08-23 17:17:03[diff] [blame]273#define DIFF_PICKAXE_KIND_S 4 /* traditional plumbing counter */
274#define DIFF_PICKAXE_KIND_G 8 /* grep in the patch */
275
Junio C Hamano6b5ee132005-09-21 07:00:47[diff] [blame]276extern void diffcore_std(struct diff_options *);
Junio C Hamano730f7282009-09-20 07:03:39[diff] [blame]277extern void diffcore_fix_diff_index(struct diff_options *);
Junio C Hamanof2ce9fd2005-06-12 03:57:13[diff] [blame]278
Junio C Hamanodda2d792005-07-13 19:52:35[diff] [blame]279#define COMMON_DIFF_OPTIONS_HELP \
280"\ncommon diff options:\n" \
Junio C Hamano8082d8d2005-09-21 07:18:27[diff] [blame]281" -z output diff-raw with lines terminated with NUL.\n" \
282" -p output patch format.\n" \
283" -u synonym for -p.\n" \
Petr Baudis5c91da22006-04-11 11:22:17[diff] [blame]284" --patch-with-raw\n" \
285" output both a patch and the diff-raw format.\n" \
Johannes Schindelind75f7952006-04-13 22:15:30[diff] [blame]286" --stat show diffstat instead of patch.\n" \
Junio C Hamano74e2abe2006-10-12 10:01:00[diff] [blame]287" --numstat show numeric diffstat instead of patch.\n" \
Johannes Schindelin29353272006-04-15 11:41:18[diff] [blame]288" --patch-with-stat\n" \
289" output a patch and prepend its diffstat.\n" \
Junio C Hamano8082d8d2005-09-21 07:18:27[diff] [blame]290" --name-only show only names of changed files.\n" \
Junio C Hamano946f5f72005-09-21 07:20:06[diff] [blame]291" --name-status show names and status of changed files.\n" \
Junio C Hamano47dd0d52005-12-14 01:21:41[diff] [blame]292" --full-index show full object name on index lines.\n" \
Junio C Hamano913419f2005-12-18 10:03:15[diff] [blame]293" --abbrev=<n> abbreviate object names in diff-tree header and diff-raw.\n" \
Junio C Hamano8082d8d2005-09-21 07:18:27[diff] [blame]294" -R swap input file pairs.\n" \
295" -B detect complete rewrites.\n" \
296" -M detect renames.\n" \
297" -C detect copies.\n" \
Junio C Hamanodda2d792005-07-13 19:52:35[diff] [blame]298" --find-copies-harder\n" \
Junio C Hamano8082d8d2005-09-21 07:18:27[diff] [blame]299" try unchanged files as candidate for copy detection.\n" \
300" -l<n> limit rename attempts up to <n> paths.\n" \
301" -O<file> reorder diffs according to the <file>.\n" \
302" -S<string> find filepair whose only one side contains the string.\n" \
Junio C Hamanodda2d792005-07-13 19:52:35[diff] [blame]303" --pickaxe-all\n" \
Stephan Federca499202006-07-07 13:57:08[diff] [blame]304" show all files diff when -S is used and hit is found.\n" \
305" -a --text treat all files as text.\n"
Junio C Hamanodda2d792005-07-13 19:52:35[diff] [blame]306
Junio C Hamano38c6f782005-05-22 02:40:36[diff] [blame]307extern int diff_queue_is_empty(void);
Junio C Hamano6b5ee132005-09-21 07:00:47[diff] [blame]308extern void diff_flush(struct diff_options*);
Junio C Hamanof31027c2011-01-06 21:50:06[diff] [blame]309extern void diff_warn_rename_limit(const char *varname, int needed, int degraded_cc);
Junio C Hamano86436c22005-04-26 01:22:47[diff] [blame]310
Junio C Hamanoe7baa4f2005-07-25 20:05:44[diff] [blame]311/* diff-raw status letters */
Junio C Hamanoca8c9152005-07-25 21:31:19[diff] [blame]312#define DIFF_STATUS_ADDED 'A'
Junio C Hamanoe7baa4f2005-07-25 20:05:44[diff] [blame]313#define DIFF_STATUS_COPIED 'C'
314#define DIFF_STATUS_DELETED 'D'
315#define DIFF_STATUS_MODIFIED 'M'
316#define DIFF_STATUS_RENAMED 'R'
317#define DIFF_STATUS_TYPE_CHANGED 'T'
318#define DIFF_STATUS_UNKNOWN 'X'
319#define DIFF_STATUS_UNMERGED 'U'
320
321/* these are not diff-raw status letters proper, but used by
322 * diffcore-filter insn to specify additional restrictions.
323 */
Junio C Hamano0b343792005-10-05 00:44:17[diff] [blame]324#define DIFF_STATUS_FILTER_AON '*'
Junio C Hamanoe7baa4f2005-07-25 20:05:44[diff] [blame]325#define DIFF_STATUS_FILTER_BROKEN 'B'
326
Junio C Hamano47dd0d52005-12-14 01:21:41[diff] [blame]327extern const char *diff_unique_abbrev(const unsigned char *, int);
328
Junio C Hamano4bd5b7d2007-11-10 08:15:03[diff] [blame]329/* do not report anything on removed paths */
330#define DIFF_SILENT_ON_REMOVED 01
Junio C Hamanofb63d7f2007-11-10 02:22:52[diff] [blame]331/* report racily-clean paths as modified */
332#define DIFF_RACY_IS_MODIFIED 02
Junio C Hamano4bd5b7d2007-11-10 08:15:03[diff] [blame]333extern int run_diff_files(struct rev_info *revs, unsigned int option);
Junio C Hamano5c21ac02006-04-22 10:58:04[diff] [blame]334extern int run_diff_index(struct rev_info *revs, int cached);
Junio C Hamanoe09ad6e2006-04-22 09:43:00[diff] [blame]335
Junio C Hamano1cfe7732007-01-30 09:11:08[diff] [blame]336extern int do_diff_cache(const unsigned char *, struct diff_options *);
Johannes Schindelinfcb3d0a2006-06-25 01:51:08[diff] [blame]337extern int diff_flush_patch_id(struct diff_options *, unsigned char *);
338
Junio C Hamanoda31b352007-12-14 07:40:27[diff] [blame]339extern int diff_result_code(struct diff_options *, int);
340
Thomas Gummerer470faf92013-12-11 09:58:42[diff] [blame]341extern void diff_no_index(struct rev_info *, int, const char **, const char *);
Junio C Hamano0569e9b2008-05-24 05:28:56[diff] [blame]342
Stephan Beyer75f3ff22009-02-10 14:30:35[diff] [blame]343extern int index_differs_from(const char *def, int diff_flags);
344
Axel Bonneta788d7d2010-06-07 15:23:36[diff] [blame]345extern size_t fill_textconv(struct userdiff_driver *driver,
346 struct diff_filespec *df,
347 char **outbuf);
348
349extern struct userdiff_driver *get_textconv(struct diff_filespec *one);
350
Kevin Ballard10ae7522010-09-27 23:58:25[diff] [blame]351extern int parse_rename_score(const char **cp_p);
352
Michal Privoznik07924d42013-01-16 07:51:58[diff] [blame]353extern long parse_algorithm_value(const char *value);
354
Nguyễn Thái Ngọc Duy7f814632012-02-01 12:55:07[diff] [blame]355extern int print_stat_summary(FILE *fp, int files,
356 int insertions, int deletions);
Nguyễn Thái Ngọc Duy4914c962012-10-26 15:53:52[diff] [blame]357extern void setup_diff_pager(struct diff_options *);
Nguyễn Thái Ngọc Duy7f814632012-02-01 12:55:07[diff] [blame]358
Junio C Hamano86436c22005-04-26 01:22:47[diff] [blame]359#endif /* DIFF_H */