2 * Copyright (C) 2005 Junio C Hamano
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
);
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
);
25 const char *orderfile
;
53 add_remove_fn_t add_remove
;
56 extern const char mime_boundary_leader
[];
58 extern void diff_tree_setup_paths(const char **paths
, struct diff_options
*);
59 extern void diff_tree_release_paths(struct diff_options
*);
60 extern int diff_tree(struct tree_desc
*t1
, struct tree_desc
*t2
,
61 const char *base
, struct diff_options
*opt
);
62 extern int diff_tree_sha1(const unsigned char *old
, const unsigned char *new,
63 const char *base
, struct diff_options
*opt
);
65 struct combine_diff_path
{
66 struct combine_diff_path
*next
;
70 unsigned char sha1
[20];
71 struct combine_diff_parent
{
74 unsigned char sha1
[20];
77 #define combine_diff_path_size(n, l) \
78 (sizeof(struct combine_diff_path) + \
79 sizeof(struct combine_diff_parent) * (n) + (l) + 1)
81 extern void show_combined_diff(struct combine_diff_path
*elem
, int num_parent
,
82 int dense
, struct rev_info
*);
84 extern void diff_tree_combined(const unsigned char *sha1
, const unsigned char parent
[][20], int num_parent
, int dense
, struct rev_info
*rev
);
86 extern void diff_tree_combined_merge(const unsigned char *sha1
, int, struct rev_info
*);
88 extern void diff_addremove(struct diff_options
*,
91 const unsigned char *sha1
,
95 extern void diff_change(struct diff_options
*,
96 unsigned mode1
, unsigned mode2
,
97 const unsigned char *sha1
,
98 const unsigned char *sha2
,
99 const char *base
, const char *path
);
101 extern void diff_unmerge(struct diff_options
*,
104 extern int diff_scoreopt_parse(const char *opt
);
106 #define DIFF_SETUP_REVERSE 1
107 #define DIFF_SETUP_USE_CACHE 2
108 #define DIFF_SETUP_USE_SIZE_CACHE 4
110 extern int git_diff_config(const char *var
, const char *value
);
111 extern void diff_setup(struct diff_options
*);
112 extern int diff_opt_parse(struct diff_options
*, const char **, int);
113 extern int diff_setup_done(struct diff_options
*);
115 #define DIFF_DETECT_RENAME 1
116 #define DIFF_DETECT_COPY 2
118 #define DIFF_PICKAXE_ALL 1
119 #define DIFF_PICKAXE_REGEX 2
121 extern void diffcore_std(struct diff_options
*);
123 extern void diffcore_std_no_resolve(struct diff_options
*);
125 #define COMMON_DIFF_OPTIONS_HELP \
126 "\ncommon diff options:\n" \
127 " -z output diff-raw with lines terminated with NUL.\n" \
128 " -p output patch format.\n" \
129 " -u synonym for -p.\n" \
130 " --patch-with-raw\n" \
131 " output both a patch and the diff-raw format.\n" \
132 " --stat show diffstat instead of patch.\n" \
133 " --patch-with-stat\n" \
134 " output a patch and prepend its diffstat.\n" \
135 " --name-only show only names of changed files.\n" \
136 " --name-status show names and status of changed files.\n" \
137 " --full-index show full object name on index lines.\n" \
138 " --abbrev=<n> abbreviate object names in diff-tree header and diff-raw.\n" \
139 " -R swap input file pairs.\n" \
140 " -B detect complete rewrites.\n" \
141 " -M detect renames.\n" \
142 " -C detect copies.\n" \
143 " --find-copies-harder\n" \
144 " try unchanged files as candidate for copy detection.\n" \
145 " -l<n> limit rename attempts up to <n> paths.\n" \
146 " -O<file> reorder diffs according to the <file>.\n" \
147 " -S<string> find filepair whose only one side contains the string.\n" \
149 " show all files diff when -S is used and hit is found.\n"
151 extern int diff_queue_is_empty(void);
153 #define DIFF_FORMAT_RAW 1
154 #define DIFF_FORMAT_PATCH 2
155 #define DIFF_FORMAT_NO_OUTPUT 3
156 #define DIFF_FORMAT_NAME 4
157 #define DIFF_FORMAT_NAME_STATUS 5
158 #define DIFF_FORMAT_DIFFSTAT 6
159 #define DIFF_FORMAT_CHECKDIFF 7
161 extern void diff_flush(struct diff_options
*);
163 /* diff-raw status letters */
164 #define DIFF_STATUS_ADDED 'A'
165 #define DIFF_STATUS_COPIED 'C'
166 #define DIFF_STATUS_DELETED 'D'
167 #define DIFF_STATUS_MODIFIED 'M'
168 #define DIFF_STATUS_RENAMED 'R'
169 #define DIFF_STATUS_TYPE_CHANGED 'T'
170 #define DIFF_STATUS_UNKNOWN 'X'
171 #define DIFF_STATUS_UNMERGED 'U'
173 /* these are not diff-raw status letters proper, but used by
174 * diffcore-filter insn to specify additional restrictions.
176 #define DIFF_STATUS_FILTER_AON '*'
177 #define DIFF_STATUS_FILTER_BROKEN 'B'
179 extern const char *diff_unique_abbrev(const unsigned char *, int);
181 extern int run_diff_files(struct rev_info
*revs
, int silent_on_removed
);
183 extern int run_diff_index(struct rev_info
*revs
, int cached
);