]>
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; |
47dd0d59 | 47 | int abbrev; |
ac1b3d12 LT |
48 | |
49 | change_fn_t change; | |
50 | add_remove_fn_t add_remove; | |
6b5ee137 JH |
51 | }; |
52 | ||
ac1b3d12 LT |
53 | extern void diff_tree_setup_paths(const char **paths); |
54 | extern int diff_tree(struct tree_desc *t1, struct tree_desc *t2, | |
55 | const char *base, struct diff_options *opt); | |
56 | extern int diff_tree_sha1(const unsigned char *old, const unsigned char *new, | |
57 | const char *base, struct diff_options *opt); | |
58 | ||
ea726d02 JH |
59 | struct combine_diff_path { |
60 | struct combine_diff_path *next; | |
61 | int len; | |
62 | char *path; | |
63 | unsigned char sha1[20]; | |
64 | unsigned char parent_sha1[FLEX_ARRAY][20]; | |
65 | }; | |
66 | ||
67 | int show_combined_diff(struct combine_diff_path *elem, int num_parent, | |
68 | int dense, const char *header, int show_empty); | |
69 | ||
d8f4790e | 70 | extern int diff_tree_combined_merge(const unsigned char *sha1, const char *, int, int); |
af3feefa | 71 | |
6b5ee137 JH |
72 | extern void diff_addremove(struct diff_options *, |
73 | int addremove, | |
77eb2720 JH |
74 | unsigned mode, |
75 | const unsigned char *sha1, | |
76 | const char *base, | |
77 | const char *path); | |
78 | ||
6b5ee137 JH |
79 | extern void diff_change(struct diff_options *, |
80 | unsigned mode1, unsigned mode2, | |
81 | const unsigned char *sha1, | |
82 | const unsigned char *sha2, | |
83 | const char *base, const char *path); | |
77eb2720 | 84 | |
6b5ee137 JH |
85 | extern void diff_unmerge(struct diff_options *, |
86 | const char *path); | |
77eb2720 | 87 | |
57fe64a4 JH |
88 | extern int diff_scoreopt_parse(const char *opt); |
89 | ||
19feebc8 | 90 | #define DIFF_SETUP_REVERSE 1 |
f0c6b2a2 JH |
91 | #define DIFF_SETUP_USE_CACHE 2 |
92 | #define DIFF_SETUP_USE_SIZE_CACHE 4 | |
ce240675 | 93 | |
9ce392f4 | 94 | extern int git_diff_config(const char *var, const char *value); |
6b5ee137 JH |
95 | extern void diff_setup(struct diff_options *); |
96 | extern int diff_opt_parse(struct diff_options *, const char **, int); | |
97 | extern int diff_setup_done(struct diff_options *); | |
86436c28 | 98 | |
6b14d7fa JH |
99 | #define DIFF_DETECT_RENAME 1 |
100 | #define DIFF_DETECT_COPY 2 | |
101 | ||
367cec1c | 102 | #define DIFF_PICKAXE_ALL 1 |
f345b0a0 | 103 | |
6b5ee137 | 104 | extern void diffcore_std(struct diff_options *); |
f2ce9fde | 105 | |
6b5ee137 | 106 | extern void diffcore_std_no_resolve(struct diff_options *); |
befe8639 | 107 | |
dda2d79a JH |
108 | #define COMMON_DIFF_OPTIONS_HELP \ |
109 | "\ncommon diff options:\n" \ | |
8082d8d3 JH |
110 | " -z output diff-raw with lines terminated with NUL.\n" \ |
111 | " -p output patch format.\n" \ | |
112 | " -u synonym for -p.\n" \ | |
113 | " --name-only show only names of changed files.\n" \ | |
946f5f7c | 114 | " --name-status show names and status of changed files.\n" \ |
47dd0d59 | 115 | " --full-index show full object name on index lines.\n" \ |
913419fc | 116 | " --abbrev=<n> abbreviate object names in diff-tree header and diff-raw.\n" \ |
8082d8d3 JH |
117 | " -R swap input file pairs.\n" \ |
118 | " -B detect complete rewrites.\n" \ | |
119 | " -M detect renames.\n" \ | |
120 | " -C detect copies.\n" \ | |
dda2d79a | 121 | " --find-copies-harder\n" \ |
8082d8d3 JH |
122 | " try unchanged files as candidate for copy detection.\n" \ |
123 | " -l<n> limit rename attempts up to <n> paths.\n" \ | |
124 | " -O<file> reorder diffs according to the <file>.\n" \ | |
125 | " -S<string> find filepair whose only one side contains the string.\n" \ | |
dda2d79a | 126 | " --pickaxe-all\n" \ |
8082d8d3 | 127 | " show all files diff when -S is used and hit is found.\n" |
dda2d79a | 128 | |
38c6f780 JH |
129 | extern int diff_queue_is_empty(void); |
130 | ||
e68b6f15 | 131 | #define DIFF_FORMAT_RAW 1 |
19feebc8 JH |
132 | #define DIFF_FORMAT_PATCH 2 |
133 | #define DIFF_FORMAT_NO_OUTPUT 3 | |
52f28529 | 134 | #define DIFF_FORMAT_NAME 4 |
946f5f7c | 135 | #define DIFF_FORMAT_NAME_STATUS 5 |
19feebc8 | 136 | |
6b5ee137 | 137 | extern void diff_flush(struct diff_options*); |
86436c28 | 138 | |
e7baa4f4 | 139 | /* diff-raw status letters */ |
ca8c9156 | 140 | #define DIFF_STATUS_ADDED 'A' |
e7baa4f4 JH |
141 | #define DIFF_STATUS_COPIED 'C' |
142 | #define DIFF_STATUS_DELETED 'D' | |
143 | #define DIFF_STATUS_MODIFIED 'M' | |
144 | #define DIFF_STATUS_RENAMED 'R' | |
145 | #define DIFF_STATUS_TYPE_CHANGED 'T' | |
146 | #define DIFF_STATUS_UNKNOWN 'X' | |
147 | #define DIFF_STATUS_UNMERGED 'U' | |
148 | ||
149 | /* these are not diff-raw status letters proper, but used by | |
150 | * diffcore-filter insn to specify additional restrictions. | |
151 | */ | |
0b34379a | 152 | #define DIFF_STATUS_FILTER_AON '*' |
e7baa4f4 JH |
153 | #define DIFF_STATUS_FILTER_BROKEN 'B' |
154 | ||
47dd0d59 JH |
155 | extern const char *diff_unique_abbrev(const unsigned char *, int); |
156 | ||
86436c28 | 157 | #endif /* DIFF_H */ |