blob: 007a0554d4b252e83e98f5578758d51ec0c6e120 [file] [log] [blame]
Junio C Hamanobe3cfa82005-04-26 09:25:05 -07001/*
2 * Copyright (C) 2005 Junio C Hamano
3 */
Junio C Hamano86436c22005-04-25 18:22:47 -07004#ifndef DIFF_H
5#define DIFF_H
6
Junio C Hamano1b0c7172006-03-29 22:55:43 -08007#include "tree-walk.h"
Linus Torvalds50f9a852006-01-31 14:10:56 -08008
Linus Torvalds91539832006-04-17 11:59:32 -07009struct rev_info;
Linus Torvaldsac1b3d12005-10-20 21:05:05 -070010struct diff_options;
Jeff King04245582006-09-07 02:35:42 -040011struct diff_queue_struct;
Bo Yanga3c158d2010-05-26 15:08:02 +080012struct strbuf;
Axel Bonneta788d7d2010-06-07 17:23:36 +020013struct diff_filespec;
14struct userdiff_driver;
Linus Torvaldsac1b3d12005-10-20 21:05:05 -070015
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 21:26:18 +010020 const char *fullpath,
21 unsigned old_dirty_submodule, unsigned new_dirty_submodule);
Linus Torvaldsac1b3d12005-10-20 21:05:05 -070022
23typedef void (*add_remove_fn_t)(struct diff_options *options,
24 int addremove, unsigned mode,
25 const unsigned char *sha1,
Jens Lehmanne3d42c42010-01-18 21:26:18 +010026 const char *fullpath, unsigned dirty_submodule);
Linus Torvaldsac1b3d12005-10-20 21:05:05 -070027
Jeff King04245582006-09-07 02:35:42 -040028typedef void (*diff_format_fn_t)(struct diff_queue_struct *q,
29 struct diff_options *options, void *data);
30
Bo Yanga3c158d2010-05-26 15:08:02 +080031typedef struct strbuf *(*diff_prefix_fn_t)(struct diff_options *opt, void *data);
32
Timo Hirvonenc6744342006-06-24 20:21:53 +030033#define DIFF_FORMAT_RAW 0x0001
34#define DIFF_FORMAT_DIFFSTAT 0x0002
Junio C Hamano74e2abe2006-10-12 03:01:00 -070035#define DIFF_FORMAT_NUMSTAT 0x0004
36#define DIFF_FORMAT_SUMMARY 0x0008
37#define DIFF_FORMAT_PATCH 0x0010
Nicolas Pitreebd124c2006-12-14 23:15:44 -050038#define DIFF_FORMAT_SHORTSTAT 0x0020
Linus Torvalds7df7c012008-02-12 13:26:31 -080039#define DIFF_FORMAT_DIRSTAT 0x0040
Timo Hirvonenc6744342006-06-24 20:21:53 +030040
41/* These override all above */
Junio C Hamano74e2abe2006-10-12 03:01:00 -070042#define DIFF_FORMAT_NAME 0x0100
43#define DIFF_FORMAT_NAME_STATUS 0x0200
44#define DIFF_FORMAT_CHECKDIFF 0x0400
Timo Hirvonenc6744342006-06-24 20:21:53 +030045
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 03:01:00 -070049#define DIFF_FORMAT_NO_OUTPUT 0x0800
Timo Hirvonenc6744342006-06-24 20:21:53 +030050
Junio C Hamano74e2abe2006-10-12 03:01:00 -070051#define DIFF_FORMAT_CALLBACK 0x1000
Jeff King04245582006-09-07 02:35:42 -040052
Pierre Habouzit8f67f8a2007-11-10 20:05:14 +010053#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)
61#define DIFF_OPT_COLOR_DIFF (1 << 8)
Thomas Rast882749a2010-04-14 17:59:06 +020062/* (1 << 9) unused */
Pierre Habouzit8f67f8a2007-11-10 20:05:14 +010063#define DIFF_OPT_HAS_CHANGES (1 << 10)
Junio C Hamano90b19942009-05-23 01:15:35 -070064#define DIFF_OPT_QUICK (1 << 11)
Pierre Habouzit8f67f8a2007-11-10 20:05:14 +010065#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 21:24:52 +010069#define DIFF_OPT_CHECK_FAILED (1 << 16)
Junio C Hamanocd676a52008-02-12 14:26:02 -080070#define DIFF_OPT_RELATIVE_NAME (1 << 17)
Johannes Schindelin50fd9bd2008-05-14 18:03:31 +010071#define DIFF_OPT_IGNORE_SUBMODULES (1 << 18)
Junio C Hamanof88d2252008-09-02 17:28:59 -070072#define DIFF_OPT_DIRSTAT_CUMULATIVE (1 << 19)
Heikki Orsilafd337772008-09-05 22:27:35 +030073#define DIFF_OPT_DIRSTAT_BY_FILE (1 << 20)
Jeff Kingc7534ef2008-10-26 00:45:55 -040074#define DIFF_OPT_ALLOW_TEXTCONV (1 << 21)
Junio C Hamanof2451942009-05-22 12:45:29 -070075#define DIFF_OPT_DIFF_FROM_CONTENTS (1 << 22)
Johannes Schindelin752c0c22009-10-19 14:38:32 +020076#define DIFF_OPT_SUBMODULE_LOG (1 << 23)
Jens Lehmann9297f77e62010-03-08 13:53:19 +010077#define DIFF_OPT_DIRTY_SUBMODULES (1 << 24)
Jens Lehmann3bfc4502010-03-13 23:00:27 +010078#define DIFF_OPT_IGNORE_UNTRACKED_IN_SUBMODULES (1 << 25)
Junio C Hamano4af574d2010-06-27 12:07:44 -070079#define DIFF_OPT_IGNORE_DIRTY_SUBMODULES (1 << 26)
Jens Lehmannaee9c7d2010-08-06 00:39:25 +020080#define DIFF_OPT_OVERRIDE_SUBMODULE_CONFIG (1 << 27)
Johannes Schindelin752c0c22009-10-19 14:38:32 +020081
Pierre Habouzit8f67f8a2007-11-10 20:05:14 +010082#define DIFF_OPT_TST(opts, flag) ((opts)->flags & DIFF_OPT_##flag)
83#define DIFF_OPT_SET(opts, flag) ((opts)->flags |= DIFF_OPT_##flag)
84#define DIFF_OPT_CLR(opts, flag) ((opts)->flags &= ~DIFF_OPT_##flag)
Keith Cascio628d5c22009-02-16 19:26:49 -080085#define DIFF_XDL_TST(opts, flag) ((opts)->xdl_opts & XDF_##flag)
86#define DIFF_XDL_SET(opts, flag) ((opts)->xdl_opts |= XDF_##flag)
87#define DIFF_XDL_CLR(opts, flag) ((opts)->xdl_opts &= ~XDF_##flag)
Pierre Habouzit8f67f8a2007-11-10 20:05:14 +010088
Thomas Rast882749a2010-04-14 17:59:06 +020089enum diff_words_type {
90 DIFF_WORDS_NONE = 0,
91 DIFF_WORDS_PORCELAIN,
92 DIFF_WORDS_PLAIN,
93 DIFF_WORDS_COLOR
94};
95
Junio C Hamano6b5ee132005-09-21 00:00:47 -070096struct diff_options {
Junio C Hamano6b5ee132005-09-21 00:00:47 -070097 const char *filter;
98 const char *orderfile;
99 const char *pickaxe;
Junio C Hamano2f3f8b22006-11-02 00:02:11 -0800100 const char *single_follow;
Johannes Schindelineab9a402007-12-18 19:32:14 +0000101 const char *a_prefix, *b_prefix;
Pierre Habouzit8f67f8a2007-11-10 20:05:14 +0100102 unsigned flags;
Linus Torvaldsee1e5412006-05-13 13:23:48 -0700103 int context;
René Scharfe6d0e6742008-12-28 19:45:32 +0100104 int interhunkcontext;
Junio C Hamano6b5ee132005-09-21 00:00:47 -0700105 int break_opt;
106 int detect_rename;
Junio C Hamanofb132272007-08-03 13:33:31 -0700107 int skip_stat_unmatch;
Junio C Hamano6b5ee132005-09-21 00:00:47 -0700108 int line_termination;
109 int output_format;
110 int pickaxe_opts;
111 int rename_score;
Junio C Hamano8082d8d2005-09-21 00:18:27 -0700112 int rename_limit;
Jeff Kingbf0ab102011-02-19 05:20:51 -0500113 int needed_rename_limit;
Jeff King3ac942d2011-02-20 04:51:16 -0500114 int show_rename_progress;
Linus Torvalds7df7c012008-02-12 13:26:31 -0800115 int dirstat_percent;
Junio C Hamano6b5ee132005-09-21 00:00:47 -0700116 int setup;
Junio C Hamano47dd0d52005-12-13 17:21:41 -0800117 int abbrev;
Junio C Hamanocd676a52008-02-12 14:26:02 -0800118 const char *prefix;
119 int prefix_length;
Johannes Schindelin698ce6f2006-05-20 15:40:29 +0200120 const char *stat_sep;
Johannes Schindelin0d21efa2006-06-14 17:40:23 +0200121 long xdl_opts;
Linus Torvaldsac1b3d12005-10-20 21:05:05 -0700122
Junio C Hamanoa2540022006-09-26 18:53:02 -0700123 int stat_width;
124 int stat_name_width;
Johannes Schindelin2b6a5412009-01-17 17:29:45 +0100125 const char *word_regex;
Thomas Rast882749a2010-04-14 17:59:06 +0200126 enum diff_words_type word_diff;
Junio C Hamanoa2540022006-09-26 18:53:02 -0700127
Johannes Schindelin34a5e1a2007-02-25 23:34:54 +0100128 /* this is set by diffcore for DIFF_FORMAT_PATCH */
129 int found_changes;
130
Junio C Hamano44c48a92010-08-13 12:17:45 -0700131 /* to support internal diff recursion by --follow hack*/
132 int found_follow;
133
Daniel Barkalowc0c77732008-03-09 22:43:39 -0400134 FILE *file;
135 int close_file;
136
Nguyễn Thái Ngọc Duy66f13622010-12-15 22:02:38 +0700137 struct pathspec pathspec;
Linus Torvaldsac1b3d12005-10-20 21:05:05 -0700138 change_fn_t change;
139 add_remove_fn_t add_remove;
Jeff King04245582006-09-07 02:35:42 -0400140 diff_format_fn_t format_callback;
141 void *format_callback_data;
Bo Yanga3c158d2010-05-26 15:08:02 +0800142 diff_prefix_fn_t output_prefix;
143 void *output_prefix_data;
Junio C Hamano6b5ee132005-09-21 00:00:47 -0700144};
145
Jeff Kingce436972006-07-23 05:24:18 -0400146enum color_diff {
147 DIFF_RESET = 0,
148 DIFF_PLAIN = 1,
149 DIFF_METAINFO = 2,
150 DIFF_FRAGINFO = 3,
151 DIFF_FILE_OLD = 4,
152 DIFF_FILE_NEW = 5,
153 DIFF_COMMIT = 6,
Junio C Hamano448c3ef2006-09-22 22:48:39 -0700154 DIFF_WHITESPACE = 7,
Gary V. Vaughan4b055482010-05-14 09:31:35 +0000155 DIFF_FUNCINFO = 8
Jeff Kingce436972006-07-23 05:24:18 -0400156};
157const char *diff_get_color(int diff_use_color, enum color_diff ix);
Pierre Habouzit8f67f8a2007-11-10 20:05:14 +0100158#define diff_get_color_opt(o, ix) \
159 diff_get_color(DIFF_OPT_TST((o), COLOR_DIFF), ix)
160
Jeff Kingce436972006-07-23 05:24:18 -0400161
Johannes Schindelin698ce6f2006-05-20 15:40:29 +0200162extern const char mime_boundary_leader[];
163
Junio C Hamanoa8baa7b2006-04-10 16:39:11 -0700164extern void diff_tree_setup_paths(const char **paths, struct diff_options *);
165extern void diff_tree_release_paths(struct diff_options *);
Linus Torvaldsac1b3d12005-10-20 21:05:05 -0700166extern int diff_tree(struct tree_desc *t1, struct tree_desc *t2,
167 const char *base, struct diff_options *opt);
168extern int diff_tree_sha1(const unsigned char *old, const unsigned char *new,
169 const char *base, struct diff_options *opt);
Rene Scharfe2b603562006-10-26 18:52:39 +0200170extern int diff_root_tree_sha1(const unsigned char *new, const char *base,
171 struct diff_options *opt);
Linus Torvaldsac1b3d12005-10-20 21:05:05 -0700172
Junio C Hamanoea726d02006-01-28 00:03:38 -0800173struct combine_diff_path {
174 struct combine_diff_path *next;
175 int len;
176 char *path;
Junio C Hamano2454c962006-02-06 12:53:07 -0800177 unsigned int mode;
Junio C Hamanoea726d02006-01-28 00:03:38 -0800178 unsigned char sha1[20];
Junio C Hamano2454c962006-02-06 12:53:07 -0800179 struct combine_diff_parent {
Junio C Hamanod416df82006-02-10 02:30:52 -0800180 char status;
Junio C Hamano2454c962006-02-06 12:53:07 -0800181 unsigned int mode;
182 unsigned char sha1[20];
183 } parent[FLEX_ARRAY];
Junio C Hamanoea726d02006-01-28 00:03:38 -0800184};
Junio C Hamano2454c962006-02-06 12:53:07 -0800185#define combine_diff_path_size(n, l) \
186 (sizeof(struct combine_diff_path) + \
187 sizeof(struct combine_diff_parent) * (n) + (l) + 1)
Junio C Hamanoea726d02006-01-28 00:03:38 -0800188
Linus Torvalds91539832006-04-17 11:59:32 -0700189extern void show_combined_diff(struct combine_diff_path *elem, int num_parent,
190 int dense, struct rev_info *);
Junio C Hamanoea726d02006-01-28 00:03:38 -0800191
Junio C Hamano0fe7c1d2006-04-29 01:24:49 -0700192extern void diff_tree_combined(const unsigned char *sha1, const unsigned char parent[][20], int num_parent, int dense, struct rev_info *rev);
193
Linus Torvalds91539832006-04-17 11:59:32 -0700194extern void diff_tree_combined_merge(const unsigned char *sha1, int, struct rev_info *);
Junio C Hamanoaf3feef2006-01-24 01:22:04 -0800195
Junio C Hamanoa5a818e2008-08-18 20:08:09 -0700196void diff_set_mnemonic_prefix(struct diff_options *options, const char *a, const char *b);
197
Junio C Hamano6b5ee132005-09-21 00:00:47 -0700198extern void diff_addremove(struct diff_options *,
199 int addremove,
Junio C Hamano77eb2722005-04-27 09:21:00 -0700200 unsigned mode,
201 const unsigned char *sha1,
Jens Lehmanne3d42c42010-01-18 21:26:18 +0100202 const char *fullpath, unsigned dirty_submodule);
Junio C Hamano77eb2722005-04-27 09:21:00 -0700203
Junio C Hamano6b5ee132005-09-21 00:00:47 -0700204extern void diff_change(struct diff_options *,
205 unsigned mode1, unsigned mode2,
206 const unsigned char *sha1,
207 const unsigned char *sha2,
Jens Lehmanne3d42c42010-01-18 21:26:18 +0100208 const char *fullpath,
209 unsigned dirty_submodule1, unsigned dirty_submodule2);
Junio C Hamano77eb2722005-04-27 09:21:00 -0700210
Junio C Hamano6b5ee132005-09-21 00:00:47 -0700211extern void diff_unmerge(struct diff_options *,
Junio C Hamanoe9c84092007-01-05 01:25:18 -0800212 const char *path,
213 unsigned mode,
214 const unsigned char *sha1);
Junio C Hamano77eb2722005-04-27 09:21:00 -0700215
Junio C Hamano19feebc2005-05-27 15:54:37 -0700216#define DIFF_SETUP_REVERSE 1
Junio C Hamanof0c6b2a2005-05-27 15:56:38 -0700217#define DIFF_SETUP_USE_CACHE 2
218#define DIFF_SETUP_USE_SIZE_CACHE 4
Junio C Hamanoce240672005-06-03 01:36:43 -0700219
Matthieu Moydea007f2010-08-05 10:22:52 +0200220/*
221 * Poor man's alternative to parse-option, to allow both sticked form
222 * (--option=value) and separate form (--option value).
223 */
224extern int parse_long_opt(const char *opt, const char **argv,
225 const char **optarg);
226
Johannes Schindelinef90d6d2008-05-14 18:46:53 +0100227extern int git_diff_basic_config(const char *var, const char *value, void *cb);
228extern int git_diff_ui_config(const char *var, const char *value, void *cb);
Matthias Kestenholz6b2f2d92008-02-18 08:26:03 +0100229extern int diff_use_color_default;
Junio C Hamano6b5ee132005-09-21 00:00:47 -0700230extern void diff_setup(struct diff_options *);
231extern int diff_opt_parse(struct diff_options *, const char **, int);
232extern int diff_setup_done(struct diff_options *);
Junio C Hamano86436c22005-04-25 18:22:47 -0700233
Junio C Hamano6b14d7f2005-05-22 10:04:37 -0700234#define DIFF_DETECT_RENAME 1
235#define DIFF_DETECT_COPY 2
236
Junio C Hamano367cec12005-05-27 15:55:28 -0700237#define DIFF_PICKAXE_ALL 1
Petr Baudisd01d8c62006-03-29 02:16:33 +0200238#define DIFF_PICKAXE_REGEX 2
Junio C Hamanof345b0a2005-05-30 00:08:37 -0700239
Junio C Hamanof506b8e2010-08-23 10:17:03 -0700240#define DIFF_PICKAXE_KIND_S 4 /* traditional plumbing counter */
241#define DIFF_PICKAXE_KIND_G 8 /* grep in the patch */
242
Junio C Hamano6b5ee132005-09-21 00:00:47 -0700243extern void diffcore_std(struct diff_options *);
Junio C Hamano730f7282009-09-20 00:03:39 -0700244extern void diffcore_fix_diff_index(struct diff_options *);
Junio C Hamanof2ce9fd2005-06-11 20:57:13 -0700245
Junio C Hamanodda2d792005-07-13 12:52:35 -0700246#define COMMON_DIFF_OPTIONS_HELP \
247"\ncommon diff options:\n" \
Junio C Hamano8082d8d2005-09-21 00:18:27 -0700248" -z output diff-raw with lines terminated with NUL.\n" \
249" -p output patch format.\n" \
250" -u synonym for -p.\n" \
Petr Baudis5c91da22006-04-11 13:22:17 +0200251" --patch-with-raw\n" \
252" output both a patch and the diff-raw format.\n" \
Johannes Schindelind75f7952006-04-14 00:15:30 +0200253" --stat show diffstat instead of patch.\n" \
Junio C Hamano74e2abe2006-10-12 03:01:00 -0700254" --numstat show numeric diffstat instead of patch.\n" \
Johannes Schindelin29353272006-04-15 13:41:18 +0200255" --patch-with-stat\n" \
256" output a patch and prepend its diffstat.\n" \
Junio C Hamano8082d8d2005-09-21 00:18:27 -0700257" --name-only show only names of changed files.\n" \
Junio C Hamano946f5f72005-09-21 00:20:06 -0700258" --name-status show names and status of changed files.\n" \
Junio C Hamano47dd0d52005-12-13 17:21:41 -0800259" --full-index show full object name on index lines.\n" \
Junio C Hamano913419f2005-12-18 02:03:15 -0800260" --abbrev=<n> abbreviate object names in diff-tree header and diff-raw.\n" \
Junio C Hamano8082d8d2005-09-21 00:18:27 -0700261" -R swap input file pairs.\n" \
262" -B detect complete rewrites.\n" \
263" -M detect renames.\n" \
264" -C detect copies.\n" \
Junio C Hamanodda2d792005-07-13 12:52:35 -0700265" --find-copies-harder\n" \
Junio C Hamano8082d8d2005-09-21 00:18:27 -0700266" try unchanged files as candidate for copy detection.\n" \
267" -l<n> limit rename attempts up to <n> paths.\n" \
268" -O<file> reorder diffs according to the <file>.\n" \
269" -S<string> find filepair whose only one side contains the string.\n" \
Junio C Hamanodda2d792005-07-13 12:52:35 -0700270" --pickaxe-all\n" \
Stephan Federca499202006-07-07 15:57:08 +0200271" show all files diff when -S is used and hit is found.\n" \
272" -a --text treat all files as text.\n"
Junio C Hamanodda2d792005-07-13 12:52:35 -0700273
Junio C Hamano38c6f782005-05-21 19:40:36 -0700274extern int diff_queue_is_empty(void);
Junio C Hamano6b5ee132005-09-21 00:00:47 -0700275extern void diff_flush(struct diff_options*);
Junio C Hamano86436c22005-04-25 18:22:47 -0700276
Junio C Hamanoe7baa4f2005-07-25 13:05:44 -0700277/* diff-raw status letters */
Junio C Hamanoca8c9152005-07-25 14:31:19 -0700278#define DIFF_STATUS_ADDED 'A'
Junio C Hamanoe7baa4f2005-07-25 13:05:44 -0700279#define DIFF_STATUS_COPIED 'C'
280#define DIFF_STATUS_DELETED 'D'
281#define DIFF_STATUS_MODIFIED 'M'
282#define DIFF_STATUS_RENAMED 'R'
283#define DIFF_STATUS_TYPE_CHANGED 'T'
284#define DIFF_STATUS_UNKNOWN 'X'
285#define DIFF_STATUS_UNMERGED 'U'
286
287/* these are not diff-raw status letters proper, but used by
288 * diffcore-filter insn to specify additional restrictions.
289 */
Junio C Hamano0b343792005-10-04 17:44:17 -0700290#define DIFF_STATUS_FILTER_AON '*'
Junio C Hamanoe7baa4f2005-07-25 13:05:44 -0700291#define DIFF_STATUS_FILTER_BROKEN 'B'
292
Junio C Hamano47dd0d52005-12-13 17:21:41 -0800293extern const char *diff_unique_abbrev(const unsigned char *, int);
294
Junio C Hamano4bd5b7d2007-11-10 00:15:03 -0800295/* do not report anything on removed paths */
296#define DIFF_SILENT_ON_REMOVED 01
Junio C Hamanofb63d7f2007-11-09 18:22:52 -0800297/* report racily-clean paths as modified */
298#define DIFF_RACY_IS_MODIFIED 02
Junio C Hamano4bd5b7d2007-11-10 00:15:03 -0800299extern int run_diff_files(struct rev_info *revs, unsigned int option);
Junio C Hamano5c21ac02006-04-22 03:58:04 -0700300extern int run_diff_index(struct rev_info *revs, int cached);
Junio C Hamanoe09ad6e2006-04-22 02:43:00 -0700301
Junio C Hamano1cfe7732007-01-30 01:11:08 -0800302extern int do_diff_cache(const unsigned char *, struct diff_options *);
Johannes Schindelinfcb3d0a2006-06-25 03:51:08 +0200303extern int diff_flush_patch_id(struct diff_options *, unsigned char *);
304
Junio C Hamanoda31b352007-12-13 23:40:27 -0800305extern int diff_result_code(struct diff_options *, int);
306
Junio C Hamano0569e9b2008-05-23 22:28:56 -0700307extern void diff_no_index(struct rev_info *, int, const char **, int, const char *);
308
Stephan Beyer75f3ff22009-02-10 15:30:35 +0100309extern int index_differs_from(const char *def, int diff_flags);
310
Axel Bonneta788d7d2010-06-07 17:23:36 +0200311extern size_t fill_textconv(struct userdiff_driver *driver,
312 struct diff_filespec *df,
313 char **outbuf);
314
315extern struct userdiff_driver *get_textconv(struct diff_filespec *one);
316
Kevin Ballard10ae7522010-09-27 16:58:25 -0700317extern int parse_rename_score(const char **cp_p);
318
Junio C Hamano86436c22005-04-25 18:22:47 -0700319#endif /* DIFF_H */