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