apply: allow-binary-replacement.
[git/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
LT
34 unsigned recursive:1,
35 tree_in_recursive:1;
6b5ee137
JH
36 int break_opt;
37 int detect_rename;
38 int find_copies_harder;
39 int line_termination;
40 int output_format;
41 int pickaxe_opts;
42 int rename_score;
43 int reverse_diff;
8082d8d3 44 int rename_limit;
6b5ee137 45 int setup;
ac1b3d12
LT
46
47 change_fn_t change;
48 add_remove_fn_t add_remove;
6b5ee137
JH
49};
50
ac1b3d12
LT
51extern void diff_tree_setup_paths(const char **paths);
52extern int diff_tree(struct tree_desc *t1, struct tree_desc *t2,
53 const char *base, struct diff_options *opt);
54extern int diff_tree_sha1(const unsigned char *old, const unsigned char *new,
55 const char *base, struct diff_options *opt);
56
6b5ee137
JH
57extern void diff_addremove(struct diff_options *,
58 int addremove,
77eb2720
JH
59 unsigned mode,
60 const unsigned char *sha1,
61 const char *base,
62 const char *path);
63
6b5ee137
JH
64extern void diff_change(struct diff_options *,
65 unsigned mode1, unsigned mode2,
66 const unsigned char *sha1,
67 const unsigned char *sha2,
68 const char *base, const char *path);
77eb2720 69
6b5ee137
JH
70extern void diff_unmerge(struct diff_options *,
71 const char *path);
77eb2720 72
57fe64a4
JH
73extern int diff_scoreopt_parse(const char *opt);
74
19feebc8 75#define DIFF_SETUP_REVERSE 1
f0c6b2a2
JH
76#define DIFF_SETUP_USE_CACHE 2
77#define DIFF_SETUP_USE_SIZE_CACHE 4
ce240675 78
6b5ee137
JH
79extern void diff_setup(struct diff_options *);
80extern int diff_opt_parse(struct diff_options *, const char **, int);
81extern int diff_setup_done(struct diff_options *);
86436c28 82
6b14d7fa
JH
83#define DIFF_DETECT_RENAME 1
84#define DIFF_DETECT_COPY 2
85
367cec1c 86#define DIFF_PICKAXE_ALL 1
f345b0a0 87
6b5ee137 88extern void diffcore_std(struct diff_options *);
f2ce9fde 89
6b5ee137 90extern void diffcore_std_no_resolve(struct diff_options *);
befe8639 91
dda2d79a
JH
92#define COMMON_DIFF_OPTIONS_HELP \
93"\ncommon diff options:\n" \
8082d8d3
JH
94" -z output diff-raw with lines terminated with NUL.\n" \
95" -p output patch format.\n" \
96" -u synonym for -p.\n" \
97" --name-only show only names of changed files.\n" \
946f5f7c 98" --name-status show names and status of changed files.\n" \
8082d8d3
JH
99" -R swap input file pairs.\n" \
100" -B detect complete rewrites.\n" \
101" -M detect renames.\n" \
102" -C detect copies.\n" \
dda2d79a 103" --find-copies-harder\n" \
8082d8d3
JH
104" try unchanged files as candidate for copy detection.\n" \
105" -l<n> limit rename attempts up to <n> paths.\n" \
106" -O<file> reorder diffs according to the <file>.\n" \
107" -S<string> find filepair whose only one side contains the string.\n" \
dda2d79a 108" --pickaxe-all\n" \
8082d8d3 109" show all files diff when -S is used and hit is found.\n"
dda2d79a 110
38c6f780
JH
111extern int diff_queue_is_empty(void);
112
e68b6f15 113#define DIFF_FORMAT_RAW 1
19feebc8
JH
114#define DIFF_FORMAT_PATCH 2
115#define DIFF_FORMAT_NO_OUTPUT 3
52f28529 116#define DIFF_FORMAT_NAME 4
946f5f7c 117#define DIFF_FORMAT_NAME_STATUS 5
19feebc8 118
6b5ee137 119extern void diff_flush(struct diff_options*);
86436c28 120
e7baa4f4 121/* diff-raw status letters */
ca8c9156 122#define DIFF_STATUS_ADDED 'A'
e7baa4f4
JH
123#define DIFF_STATUS_COPIED 'C'
124#define DIFF_STATUS_DELETED 'D'
125#define DIFF_STATUS_MODIFIED 'M'
126#define DIFF_STATUS_RENAMED 'R'
127#define DIFF_STATUS_TYPE_CHANGED 'T'
128#define DIFF_STATUS_UNKNOWN 'X'
129#define DIFF_STATUS_UNMERGED 'U'
130
131/* these are not diff-raw status letters proper, but used by
132 * diffcore-filter insn to specify additional restrictions.
133 */
0b34379a 134#define DIFF_STATUS_FILTER_AON '*'
e7baa4f4
JH
135#define DIFF_STATUS_FILTER_BROKEN 'B'
136
86436c28 137#endif /* DIFF_H */