]>
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 | ||
67574c40 JH |
7 | #define DIFF_FILE_CANON_MODE(mode) \ |
8 | (S_ISREG(mode) ? (S_IFREG | ce_permissions(mode)) : \ | |
9 | S_ISLNK(mode) ? S_IFLNK : S_IFDIR) | |
10 | ||
ac1b3d12 LT |
11 | struct tree_desc { |
12 | void *buf; | |
13 | unsigned long size; | |
14 | }; | |
15 | ||
16 | struct diff_options; | |
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, | |
22 | const char *base, const char *path); | |
23 | ||
24 | typedef void (*add_remove_fn_t)(struct diff_options *options, | |
25 | int addremove, unsigned mode, | |
26 | const unsigned char *sha1, | |
27 | const char *base, const char *path); | |
28 | ||
6b5ee137 JH |
29 | struct diff_options { |
30 | const char **paths; | |
31 | const char *filter; | |
32 | const char *orderfile; | |
33 | const char *pickaxe; | |
ac1b3d12 | 34 | unsigned recursive:1, |
80b1e511 JH |
35 | tree_in_recursive:1, |
36 | full_index:1; | |
6b5ee137 JH |
37 | int break_opt; |
38 | int detect_rename; | |
39 | int find_copies_harder; | |
40 | int line_termination; | |
41 | int output_format; | |
42 | int pickaxe_opts; | |
43 | int rename_score; | |
44 | int reverse_diff; | |
8082d8d3 | 45 | int rename_limit; |
6b5ee137 | 46 | int setup; |
ac1b3d12 LT |
47 | |
48 | change_fn_t change; | |
49 | add_remove_fn_t add_remove; | |
6b5ee137 JH |
50 | }; |
51 | ||
ac1b3d12 LT |
52 | extern void diff_tree_setup_paths(const char **paths); |
53 | extern int diff_tree(struct tree_desc *t1, struct tree_desc *t2, | |
54 | const char *base, struct diff_options *opt); | |
55 | extern int diff_tree_sha1(const unsigned char *old, const unsigned char *new, | |
56 | const char *base, struct diff_options *opt); | |
57 | ||
6b5ee137 JH |
58 | extern void diff_addremove(struct diff_options *, |
59 | int addremove, | |
77eb2720 JH |
60 | unsigned mode, |
61 | const unsigned char *sha1, | |
62 | const char *base, | |
63 | const char *path); | |
64 | ||
6b5ee137 JH |
65 | extern void diff_change(struct diff_options *, |
66 | unsigned mode1, unsigned mode2, | |
67 | const unsigned char *sha1, | |
68 | const unsigned char *sha2, | |
69 | const char *base, const char *path); | |
77eb2720 | 70 | |
6b5ee137 JH |
71 | extern void diff_unmerge(struct diff_options *, |
72 | const char *path); | |
77eb2720 | 73 | |
57fe64a4 JH |
74 | extern int diff_scoreopt_parse(const char *opt); |
75 | ||
19feebc8 | 76 | #define DIFF_SETUP_REVERSE 1 |
f0c6b2a2 JH |
77 | #define DIFF_SETUP_USE_CACHE 2 |
78 | #define DIFF_SETUP_USE_SIZE_CACHE 4 | |
ce240675 | 79 | |
6b5ee137 JH |
80 | extern void diff_setup(struct diff_options *); |
81 | extern int diff_opt_parse(struct diff_options *, const char **, int); | |
82 | extern int diff_setup_done(struct diff_options *); | |
86436c28 | 83 | |
6b14d7fa JH |
84 | #define DIFF_DETECT_RENAME 1 |
85 | #define DIFF_DETECT_COPY 2 | |
86 | ||
367cec1c | 87 | #define DIFF_PICKAXE_ALL 1 |
f345b0a0 | 88 | |
6b5ee137 | 89 | extern void diffcore_std(struct diff_options *); |
f2ce9fde | 90 | |
6b5ee137 | 91 | extern void diffcore_std_no_resolve(struct diff_options *); |
befe8639 | 92 | |
dda2d79a JH |
93 | #define COMMON_DIFF_OPTIONS_HELP \ |
94 | "\ncommon diff options:\n" \ | |
8082d8d3 JH |
95 | " -z output diff-raw with lines terminated with NUL.\n" \ |
96 | " -p output patch format.\n" \ | |
97 | " -u synonym for -p.\n" \ | |
98 | " --name-only show only names of changed files.\n" \ | |
946f5f7c | 99 | " --name-status show names and status of changed files.\n" \ |
80b1e511 | 100 | " --full-index show full object name on index ines.\n" \ |
8082d8d3 JH |
101 | " -R swap input file pairs.\n" \ |
102 | " -B detect complete rewrites.\n" \ | |
103 | " -M detect renames.\n" \ | |
104 | " -C detect copies.\n" \ | |
dda2d79a | 105 | " --find-copies-harder\n" \ |
8082d8d3 JH |
106 | " try unchanged files as candidate for copy detection.\n" \ |
107 | " -l<n> limit rename attempts up to <n> paths.\n" \ | |
108 | " -O<file> reorder diffs according to the <file>.\n" \ | |
109 | " -S<string> find filepair whose only one side contains the string.\n" \ | |
dda2d79a | 110 | " --pickaxe-all\n" \ |
8082d8d3 | 111 | " show all files diff when -S is used and hit is found.\n" |
dda2d79a | 112 | |
38c6f780 JH |
113 | extern int diff_queue_is_empty(void); |
114 | ||
e68b6f15 | 115 | #define DIFF_FORMAT_RAW 1 |
19feebc8 JH |
116 | #define DIFF_FORMAT_PATCH 2 |
117 | #define DIFF_FORMAT_NO_OUTPUT 3 | |
52f28529 | 118 | #define DIFF_FORMAT_NAME 4 |
946f5f7c | 119 | #define DIFF_FORMAT_NAME_STATUS 5 |
19feebc8 | 120 | |
6b5ee137 | 121 | extern void diff_flush(struct diff_options*); |
86436c28 | 122 | |
e7baa4f4 | 123 | /* diff-raw status letters */ |
ca8c9156 | 124 | #define DIFF_STATUS_ADDED 'A' |
e7baa4f4 JH |
125 | #define DIFF_STATUS_COPIED 'C' |
126 | #define DIFF_STATUS_DELETED 'D' | |
127 | #define DIFF_STATUS_MODIFIED 'M' | |
128 | #define DIFF_STATUS_RENAMED 'R' | |
129 | #define DIFF_STATUS_TYPE_CHANGED 'T' | |
130 | #define DIFF_STATUS_UNKNOWN 'X' | |
131 | #define DIFF_STATUS_UNMERGED 'U' | |
132 | ||
133 | /* these are not diff-raw status letters proper, but used by | |
134 | * diffcore-filter insn to specify additional restrictions. | |
135 | */ | |
0b34379a | 136 | #define DIFF_STATUS_FILTER_AON '*' |
e7baa4f4 JH |
137 | #define DIFF_STATUS_FILTER_BROKEN 'B' |
138 | ||
86436c28 | 139 | #endif /* DIFF_H */ |