diff.h 2.4 KB
Newer Older
1 2 3
/*
 * Copyright (C) 2005 Junio C Hamano
 */
4 5 6
#ifndef DIFF_H
#define DIFF_H

J
Junio C Hamano 已提交
7 8 9 10
#define DIFF_FILE_CANON_MODE(mode) \
	(S_ISREG(mode) ? (S_IFREG | ce_permissions(mode)) : \
	S_ISLNK(mode) ? S_IFLNK : S_IFDIR)

11 12 13 14 15 16 17 18 19 20 21
extern void diff_addremove(int addremove,
			   unsigned mode,
			   const unsigned char *sha1,
			   const char *base,
			   const char *path);

extern void diff_change(unsigned mode1, unsigned mode2,
			     const unsigned char *sha1,
			     const unsigned char *sha2,
			     const char *base, const char *path);

22 23 24 25 26 27 28 29
extern void diff_helper_input(unsigned mode1,
			      unsigned mode2,
			      const unsigned char *sha1,
			      const unsigned char *sha2,
			      const char *path1,
			      int status,
			      int score,
			      const char *path2);
30

31 32
extern void diff_unmerge(const char *path);

J
Junio C Hamano 已提交
33 34
extern int diff_scoreopt_parse(const char *opt);

35
#define DIFF_SETUP_REVERSE      	1
36 37
#define DIFF_SETUP_USE_CACHE		2
#define DIFF_SETUP_USE_SIZE_CACHE	4
38

39
extern void diff_setup(int flags);
40

J
Junio C Hamano 已提交
41 42 43
#define DIFF_DETECT_RENAME	1
#define DIFF_DETECT_COPY	2

44
#define DIFF_PICKAXE_ALL	1
45

46 47
extern void diffcore_std(const char **paths,
			 int detect_rename, int rename_score,
48
			 const char *pickaxe, int pickaxe_opts,
49
			 int break_opt,
50 51 52 53 54
			 const char *orderfile, const char *filter);

extern void diffcore_std_no_resolve(const char **paths,
				    const char *pickaxe, int pickaxe_opts,
				    const char *orderfile, const char *filter);
55

56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75
#define COMMON_DIFF_OPTIONS_HELP \
"\ncommon diff options:\n" \
"  -r		diff recursively (only meaningful in diff-tree)\n" \
"  -z		output diff-raw with lines terminated with NUL.\n" \
"  -p		output patch format.\n" \
"  -u		synonym for -p.\n" \
"  --name-only	show only names of changed files.\n" \
"  --name-only-z\n" \
"		same as --name-only but terminate lines with NUL.\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" \
"  -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"

76 77
extern int diff_queue_is_empty(void);

78
#define DIFF_FORMAT_RAW		1
79 80
#define DIFF_FORMAT_PATCH	2
#define DIFF_FORMAT_NO_OUTPUT	3
81
#define DIFF_FORMAT_NAME	4
82

83
extern void diff_flush(int output_style, int line_terminator);
84 85

#endif /* DIFF_H */