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