1/*
2 * Copyright (C) 2005 Junio C Hamano
3 */
4#ifndef DIFF_H
5#define DIFF_H
6#include "tree-walk.h"
8struct rev_info;
10struct diff_options;
11typedef 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);
17typedef 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#define DIFF_FORMAT_RAW 0x0001
24#define DIFF_FORMAT_DIFFSTAT 0x0002
25#define DIFF_FORMAT_SUMMARY 0x0004
26#define DIFF_FORMAT_PATCH 0x0008
27/* These override all above */
29#define DIFF_FORMAT_NAME 0x0010
30#define DIFF_FORMAT_NAME_STATUS 0x0020
31#define DIFF_FORMAT_CHECKDIFF 0x0040
32/* Same as output_format = 0 but we know that -s flag was given
34 * and we should not give default value to output_format.
35 */
36#define DIFF_FORMAT_NO_OUTPUT 0x0080
37struct diff_options {
39 const char *filter;
40 const char *orderfile;
41 const char *pickaxe;
42 unsigned recursive:1,
43 tree_in_recursive:1,
44 binary:1,
45 full_index:1,
46 silent_on_remove:1,
47 find_copies_harder:1,
48 color_diff:1;
49 int context;
50 int break_opt;
51 int detect_rename;
52 int line_termination;
53 int output_format;
54 int pickaxe_opts;
55 int rename_score;
56 int reverse_diff;
57 int rename_limit;
58 int setup;
59 int abbrev;
60 const char *stat_sep;
61 long xdl_opts;
62 int nr_paths;
64 const char **paths;
65 int *pathlens;
66 change_fn_t change;
67 add_remove_fn_t add_remove;
68};
69extern const char mime_boundary_leader[];
71extern void diff_tree_setup_paths(const char **paths, struct diff_options *);
73extern void diff_tree_release_paths(struct diff_options *);
74extern int diff_tree(struct tree_desc *t1, struct tree_desc *t2,
75 const char *base, struct diff_options *opt);
76extern int diff_tree_sha1(const unsigned char *old, const unsigned char *new,
77 const char *base, struct diff_options *opt);
78struct combine_diff_path {
80 struct combine_diff_path *next;
81 int len;
82 char *path;
83 unsigned int mode;
84 unsigned char sha1[20];
85 struct combine_diff_parent {
86 char status;
87 unsigned int mode;
88 unsigned char sha1[20];
89 } parent[FLEX_ARRAY];
90};
91#define combine_diff_path_size(n, l) \
92 (sizeof(struct combine_diff_path) + \
93 sizeof(struct combine_diff_parent) * (n) + (l) + 1)
94extern void show_combined_diff(struct combine_diff_path *elem, int num_parent,
96 int dense, struct rev_info *);
97extern void diff_tree_combined(const unsigned char *sha1, const unsigned char parent[][20], int num_parent, int dense, struct rev_info *rev);
99extern void diff_tree_combined_merge(const unsigned char *sha1, int, struct rev_info *);
101extern void diff_addremove(struct diff_options *,
103 int addremove,
104 unsigned mode,
105 const unsigned char *sha1,
106 const char *base,
107 const char *path);
108extern void diff_change(struct diff_options *,
110 unsigned mode1, unsigned mode2,
111 const unsigned char *sha1,
112 const unsigned char *sha2,
113 const char *base, const char *path);
114extern void diff_unmerge(struct diff_options *,
116 const char *path);
117extern int diff_scoreopt_parse(const char *opt);
119#define DIFF_SETUP_REVERSE 1
121#define DIFF_SETUP_USE_CACHE 2
122#define DIFF_SETUP_USE_SIZE_CACHE 4
123extern int git_diff_config(const char *var, const char *value);
125extern void diff_setup(struct diff_options *);
126extern int diff_opt_parse(struct diff_options *, const char **, int);
127extern int diff_setup_done(struct diff_options *);
128#define DIFF_DETECT_RENAME 1
130#define DIFF_DETECT_COPY 2
131#define DIFF_PICKAXE_ALL 1
133#define DIFF_PICKAXE_REGEX 2
134extern void diffcore_std(struct diff_options *);
136extern void diffcore_std_no_resolve(struct diff_options *);
138#define COMMON_DIFF_OPTIONS_HELP \
140"\ncommon diff options:\n" \
141" -z output diff-raw with lines terminated with NUL.\n" \
142" -p output patch format.\n" \
143" -u synonym for -p.\n" \
144" --patch-with-raw\n" \
145" output both a patch and the diff-raw format.\n" \
146" --stat show diffstat instead of patch.\n" \
147" --patch-with-stat\n" \
148" output a patch and prepend its diffstat.\n" \
149" --name-only show only names of changed files.\n" \
150" --name-status show names and status of changed files.\n" \
151" --full-index show full object name on index lines.\n" \
152" --abbrev=<n> abbreviate object names in diff-tree header and diff-raw.\n" \
153" -R swap input file pairs.\n" \
154" -B detect complete rewrites.\n" \
155" -M detect renames.\n" \
156" -C detect copies.\n" \
157" --find-copies-harder\n" \
158" try unchanged files as candidate for copy detection.\n" \
159" -l<n> limit rename attempts up to <n> paths.\n" \
160" -O<file> reorder diffs according to the <file>.\n" \
161" -S<string> find filepair whose only one side contains the string.\n" \
162" --pickaxe-all\n" \
163" show all files diff when -S is used and hit is found.\n"
164extern int diff_queue_is_empty(void);
166extern void diff_flush(struct diff_options*);
167/* diff-raw status letters */
169#define DIFF_STATUS_ADDED 'A'
170#define DIFF_STATUS_COPIED 'C'
171#define DIFF_STATUS_DELETED 'D'
172#define DIFF_STATUS_MODIFIED 'M'
173#define DIFF_STATUS_RENAMED 'R'
174#define DIFF_STATUS_TYPE_CHANGED 'T'
175#define DIFF_STATUS_UNKNOWN 'X'
176#define DIFF_STATUS_UNMERGED 'U'
177/* these are not diff-raw status letters proper, but used by
179 * diffcore-filter insn to specify additional restrictions.
180 */
181#define DIFF_STATUS_FILTER_AON '*'
182#define DIFF_STATUS_FILTER_BROKEN 'B'
183extern const char *diff_unique_abbrev(const unsigned char *, int);
185extern int run_diff_files(struct rev_info *revs, int silent_on_removed);
187extern int run_diff_index(struct rev_info *revs, int cached);
189#endif /* DIFF_H */