Merge branch 'fix'
[git/git.git] / diff.h
1 /*
2 * Copyright (C) 2005 Junio C Hamano
3 */
4 #ifndef DIFF_H
5 #define DIFF_H
6
7 #include "tree-walk.h"
8
9 struct rev_info;
10 struct diff_options;
11
12 typedef void (*change_fn_t)(struct diff_options *options,
13 unsigned old_mode, unsigned new_mode,
14 const unsigned char *old_sha1,
15 const unsigned char *new_sha1,
16 const char *base, const char *path);
17
18 typedef void (*add_remove_fn_t)(struct diff_options *options,
19 int addremove, unsigned mode,
20 const unsigned char *sha1,
21 const char *base, const char *path);
22
23 struct diff_options {
24 const char *filter;
25 const char *orderfile;
26 const char *pickaxe;
27 unsigned recursive:1,
28 with_raw:1,
29 with_stat:1,
30 tree_in_recursive:1,
31 full_index:1,
32 silent_on_remove:1,
33 find_copies_harder:1;
34 int break_opt;
35 int detect_rename;
36 int line_termination;
37 int output_format;
38 int pickaxe_opts;
39 int rename_score;
40 int reverse_diff;
41 int rename_limit;
42 int setup;
43 int abbrev;
44
45 int nr_paths;
46 const char **paths;
47 int *pathlens;
48 change_fn_t change;
49 add_remove_fn_t add_remove;
50 };
51
52 extern void diff_tree_setup_paths(const char **paths, struct diff_options *);
53 extern void diff_tree_release_paths(struct diff_options *);
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
59 struct combine_diff_path {
60 struct combine_diff_path *next;
61 int len;
62 char *path;
63 unsigned int mode;
64 unsigned char sha1[20];
65 struct combine_diff_parent {
66 char status;
67 unsigned int mode;
68 unsigned char sha1[20];
69 } parent[FLEX_ARRAY];
70 };
71 #define combine_diff_path_size(n, l) \
72 (sizeof(struct combine_diff_path) + \
73 sizeof(struct combine_diff_parent) * (n) + (l) + 1)
74
75 extern void show_combined_diff(struct combine_diff_path *elem, int num_parent,
76 int dense, struct rev_info *);
77
78 extern void diff_tree_combined(const unsigned char *sha1, const unsigned char parent[][20], int num_parent, int dense, struct rev_info *rev);
79
80 extern void diff_tree_combined_merge(const unsigned char *sha1, int, struct rev_info *);
81
82 extern void diff_addremove(struct diff_options *,
83 int addremove,
84 unsigned mode,
85 const unsigned char *sha1,
86 const char *base,
87 const char *path);
88
89 extern void diff_change(struct diff_options *,
90 unsigned mode1, unsigned mode2,
91 const unsigned char *sha1,
92 const unsigned char *sha2,
93 const char *base, const char *path);
94
95 extern void diff_unmerge(struct diff_options *,
96 const char *path);
97
98 extern int diff_scoreopt_parse(const char *opt);
99
100 #define DIFF_SETUP_REVERSE 1
101 #define DIFF_SETUP_USE_CACHE 2
102 #define DIFF_SETUP_USE_SIZE_CACHE 4
103
104 extern int git_diff_config(const char *var, const char *value);
105 extern void diff_setup(struct diff_options *);
106 extern int diff_opt_parse(struct diff_options *, const char **, int);
107 extern int diff_setup_done(struct diff_options *);
108
109 #define DIFF_DETECT_RENAME 1
110 #define DIFF_DETECT_COPY 2
111
112 #define DIFF_PICKAXE_ALL 1
113 #define DIFF_PICKAXE_REGEX 2
114
115 extern void diffcore_std(struct diff_options *);
116
117 extern void diffcore_std_no_resolve(struct diff_options *);
118
119 #define COMMON_DIFF_OPTIONS_HELP \
120 "\ncommon diff options:\n" \
121 " -z output diff-raw with lines terminated with NUL.\n" \
122 " -p output patch format.\n" \
123 " -u synonym for -p.\n" \
124 " --patch-with-raw\n" \
125 " output both a patch and the diff-raw format.\n" \
126 " --stat show diffstat instead of patch.\n" \
127 " --patch-with-stat\n" \
128 " output a patch and prepend its diffstat.\n" \
129 " --name-only show only names of changed files.\n" \
130 " --name-status show names and status of changed files.\n" \
131 " --full-index show full object name on index lines.\n" \
132 " --abbrev=<n> abbreviate object names in diff-tree header and diff-raw.\n" \
133 " -R swap input file pairs.\n" \
134 " -B detect complete rewrites.\n" \
135 " -M detect renames.\n" \
136 " -C detect copies.\n" \
137 " --find-copies-harder\n" \
138 " try unchanged files as candidate for copy detection.\n" \
139 " -l<n> limit rename attempts up to <n> paths.\n" \
140 " -O<file> reorder diffs according to the <file>.\n" \
141 " -S<string> find filepair whose only one side contains the string.\n" \
142 " --pickaxe-all\n" \
143 " show all files diff when -S is used and hit is found.\n"
144
145 extern int diff_queue_is_empty(void);
146
147 #define DIFF_FORMAT_RAW 1
148 #define DIFF_FORMAT_PATCH 2
149 #define DIFF_FORMAT_NO_OUTPUT 3
150 #define DIFF_FORMAT_NAME 4
151 #define DIFF_FORMAT_NAME_STATUS 5
152 #define DIFF_FORMAT_DIFFSTAT 6
153
154 extern void diff_flush(struct diff_options*);
155
156 /* diff-raw status letters */
157 #define DIFF_STATUS_ADDED 'A'
158 #define DIFF_STATUS_COPIED 'C'
159 #define DIFF_STATUS_DELETED 'D'
160 #define DIFF_STATUS_MODIFIED 'M'
161 #define DIFF_STATUS_RENAMED 'R'
162 #define DIFF_STATUS_TYPE_CHANGED 'T'
163 #define DIFF_STATUS_UNKNOWN 'X'
164 #define DIFF_STATUS_UNMERGED 'U'
165
166 /* these are not diff-raw status letters proper, but used by
167 * diffcore-filter insn to specify additional restrictions.
168 */
169 #define DIFF_STATUS_FILTER_AON '*'
170 #define DIFF_STATUS_FILTER_BROKEN 'B'
171
172 extern const char *diff_unique_abbrev(const unsigned char *, int);
173
174 extern int run_diff_files(struct rev_info *revs, int silent_on_removed);
175
176 extern int run_diff_index(struct rev_info *revs, int cached);
177
178 #endif /* DIFF_H */