[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;
struct strbuf;
struct diff_filespec;
struct userdiff_driver;
struct sha1_array;
struct commit;

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,
		 unsigned old_dirty_submodule, unsigned new_dirty_submodule);

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

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

typedef struct strbuf *(*diff_prefix_fn_t)(struct diff_options *opt, 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_RENAME_EMPTY        (1 <<  8)
/* (1 <<  9) unused */
#define DIFF_OPT_HAS_CHANGES         (1 << 10)
#define DIFF_OPT_QUICK               (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_DIFF_FROM_CONTENTS  (1 << 22)
#define DIFF_OPT_SUBMODULE_LOG       (1 << 23)
#define DIFF_OPT_DIRTY_SUBMODULES    (1 << 24)
#define DIFF_OPT_IGNORE_UNTRACKED_IN_SUBMODULES (1 << 25)
#define DIFF_OPT_IGNORE_DIRTY_SUBMODULES (1 << 26)
#define DIFF_OPT_OVERRIDE_SUBMODULE_CONFIG (1 << 27)
#define DIFF_OPT_DIRSTAT_BY_LINE     (1 << 28)
#define DIFF_OPT_FUNCCONTEXT         (1 << 29)
#define DIFF_OPT_PICKAXE_IGNORE_CASE (1 << 30)

#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)
#define DIFF_XDL_TST(opts, flag)    ((opts)->xdl_opts & XDF_##flag)
#define DIFF_XDL_SET(opts, flag)    ((opts)->xdl_opts |= XDF_##flag)
#define DIFF_XDL_CLR(opts, flag)    ((opts)->xdl_opts &= ~XDF_##flag)

#define DIFF_WITH_ALG(opts, flag)   (((opts)->xdl_opts & ~XDF_DIFF_ALGORITHM_MASK) | XDF_##flag)

enum diff_words_type {
	DIFF_WORDS_NONE = 0,
	DIFF_WORDS_PORCELAIN,
	DIFF_WORDS_PLAIN,
	DIFF_WORDS_COLOR
};

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 use_color;
	int context;
	int interhunkcontext;
	int break_opt;
	int detect_rename;
	int irreversible_delete;
	int skip_stat_unmatch;
	int line_termination;
	int output_format;
	int pickaxe_opts;
	int rename_score;
	int rename_limit;
	int needed_rename_limit;
	int degraded_cc_to_c;
	int show_rename_progress;
	int dirstat_permille;
	int setup;
	int abbrev;
	const char *prefix;
	int prefix_length;
	const char *stat_sep;
	long xdl_opts;

	int stat_width;
	int stat_name_width;
	int stat_graph_width;
	int stat_count;
	const char *word_regex;
	enum diff_words_type word_diff;

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

	/* to support internal diff recursion by --follow hack*/
	int found_follow;

	FILE *file;
	int close_file;

	struct pathspec pathspec;
	change_fn_t change;
	add_remove_fn_t add_remove;
	diff_format_fn_t format_callback;
	void *format_callback_data;
	diff_prefix_fn_t output_prefix;
	int output_prefix_length;
	void *output_prefix_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,
	DIFF_FUNCINFO = 8
};
const char *diff_get_color(int diff_use_color, enum color_diff ix);
#define diff_get_color_opt(o, ix) \
	diff_get_color((o)->use_color, 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 struct sha1_array *parents, int dense, struct rev_info *rev);

extern void diff_tree_combined_merge(const struct commit *commit, int dense, struct rev_info *rev);

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

extern int diff_can_quit_early(struct diff_options *);

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

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

extern struct diff_filepair *diff_unmerge(struct diff_options *, const char *path);

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

/*
 * Poor man's alternative to parse-option, to allow both sticked form
 * (--option=value) and separate form (--option value).
 */
extern int parse_long_opt(const char *opt, const char **argv,
			 const char **optarg);

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

#define DIFF_PICKAXE_KIND_S	4 /* traditional plumbing counter */
#define DIFF_PICKAXE_KIND_G	8 /* grep in the patch */

extern void diffcore_std(struct diff_options *);
extern void diffcore_fix_diff_index(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*);
extern void diff_warn_rename_limit(const char *varname, int needed, int degraded_cc);

/* 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 *);

extern int index_differs_from(const char *def, int diff_flags);

extern size_t fill_textconv(struct userdiff_driver *driver,
			    struct diff_filespec *df,
			    char **outbuf);

extern struct userdiff_driver *get_textconv(struct diff_filespec *one);

extern int parse_rename_score(const char **cp_p);

extern int print_stat_summary(FILE *fp, int files,
			      int insertions, int deletions);

#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;
a3c158d4	12	struct strbuf;
a788d7d5 AB	13	struct diff_filespec;
a788d7d5 AB	14	struct userdiff_driver;
0041f09d	15	struct sha1_array;
82889295	16	struct commit;
ac1b3d12 LT	17
	18	typedef void (change_fn_t)(struct diff_options options,
	19	unsigned old_mode, unsigned new_mode,
	20	const unsigned char *old_sha1,
	21	const unsigned char *new_sha1,
e3d42c47 JL	22	const char *fullpath,
e3d42c47 JL	23	unsigned old_dirty_submodule, unsigned new_dirty_submodule);
ac1b3d12 LT	24
	25	typedef void (add_remove_fn_t)(struct diff_options options,
	26	int addremove, unsigned mode,
	27	const unsigned char *sha1,
e3d42c47	28	const char *fullpath, unsigned dirty_submodule);
ac1b3d12	29
04245581 JK	30	typedef void (diff_format_fn_t)(struct diff_queue_struct q,
	31	struct diff_options options, void data);
	32
a3c158d4 BY	33	typedef struct strbuf (diff_prefix_fn_t)(struct diff_options opt, void data);
a3c158d4 BY	34
c6744349 TH	35	#define DIFF_FORMAT_RAW 0x0001
c6744349 TH	36	#define DIFF_FORMAT_DIFFSTAT 0x0002
74e2abe5 JH	37	#define DIFF_FORMAT_NUMSTAT 0x0004
	38	#define DIFF_FORMAT_SUMMARY 0x0008
	39	#define DIFF_FORMAT_PATCH 0x0010
ebd124c6	40	#define DIFF_FORMAT_SHORTSTAT 0x0020
7df7c019	41	#define DIFF_FORMAT_DIRSTAT 0x0040
c6744349 TH	42
c6744349 TH	43	/* These override all above */
74e2abe5 JH	44	#define DIFF_FORMAT_NAME 0x0100
	45	#define DIFF_FORMAT_NAME_STATUS 0x0200
	46	#define DIFF_FORMAT_CHECKDIFF 0x0400
c6744349 TH	47
	48	/* Same as output_format = 0 but we know that -s flag was given
	49	* and we should not give default value to output_format.
	50	*/
74e2abe5	51	#define DIFF_FORMAT_NO_OUTPUT 0x0800
c6744349	52
74e2abe5	53	#define DIFF_FORMAT_CALLBACK 0x1000
04245581	54
8f67f8ae PH	55	#define DIFF_OPT_RECURSIVE (1 << 0)
	56	#define DIFF_OPT_TREE_IN_RECURSIVE (1 << 1)
	57	#define DIFF_OPT_BINARY (1 << 2)
	58	#define DIFF_OPT_TEXT (1 << 3)
	59	#define DIFF_OPT_FULL_INDEX (1 << 4)
	60	#define DIFF_OPT_SILENT_ON_REMOVE (1 << 5)
	61	#define DIFF_OPT_FIND_COPIES_HARDER (1 << 6)
	62	#define DIFF_OPT_FOLLOW_RENAMES (1 << 7)
90d43b07	63	#define DIFF_OPT_RENAME_EMPTY (1 << 8)
882749a0	64	/* (1 << 9) unused */
8f67f8ae	65	#define DIFF_OPT_HAS_CHANGES (1 << 10)
90b19941	66	#define DIFF_OPT_QUICK (1 << 11)
8f67f8ae PH	67	#define DIFF_OPT_NO_INDEX (1 << 12)
	68	#define DIFF_OPT_ALLOW_EXTERNAL (1 << 13)
	69	#define DIFF_OPT_EXIT_WITH_STATUS (1 << 14)
	70	#define DIFF_OPT_REVERSE_DIFF (1 << 15)
62c64895	71	#define DIFF_OPT_CHECK_FAILED (1 << 16)
cd676a51	72	#define DIFF_OPT_RELATIVE_NAME (1 << 17)
50fd9bd8	73	#define DIFF_OPT_IGNORE_SUBMODULES (1 << 18)
f88d225f	74	#define DIFF_OPT_DIRSTAT_CUMULATIVE (1 << 19)
fd33777b	75	#define DIFF_OPT_DIRSTAT_BY_FILE (1 << 20)
c7534ef4	76	#define DIFF_OPT_ALLOW_TEXTCONV (1 << 21)
f245194f	77	#define DIFF_OPT_DIFF_FROM_CONTENTS (1 << 22)
752c0c24	78	#define DIFF_OPT_SUBMODULE_LOG (1 << 23)
9297f77e	79	#define DIFF_OPT_DIRTY_SUBMODULES (1 << 24)
3bfc4504	80	#define DIFF_OPT_IGNORE_UNTRACKED_IN_SUBMODULES (1 << 25)
4af574db	81	#define DIFF_OPT_IGNORE_DIRTY_SUBMODULES (1 << 26)
aee9c7d6	82	#define DIFF_OPT_OVERRIDE_SUBMODULE_CONFIG (1 << 27)
1c57a627	83	#define DIFF_OPT_DIRSTAT_BY_LINE (1 << 28)
14937c2c	84	#define DIFF_OPT_FUNCCONTEXT (1 << 29)
accccde4	85	#define DIFF_OPT_PICKAXE_IGNORE_CASE (1 << 30)
752c0c24	86
8f67f8ae PH	87	#define DIFF_OPT_TST(opts, flag) ((opts)->flags & DIFF_OPT_##flag)
	88	#define DIFF_OPT_SET(opts, flag) ((opts)->flags \|= DIFF_OPT_##flag)
	89	#define DIFF_OPT_CLR(opts, flag) ((opts)->flags &= ~DIFF_OPT_##flag)
628d5c2b KC	90	#define DIFF_XDL_TST(opts, flag) ((opts)->xdl_opts & XDF_##flag)
	91	#define DIFF_XDL_SET(opts, flag) ((opts)->xdl_opts \|= XDF_##flag)
	92	#define DIFF_XDL_CLR(opts, flag) ((opts)->xdl_opts &= ~XDF_##flag)
8f67f8ae	93
307ab20b JH	94	#define DIFF_WITH_ALG(opts, flag) (((opts)->xdl_opts & ~XDF_DIFF_ALGORITHM_MASK) \| XDF_##flag)
307ab20b JH	95
882749a0 TR	96	enum diff_words_type {
	97	DIFF_WORDS_NONE = 0,
	98	DIFF_WORDS_PORCELAIN,
	99	DIFF_WORDS_PLAIN,
	100	DIFF_WORDS_COLOR
	101	};
	102
6b5ee137	103	struct diff_options {
6b5ee137 JH	104	const char *filter;
	105	const char *orderfile;
	106	const char *pickaxe;
2f3f8b21	107	const char *single_follow;
eab9a40b	108	const char a_prefix, b_prefix;
8f67f8ae	109	unsigned flags;
f1c96261	110	int use_color;
ee1e5412	111	int context;
6d0e674a	112	int interhunkcontext;
6b5ee137 JH	113	int break_opt;
6b5ee137 JH	114	int detect_rename;
467ddc14	115	int irreversible_delete;
fb13227e	116	int skip_stat_unmatch;
6b5ee137 JH	117	int line_termination;
	118	int output_format;
	119	int pickaxe_opts;
	120	int rename_score;
8082d8d3	121	int rename_limit;
bf0ab10f	122	int needed_rename_limit;
f31027c9	123	int degraded_cc_to_c;
3ac942d4	124	int show_rename_progress;
712d2c7d	125	int dirstat_permille;
6b5ee137	126	int setup;
47dd0d59	127	int abbrev;
cd676a51 JH	128	const char *prefix;
cd676a51 JH	129	int prefix_length;
698ce6f8	130	const char *stat_sep;
0d21efa5	131	long xdl_opts;
ac1b3d12	132
a2540023 JH	133	int stat_width;
a2540023 JH	134	int stat_name_width;
969fe57b	135	int stat_graph_width;
808e1db2	136	int stat_count;
2b6a5417	137	const char *word_regex;
882749a0	138	enum diff_words_type word_diff;
a2540023	139
34a5e1a2 JS	140	/* this is set by diffcore for DIFF_FORMAT_PATCH */
	141	int found_changes;
	142
44c48a90 JH	143	/* to support internal diff recursion by --follow hack*/
	144	int found_follow;
	145
c0c77734 DB	146	FILE *file;
	147	int close_file;
	148
66f13625	149	struct pathspec pathspec;
ac1b3d12 LT	150	change_fn_t change;
ac1b3d12 LT	151	add_remove_fn_t add_remove;
04245581 JK	152	diff_format_fn_t format_callback;
04245581 JK	153	void *format_callback_data;
a3c158d4	154	diff_prefix_fn_t output_prefix;
5e71a84a	155	int output_prefix_length;
a3c158d4	156	void *output_prefix_data;
6b5ee137 JH	157	};
6b5ee137 JH	158
ce436973 JK	159	enum color_diff {
	160	DIFF_RESET = 0,
	161	DIFF_PLAIN = 1,
	162	DIFF_METAINFO = 2,
	163	DIFF_FRAGINFO = 3,
	164	DIFF_FILE_OLD = 4,
	165	DIFF_FILE_NEW = 5,
	166	DIFF_COMMIT = 6,
448c3ef1	167	DIFF_WHITESPACE = 7,
4b05548f	168	DIFF_FUNCINFO = 8
ce436973 JK	169	};
ce436973 JK	170	const char *diff_get_color(int diff_use_color, enum color_diff ix);
8f67f8ae	171	#define diff_get_color_opt(o, ix) \
f1c96261	172	diff_get_color((o)->use_color, ix)
8f67f8ae	173
ce436973	174
698ce6f8 JS	175	extern const char mime_boundary_leader[];
698ce6f8 JS	176
a8baa7b9 JH	177	extern void diff_tree_setup_paths(const char *paths, struct diff_options );
a8baa7b9 JH	178	extern void diff_tree_release_paths(struct diff_options *);
ac1b3d12 LT	179	extern int diff_tree(struct tree_desc t1, struct tree_desc t2,
	180	const char base, struct diff_options opt);
	181	extern int diff_tree_sha1(const unsigned char old, const unsigned char new,
	182	const char base, struct diff_options opt);
2b60356d RS	183	extern int diff_root_tree_sha1(const unsigned char new, const char base,
2b60356d RS	184	struct diff_options *opt);
ac1b3d12	185
ea726d02 JH	186	struct combine_diff_path {
	187	struct combine_diff_path *next;
	188	int len;
	189	char *path;
2454c962	190	unsigned int mode;
ea726d02	191	unsigned char sha1[20];
2454c962	192	struct combine_diff_parent {
d416df88	193	char status;
2454c962 JH	194	unsigned int mode;
	195	unsigned char sha1[20];
	196	} parent[FLEX_ARRAY];
ea726d02	197	};
2454c962 JH	198	#define combine_diff_path_size(n, l) \
	199	(sizeof(struct combine_diff_path) + \
	200	sizeof(struct combine_diff_parent) * (n) + (l) + 1)
ea726d02	201
91539833 LT	202	extern void show_combined_diff(struct combine_diff_path *elem, int num_parent,
91539833 LT	203	int dense, struct rev_info *);
ea726d02	204
0041f09d	205	extern void diff_tree_combined(const unsigned char sha1, const struct sha1_array parents, int dense, struct rev_info *rev);
0fe7c1de	206
82889295	207	extern void diff_tree_combined_merge(const struct commit commit, int dense, struct rev_info rev);
af3feefa	208
a5a818ee JH	209	void diff_set_mnemonic_prefix(struct diff_options options, const char a, const char *b);
a5a818ee JH	210
28b9264d JH	211	extern int diff_can_quit_early(struct diff_options *);
28b9264d JH	212
6b5ee137 JH	213	extern void diff_addremove(struct diff_options *,
6b5ee137 JH	214	int addremove,
77eb2720 JH	215	unsigned mode,
77eb2720 JH	216	const unsigned char *sha1,
e3d42c47	217	const char *fullpath, unsigned dirty_submodule);
77eb2720	218
6b5ee137 JH	219	extern void diff_change(struct diff_options *,
	220	unsigned mode1, unsigned mode2,
	221	const unsigned char *sha1,
	222	const unsigned char *sha2,
e3d42c47 JL	223	const char *fullpath,
e3d42c47 JL	224	unsigned dirty_submodule1, unsigned dirty_submodule2);
77eb2720	225
fa7b2908	226	extern struct diff_filepair diff_unmerge(struct diff_options , const char *path);
77eb2720	227
19feebc8	228	#define DIFF_SETUP_REVERSE 1
f0c6b2a2 JH	229	#define DIFF_SETUP_USE_CACHE 2
f0c6b2a2 JH	230	#define DIFF_SETUP_USE_SIZE_CACHE 4
ce240675	231
dea007fb MM	232	/*
	233	* Poor man's alternative to parse-option, to allow both sticked form
	234	* (--option=value) and separate form (--option value).
	235	*/
	236	extern int parse_long_opt(const char opt, const char *argv,
	237	const char **optarg);
	238
ef90d6d4 JS	239	extern int git_diff_basic_config(const char var, const char value, void *cb);
ef90d6d4 JS	240	extern int git_diff_ui_config(const char var, const char value, void *cb);
6b2f2d98	241	extern int diff_use_color_default;
6b5ee137 JH	242	extern void diff_setup(struct diff_options *);
	243	extern int diff_opt_parse(struct diff_options , const char *, int);
	244	extern int diff_setup_done(struct diff_options *);
86436c28	245
6b14d7fa JH	246	#define DIFF_DETECT_RENAME 1
	247	#define DIFF_DETECT_COPY 2
	248
367cec1c	249	#define DIFF_PICKAXE_ALL 1
d01d8c67	250	#define DIFF_PICKAXE_REGEX 2
f345b0a0	251
f506b8e8 JH	252	#define DIFF_PICKAXE_KIND_S 4 /* traditional plumbing counter */
	253	#define DIFF_PICKAXE_KIND_G 8 /* grep in the patch */
	254
6b5ee137	255	extern void diffcore_std(struct diff_options *);
730f7284	256	extern void diffcore_fix_diff_index(struct diff_options *);
f2ce9fde	257
dda2d79a JH	258	#define COMMON_DIFF_OPTIONS_HELP \
dda2d79a JH	259	"\ncommon diff options:\n" \
8082d8d3 JH	260	" -z output diff-raw with lines terminated with NUL.\n" \
	261	" -p output patch format.\n" \
	262	" -u synonym for -p.\n" \
5c91da25 PB	263	" --patch-with-raw\n" \
5c91da25 PB	264	" output both a patch and the diff-raw format.\n" \
d75f7952	265	" --stat show diffstat instead of patch.\n" \
74e2abe5	266	" --numstat show numeric diffstat instead of patch.\n" \
29353273 JS	267	" --patch-with-stat\n" \
29353273 JS	268	" output a patch and prepend its diffstat.\n" \
8082d8d3	269	" --name-only show only names of changed files.\n" \
946f5f7c	270	" --name-status show names and status of changed files.\n" \
47dd0d59	271	" --full-index show full object name on index lines.\n" \
913419fc	272	" --abbrev=<n> abbreviate object names in diff-tree header and diff-raw.\n" \
8082d8d3 JH	273	" -R swap input file pairs.\n" \
	274	" -B detect complete rewrites.\n" \
	275	" -M detect renames.\n" \
	276	" -C detect copies.\n" \
dda2d79a	277	" --find-copies-harder\n" \
8082d8d3 JH	278	" try unchanged files as candidate for copy detection.\n" \
	279	" -l<n> limit rename attempts up to <n> paths.\n" \
	280	" -O<file> reorder diffs according to the <file>.\n" \
	281	" -S<string> find filepair whose only one side contains the string.\n" \
dda2d79a	282	" --pickaxe-all\n" \
ca49920f SF	283	" show all files diff when -S is used and hit is found.\n" \
ca49920f SF	284	" -a --text treat all files as text.\n"
dda2d79a	285
38c6f780	286	extern int diff_queue_is_empty(void);
6b5ee137	287	extern void diff_flush(struct diff_options*);
f31027c9	288	extern void diff_warn_rename_limit(const char *varname, int needed, int degraded_cc);
86436c28	289
e7baa4f4	290	/* diff-raw status letters */
ca8c9156	291	#define DIFF_STATUS_ADDED 'A'
e7baa4f4 JH	292	#define DIFF_STATUS_COPIED 'C'
	293	#define DIFF_STATUS_DELETED 'D'
	294	#define DIFF_STATUS_MODIFIED 'M'
	295	#define DIFF_STATUS_RENAMED 'R'
	296	#define DIFF_STATUS_TYPE_CHANGED 'T'
	297	#define DIFF_STATUS_UNKNOWN 'X'
	298	#define DIFF_STATUS_UNMERGED 'U'
	299
	300	/* these are not diff-raw status letters proper, but used by
	301	* diffcore-filter insn to specify additional restrictions.
	302	*/
0b34379a	303	#define DIFF_STATUS_FILTER_AON '*'
e7baa4f4 JH	304	#define DIFF_STATUS_FILTER_BROKEN 'B'
e7baa4f4 JH	305
47dd0d59 JH	306	extern const char diff_unique_abbrev(const unsigned char , int);
47dd0d59 JH	307
4bd5b7da JH	308	/* do not report anything on removed paths */
4bd5b7da JH	309	#define DIFF_SILENT_ON_REMOVED 01
fb63d7f8 JH	310	/* report racily-clean paths as modified */
fb63d7f8 JH	311	#define DIFF_RACY_IS_MODIFIED 02
4bd5b7da	312	extern int run_diff_files(struct rev_info *revs, unsigned int option);
5c21ac0e	313	extern int run_diff_index(struct rev_info *revs, int cached);
e09ad6e1	314
1cfe7733	315	extern int do_diff_cache(const unsigned char , struct diff_options );
fcb3d0ad JS	316	extern int diff_flush_patch_id(struct diff_options , unsigned char );
fcb3d0ad JS	317
da31b358 JH	318	extern int diff_result_code(struct diff_options *, int);
da31b358 JH	319
0569e9b8 JH	320	extern void diff_no_index(struct rev_info , int, const char , int, const char );
0569e9b8 JH	321
75f3ff2e SB	322	extern int index_differs_from(const char *def, int diff_flags);
75f3ff2e SB	323
a788d7d5 AB	324	extern size_t fill_textconv(struct userdiff_driver *driver,
	325	struct diff_filespec *df,
	326	char **outbuf);
	327
	328	extern struct userdiff_driver get_textconv(struct diff_filespec one);
	329
10ae7526 KB	330	extern int parse_rename_score(const char **cp_p);
10ae7526 KB	331
7f814632 NTND	332	extern int print_stat_summary(FILE *fp, int files,
	333	int insertions, int deletions);
	334
86436c28	335	#endif /* DIFF_H */