[thirdparty/git.git] / diff.h

/*
 * Copyright (C) 2005 Junio C Hamano
 */
#ifndef DIFF_H
#define DIFF_H

#include "tree-walk.h"

struct rev_info;
struct diff_options;
struct diff_queue_struct;

typedef void (*change_fn_t)(struct diff_options *options,
		 unsigned old_mode, unsigned new_mode,
		 const unsigned char *old_sha1,
		 const unsigned char *new_sha1,
		 const char *fullpath);

typedef void (*add_remove_fn_t)(struct diff_options *options,
		    int addremove, unsigned mode,
		    const unsigned char *sha1,
		    const char *fullpath);

typedef void (*diff_format_fn_t)(struct diff_queue_struct *q,
		struct diff_options *options, void *data);

#define DIFF_FORMAT_RAW		0x0001
#define DIFF_FORMAT_DIFFSTAT	0x0002
#define DIFF_FORMAT_NUMSTAT	0x0004
#define DIFF_FORMAT_SUMMARY	0x0008
#define DIFF_FORMAT_PATCH	0x0010
#define DIFF_FORMAT_SHORTSTAT	0x0020
#define DIFF_FORMAT_DIRSTAT	0x0040

/* These override all above */
#define DIFF_FORMAT_NAME	0x0100
#define DIFF_FORMAT_NAME_STATUS	0x0200
#define DIFF_FORMAT_CHECKDIFF	0x0400

/* Same as output_format = 0 but we know that -s flag was given
 * and we should not give default value to output_format.
 */
#define DIFF_FORMAT_NO_OUTPUT	0x0800

#define DIFF_FORMAT_CALLBACK	0x1000

#define DIFF_OPT_RECURSIVE           (1 <<  0)
#define DIFF_OPT_TREE_IN_RECURSIVE   (1 <<  1)
#define DIFF_OPT_BINARY              (1 <<  2)
#define DIFF_OPT_TEXT                (1 <<  3)
#define DIFF_OPT_FULL_INDEX          (1 <<  4)
#define DIFF_OPT_SILENT_ON_REMOVE    (1 <<  5)
#define DIFF_OPT_FIND_COPIES_HARDER  (1 <<  6)
#define DIFF_OPT_FOLLOW_RENAMES      (1 <<  7)
#define DIFF_OPT_COLOR_DIFF          (1 <<  8)
#define DIFF_OPT_COLOR_DIFF_WORDS    (1 <<  9)
#define DIFF_OPT_HAS_CHANGES         (1 << 10)
#define DIFF_OPT_QUIET               (1 << 11)
#define DIFF_OPT_NO_INDEX            (1 << 12)
#define DIFF_OPT_ALLOW_EXTERNAL      (1 << 13)
#define DIFF_OPT_EXIT_WITH_STATUS    (1 << 14)
#define DIFF_OPT_REVERSE_DIFF        (1 << 15)
#define DIFF_OPT_CHECK_FAILED        (1 << 16)
#define DIFF_OPT_RELATIVE_NAME       (1 << 17)
#define DIFF_OPT_IGNORE_SUBMODULES   (1 << 18)
#define DIFF_OPT_DIRSTAT_CUMULATIVE  (1 << 19)
#define DIFF_OPT_DIRSTAT_BY_FILE     (1 << 20)
#define DIFF_OPT_ALLOW_TEXTCONV      (1 << 21)
#define DIFF_OPT_TST(opts, flag)    ((opts)->flags & DIFF_OPT_##flag)
#define DIFF_OPT_SET(opts, flag)    ((opts)->flags |= DIFF_OPT_##flag)
#define DIFF_OPT_CLR(opts, flag)    ((opts)->flags &= ~DIFF_OPT_##flag)

struct diff_options {
	const char *filter;
	const char *orderfile;
	const char *pickaxe;
	const char *single_follow;
	const char *a_prefix, *b_prefix;
	unsigned flags;
	int context;
	int break_opt;
	int detect_rename;
	int skip_stat_unmatch;
	int line_termination;
	int output_format;
	int pickaxe_opts;
	int rename_score;
	int rename_limit;
	int warn_on_too_large_rename;
	int dirstat_percent;
	int setup;
	int abbrev;
	const char *prefix;
	int prefix_length;
	const char *stat_sep;
	long xdl_opts;

	int stat_width;
	int stat_name_width;

	/* this is set by diffcore for DIFF_FORMAT_PATCH */
	int found_changes;

	FILE *file;
	int close_file;

	int nr_paths;
	const char **paths;
	int *pathlens;
	change_fn_t change;
	add_remove_fn_t add_remove;
	diff_format_fn_t format_callback;
	void *format_callback_data;
};

enum color_diff {
	DIFF_RESET = 0,
	DIFF_PLAIN = 1,
	DIFF_METAINFO = 2,
	DIFF_FRAGINFO = 3,
	DIFF_FILE_OLD = 4,
	DIFF_FILE_NEW = 5,
	DIFF_COMMIT = 6,
	DIFF_WHITESPACE = 7,
};
const char *diff_get_color(int diff_use_color, enum color_diff ix);
#define diff_get_color_opt(o, ix) \
	diff_get_color(DIFF_OPT_TST((o), COLOR_DIFF), ix)


extern const char mime_boundary_leader[];

extern void diff_tree_setup_paths(const char **paths, struct diff_options *);
extern void diff_tree_release_paths(struct diff_options *);
extern int diff_tree(struct tree_desc *t1, struct tree_desc *t2,
		     const char *base, struct diff_options *opt);
extern int diff_tree_sha1(const unsigned char *old, const unsigned char *new,
			  const char *base, struct diff_options *opt);
extern int diff_root_tree_sha1(const unsigned char *new, const char *base,
                               struct diff_options *opt);

struct combine_diff_path {
	struct combine_diff_path *next;
	int len;
	char *path;
	unsigned int mode;
	unsigned char sha1[20];
	struct combine_diff_parent {
		char status;
		unsigned int mode;
		unsigned char sha1[20];
	} parent[FLEX_ARRAY];
};
#define combine_diff_path_size(n, l) \
	(sizeof(struct combine_diff_path) + \
	 sizeof(struct combine_diff_parent) * (n) + (l) + 1)

extern void show_combined_diff(struct combine_diff_path *elem, int num_parent,
			      int dense, struct rev_info *);

extern void diff_tree_combined(const unsigned char *sha1, const unsigned char parent[][20], int num_parent, int dense, struct rev_info *rev);

extern void diff_tree_combined_merge(const unsigned char *sha1, int, struct rev_info *);

void diff_set_mnemonic_prefix(struct diff_options *options, const char *a, const char *b);

extern void diff_addremove(struct diff_options *,
			   int addremove,
			   unsigned mode,
			   const unsigned char *sha1,
			   const char *fullpath);

extern void diff_change(struct diff_options *,
			unsigned mode1, unsigned mode2,
			const unsigned char *sha1,
			const unsigned char *sha2,
			const char *fullpath);

extern void diff_unmerge(struct diff_options *,
			 const char *path,
			 unsigned mode,
			 const unsigned char *sha1);

#define DIFF_SETUP_REVERSE      	1
#define DIFF_SETUP_USE_CACHE		2
#define DIFF_SETUP_USE_SIZE_CACHE	4

extern int git_diff_basic_config(const char *var, const char *value, void *cb);
extern int git_diff_ui_config(const char *var, const char *value, void *cb);
extern int diff_use_color_default;
extern void diff_setup(struct diff_options *);
extern int diff_opt_parse(struct diff_options *, const char **, int);
extern int diff_setup_done(struct diff_options *);

#define DIFF_DETECT_RENAME	1
#define DIFF_DETECT_COPY	2

#define DIFF_PICKAXE_ALL	1
#define DIFF_PICKAXE_REGEX	2

extern void diffcore_std(struct diff_options *);

#define COMMON_DIFF_OPTIONS_HELP \
"\ncommon diff options:\n" \
"  -z            output diff-raw with lines terminated with NUL.\n" \
"  -p            output patch format.\n" \
"  -u            synonym for -p.\n" \
"  --patch-with-raw\n" \
"                output both a patch and the diff-raw format.\n" \
"  --stat        show diffstat instead of patch.\n" \
"  --numstat     show numeric diffstat instead of patch.\n" \
"  --patch-with-stat\n" \
"                output a patch and prepend its diffstat.\n" \
"  --name-only   show only names of changed files.\n" \
"  --name-status show names and status of changed files.\n" \
"  --full-index  show full object name on index lines.\n" \
"  --abbrev=<n>  abbreviate object names in diff-tree header and diff-raw.\n" \
"  -R            swap input file pairs.\n" \
"  -B            detect complete rewrites.\n" \
"  -M            detect renames.\n" \
"  -C            detect copies.\n" \
"  --find-copies-harder\n" \
"                try unchanged files as candidate for copy detection.\n" \
"  -l<n>         limit rename attempts up to <n> paths.\n" \
"  -O<file>      reorder diffs according to the <file>.\n" \
"  -S<string>    find filepair whose only one side contains the string.\n" \
"  --pickaxe-all\n" \
"                show all files diff when -S is used and hit is found.\n" \
"  -a  --text    treat all files as text.\n"

extern int diff_queue_is_empty(void);
extern void diff_flush(struct diff_options*);

/* diff-raw status letters */
#define DIFF_STATUS_ADDED		'A'
#define DIFF_STATUS_COPIED		'C'
#define DIFF_STATUS_DELETED		'D'
#define DIFF_STATUS_MODIFIED		'M'
#define DIFF_STATUS_RENAMED		'R'
#define DIFF_STATUS_TYPE_CHANGED	'T'
#define DIFF_STATUS_UNKNOWN		'X'
#define DIFF_STATUS_UNMERGED		'U'

/* these are not diff-raw status letters proper, but used by
 * diffcore-filter insn to specify additional restrictions.
 */
#define DIFF_STATUS_FILTER_AON		'*'
#define DIFF_STATUS_FILTER_BROKEN	'B'

extern const char *diff_unique_abbrev(const unsigned char *, int);

/* do not report anything on removed paths */
#define DIFF_SILENT_ON_REMOVED 01
/* report racily-clean paths as modified */
#define DIFF_RACY_IS_MODIFIED 02
extern int run_diff_files(struct rev_info *revs, unsigned int option);
extern int run_diff_index(struct rev_info *revs, int cached);

extern int do_diff_cache(const unsigned char *, struct diff_options *);
extern int diff_flush_patch_id(struct diff_options *, unsigned char *);

extern int diff_result_code(struct diff_options *, int);

extern void diff_no_index(struct rev_info *, int, const char **, int, const char *);

#endif /* DIFF_H */
Commit	Line	Data
be3cfa85 JH	1	/*
	2	* Copyright (C) 2005 Junio C Hamano
	3	*/
86436c28 JH	4	#ifndef DIFF_H
	5	#define DIFF_H
	6
1b0c7174	7	#include "tree-walk.h"
50f9a858	8
91539833	9	struct rev_info;
ac1b3d12	10	struct diff_options;
04245581	11	struct diff_queue_struct;
ac1b3d12 LT	12
	13	typedef void (change_fn_t)(struct diff_options options,
	14	unsigned old_mode, unsigned new_mode,
	15	const unsigned char *old_sha1,
	16	const unsigned char *new_sha1,
fd55a19e	17	const char *fullpath);
ac1b3d12 LT	18
	19	typedef void (add_remove_fn_t)(struct diff_options options,
	20	int addremove, unsigned mode,
	21	const unsigned char *sha1,
fd55a19e	22	const char *fullpath);
ac1b3d12	23
04245581 JK	24	typedef void (diff_format_fn_t)(struct diff_queue_struct q,
	25	struct diff_options options, void data);
	26
c6744349 TH	27	#define DIFF_FORMAT_RAW 0x0001
c6744349 TH	28	#define DIFF_FORMAT_DIFFSTAT 0x0002
74e2abe5 JH	29	#define DIFF_FORMAT_NUMSTAT 0x0004
	30	#define DIFF_FORMAT_SUMMARY 0x0008
	31	#define DIFF_FORMAT_PATCH 0x0010
ebd124c6	32	#define DIFF_FORMAT_SHORTSTAT 0x0020
7df7c019	33	#define DIFF_FORMAT_DIRSTAT 0x0040
c6744349 TH	34
c6744349 TH	35	/* These override all above */
74e2abe5 JH	36	#define DIFF_FORMAT_NAME 0x0100
	37	#define DIFF_FORMAT_NAME_STATUS 0x0200
	38	#define DIFF_FORMAT_CHECKDIFF 0x0400
c6744349 TH	39
	40	/* Same as output_format = 0 but we know that -s flag was given
	41	* and we should not give default value to output_format.
	42	*/
74e2abe5	43	#define DIFF_FORMAT_NO_OUTPUT 0x0800
c6744349	44
74e2abe5	45	#define DIFF_FORMAT_CALLBACK 0x1000
04245581	46
8f67f8ae PH	47	#define DIFF_OPT_RECURSIVE (1 << 0)
	48	#define DIFF_OPT_TREE_IN_RECURSIVE (1 << 1)
	49	#define DIFF_OPT_BINARY (1 << 2)
	50	#define DIFF_OPT_TEXT (1 << 3)
	51	#define DIFF_OPT_FULL_INDEX (1 << 4)
	52	#define DIFF_OPT_SILENT_ON_REMOVE (1 << 5)
	53	#define DIFF_OPT_FIND_COPIES_HARDER (1 << 6)
	54	#define DIFF_OPT_FOLLOW_RENAMES (1 << 7)
	55	#define DIFF_OPT_COLOR_DIFF (1 << 8)
	56	#define DIFF_OPT_COLOR_DIFF_WORDS (1 << 9)
	57	#define DIFF_OPT_HAS_CHANGES (1 << 10)
	58	#define DIFF_OPT_QUIET (1 << 11)
	59	#define DIFF_OPT_NO_INDEX (1 << 12)
	60	#define DIFF_OPT_ALLOW_EXTERNAL (1 << 13)
	61	#define DIFF_OPT_EXIT_WITH_STATUS (1 << 14)
	62	#define DIFF_OPT_REVERSE_DIFF (1 << 15)
62c64895	63	#define DIFF_OPT_CHECK_FAILED (1 << 16)
cd676a51	64	#define DIFF_OPT_RELATIVE_NAME (1 << 17)
50fd9bd8	65	#define DIFF_OPT_IGNORE_SUBMODULES (1 << 18)
f88d225f	66	#define DIFF_OPT_DIRSTAT_CUMULATIVE (1 << 19)
fd33777b	67	#define DIFF_OPT_DIRSTAT_BY_FILE (1 << 20)
c7534ef4	68	#define DIFF_OPT_ALLOW_TEXTCONV (1 << 21)
8f67f8ae PH	69	#define DIFF_OPT_TST(opts, flag) ((opts)->flags & DIFF_OPT_##flag)
	70	#define DIFF_OPT_SET(opts, flag) ((opts)->flags \|= DIFF_OPT_##flag)
	71	#define DIFF_OPT_CLR(opts, flag) ((opts)->flags &= ~DIFF_OPT_##flag)
	72
6b5ee137	73	struct diff_options {
6b5ee137 JH	74	const char *filter;
	75	const char *orderfile;
	76	const char *pickaxe;
2f3f8b21	77	const char *single_follow;
eab9a40b	78	const char a_prefix, b_prefix;
8f67f8ae	79	unsigned flags;
ee1e5412	80	int context;
6b5ee137 JH	81	int break_opt;
6b5ee137 JH	82	int detect_rename;
fb13227e	83	int skip_stat_unmatch;
6b5ee137 JH	84	int line_termination;
	85	int output_format;
	86	int pickaxe_opts;
	87	int rename_score;
8082d8d3	88	int rename_limit;
b8960bbe	89	int warn_on_too_large_rename;
7df7c019	90	int dirstat_percent;
6b5ee137	91	int setup;
47dd0d59	92	int abbrev;
cd676a51 JH	93	const char *prefix;
cd676a51 JH	94	int prefix_length;
698ce6f8	95	const char *stat_sep;
0d21efa5	96	long xdl_opts;
ac1b3d12	97
a2540023 JH	98	int stat_width;
	99	int stat_name_width;
	100
34a5e1a2 JS	101	/* this is set by diffcore for DIFF_FORMAT_PATCH */
	102	int found_changes;
	103
c0c77734 DB	104	FILE *file;
	105	int close_file;
	106
a8baa7b9 JH	107	int nr_paths;
	108	const char **paths;
	109	int *pathlens;
ac1b3d12 LT	110	change_fn_t change;
ac1b3d12 LT	111	add_remove_fn_t add_remove;
04245581 JK	112	diff_format_fn_t format_callback;
04245581 JK	113	void *format_callback_data;
6b5ee137 JH	114	};
6b5ee137 JH	115
ce436973 JK	116	enum color_diff {
	117	DIFF_RESET = 0,
	118	DIFF_PLAIN = 1,
	119	DIFF_METAINFO = 2,
	120	DIFF_FRAGINFO = 3,
	121	DIFF_FILE_OLD = 4,
	122	DIFF_FILE_NEW = 5,
	123	DIFF_COMMIT = 6,
448c3ef1	124	DIFF_WHITESPACE = 7,
ce436973 JK	125	};
ce436973 JK	126	const char *diff_get_color(int diff_use_color, enum color_diff ix);
8f67f8ae PH	127	#define diff_get_color_opt(o, ix) \
	128	diff_get_color(DIFF_OPT_TST((o), COLOR_DIFF), ix)
	129
ce436973	130
698ce6f8 JS	131	extern const char mime_boundary_leader[];
698ce6f8 JS	132
a8baa7b9 JH	133	extern void diff_tree_setup_paths(const char *paths, struct diff_options );
a8baa7b9 JH	134	extern void diff_tree_release_paths(struct diff_options *);
ac1b3d12 LT	135	extern int diff_tree(struct tree_desc t1, struct tree_desc t2,
	136	const char base, struct diff_options opt);
	137	extern int diff_tree_sha1(const unsigned char old, const unsigned char new,
	138	const char base, struct diff_options opt);
2b60356d RS	139	extern int diff_root_tree_sha1(const unsigned char new, const char base,
2b60356d RS	140	struct diff_options *opt);
ac1b3d12	141
ea726d02 JH	142	struct combine_diff_path {
	143	struct combine_diff_path *next;
	144	int len;
	145	char *path;
2454c962	146	unsigned int mode;
ea726d02	147	unsigned char sha1[20];
2454c962	148	struct combine_diff_parent {
d416df88	149	char status;
2454c962 JH	150	unsigned int mode;
	151	unsigned char sha1[20];
	152	} parent[FLEX_ARRAY];
ea726d02	153	};
2454c962 JH	154	#define combine_diff_path_size(n, l) \
	155	(sizeof(struct combine_diff_path) + \
	156	sizeof(struct combine_diff_parent) * (n) + (l) + 1)
ea726d02	157
91539833 LT	158	extern void show_combined_diff(struct combine_diff_path *elem, int num_parent,
91539833 LT	159	int dense, struct rev_info *);
ea726d02	160
0fe7c1de JH	161	extern void diff_tree_combined(const unsigned char sha1, const unsigned char parent[][20], int num_parent, int dense, struct rev_info rev);
0fe7c1de JH	162
91539833	163	extern void diff_tree_combined_merge(const unsigned char sha1, int, struct rev_info );
af3feefa	164
a5a818ee JH	165	void diff_set_mnemonic_prefix(struct diff_options options, const char a, const char *b);
a5a818ee JH	166
6b5ee137 JH	167	extern void diff_addremove(struct diff_options *,
6b5ee137 JH	168	int addremove,
77eb2720 JH	169	unsigned mode,
77eb2720 JH	170	const unsigned char *sha1,
fd55a19e	171	const char *fullpath);
77eb2720	172
6b5ee137 JH	173	extern void diff_change(struct diff_options *,
	174	unsigned mode1, unsigned mode2,
	175	const unsigned char *sha1,
	176	const unsigned char *sha2,
fd55a19e	177	const char *fullpath);
77eb2720	178
6b5ee137	179	extern void diff_unmerge(struct diff_options *,
e9c84099 JH	180	const char *path,
	181	unsigned mode,
	182	const unsigned char *sha1);
77eb2720	183
19feebc8	184	#define DIFF_SETUP_REVERSE 1
f0c6b2a2 JH	185	#define DIFF_SETUP_USE_CACHE 2
f0c6b2a2 JH	186	#define DIFF_SETUP_USE_SIZE_CACHE 4
ce240675	187
ef90d6d4 JS	188	extern int git_diff_basic_config(const char var, const char value, void *cb);
ef90d6d4 JS	189	extern int git_diff_ui_config(const char var, const char value, void *cb);
6b2f2d98	190	extern int diff_use_color_default;
6b5ee137 JH	191	extern void diff_setup(struct diff_options *);
	192	extern int diff_opt_parse(struct diff_options , const char *, int);
	193	extern int diff_setup_done(struct diff_options *);
86436c28	194
6b14d7fa JH	195	#define DIFF_DETECT_RENAME 1
	196	#define DIFF_DETECT_COPY 2
	197
367cec1c	198	#define DIFF_PICKAXE_ALL 1
d01d8c67	199	#define DIFF_PICKAXE_REGEX 2
f345b0a0	200
6b5ee137	201	extern void diffcore_std(struct diff_options *);
f2ce9fde	202
dda2d79a JH	203	#define COMMON_DIFF_OPTIONS_HELP \
dda2d79a JH	204	"\ncommon diff options:\n" \
8082d8d3 JH	205	" -z output diff-raw with lines terminated with NUL.\n" \
	206	" -p output patch format.\n" \
	207	" -u synonym for -p.\n" \
5c91da25 PB	208	" --patch-with-raw\n" \
5c91da25 PB	209	" output both a patch and the diff-raw format.\n" \
d75f7952	210	" --stat show diffstat instead of patch.\n" \
74e2abe5	211	" --numstat show numeric diffstat instead of patch.\n" \
29353273 JS	212	" --patch-with-stat\n" \
29353273 JS	213	" output a patch and prepend its diffstat.\n" \
8082d8d3	214	" --name-only show only names of changed files.\n" \
946f5f7c	215	" --name-status show names and status of changed files.\n" \
47dd0d59	216	" --full-index show full object name on index lines.\n" \
913419fc	217	" --abbrev=<n> abbreviate object names in diff-tree header and diff-raw.\n" \
8082d8d3 JH	218	" -R swap input file pairs.\n" \
	219	" -B detect complete rewrites.\n" \
	220	" -M detect renames.\n" \
	221	" -C detect copies.\n" \
dda2d79a	222	" --find-copies-harder\n" \
8082d8d3 JH	223	" try unchanged files as candidate for copy detection.\n" \
	224	" -l<n> limit rename attempts up to <n> paths.\n" \
	225	" -O<file> reorder diffs according to the <file>.\n" \
	226	" -S<string> find filepair whose only one side contains the string.\n" \
dda2d79a	227	" --pickaxe-all\n" \
ca49920f SF	228	" show all files diff when -S is used and hit is found.\n" \
ca49920f SF	229	" -a --text treat all files as text.\n"
dda2d79a	230
38c6f780	231	extern int diff_queue_is_empty(void);
6b5ee137	232	extern void diff_flush(struct diff_options*);
86436c28	233
e7baa4f4	234	/* diff-raw status letters */
ca8c9156	235	#define DIFF_STATUS_ADDED 'A'
e7baa4f4 JH	236	#define DIFF_STATUS_COPIED 'C'
	237	#define DIFF_STATUS_DELETED 'D'
	238	#define DIFF_STATUS_MODIFIED 'M'
	239	#define DIFF_STATUS_RENAMED 'R'
	240	#define DIFF_STATUS_TYPE_CHANGED 'T'
	241	#define DIFF_STATUS_UNKNOWN 'X'
	242	#define DIFF_STATUS_UNMERGED 'U'
	243
	244	/* these are not diff-raw status letters proper, but used by
	245	* diffcore-filter insn to specify additional restrictions.
	246	*/
0b34379a	247	#define DIFF_STATUS_FILTER_AON '*'
e7baa4f4 JH	248	#define DIFF_STATUS_FILTER_BROKEN 'B'
e7baa4f4 JH	249
47dd0d59 JH	250	extern const char diff_unique_abbrev(const unsigned char , int);
47dd0d59 JH	251
4bd5b7da JH	252	/* do not report anything on removed paths */
4bd5b7da JH	253	#define DIFF_SILENT_ON_REMOVED 01
fb63d7f8 JH	254	/* report racily-clean paths as modified */
fb63d7f8 JH	255	#define DIFF_RACY_IS_MODIFIED 02
4bd5b7da	256	extern int run_diff_files(struct rev_info *revs, unsigned int option);
5c21ac0e	257	extern int run_diff_index(struct rev_info *revs, int cached);
e09ad6e1	258
1cfe7733	259	extern int do_diff_cache(const unsigned char , struct diff_options );
fcb3d0ad JS	260	extern int diff_flush_patch_id(struct diff_options , unsigned char );
fcb3d0ad JS	261
da31b358 JH	262	extern int diff_result_code(struct diff_options *, int);
da31b358 JH	263
0569e9b8 JH	264	extern void diff_no_index(struct rev_info , int, const char , int, const char );
0569e9b8 JH	265
86436c28	266	#endif /* DIFF_H */