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