git-am: Don't accept an mbox on stdin of we already have a .dotest directory
[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
1b0c7174 7#include "tree-walk.h"
50f9a858 8
91539833 9struct rev_info;
ac1b3d12
LT
10struct diff_options;
11
12typedef 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);
17
18typedef 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
c6744349
TH
23#define DIFF_FORMAT_RAW 0x0001
24#define DIFF_FORMAT_DIFFSTAT 0x0002
25#define DIFF_FORMAT_SUMMARY 0x0004
26#define DIFF_FORMAT_PATCH 0x0008
27
28/* These override all above */
29#define DIFF_FORMAT_NAME 0x0010
30#define DIFF_FORMAT_NAME_STATUS 0x0020
31#define DIFF_FORMAT_CHECKDIFF 0x0040
32
33/* 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
37
6b5ee137 38struct diff_options {
6b5ee137
JH
39 const char *filter;
40 const char *orderfile;
41 const char *pickaxe;
ac1b3d12 42 unsigned recursive:1,
80b1e511 43 tree_in_recursive:1,
0660626c 44 binary:1,
6d64ea96 45 text:1,
6973dcae
JH
46 full_index:1,
47 silent_on_remove:1,
4bbd261b 48 find_copies_harder:1,
cd112cef 49 color_diff:1;
ee1e5412 50 int context;
6b5ee137
JH
51 int break_opt;
52 int detect_rename;
6b5ee137
JH
53 int line_termination;
54 int output_format;
55 int pickaxe_opts;
56 int rename_score;
57 int reverse_diff;
8082d8d3 58 int rename_limit;
6b5ee137 59 int setup;
47dd0d59 60 int abbrev;
39bc9a6c 61 const char *msg_sep;
698ce6f8 62 const char *stat_sep;
0d21efa5 63 long xdl_opts;
ac1b3d12 64
a8baa7b9
JH
65 int nr_paths;
66 const char **paths;
67 int *pathlens;
ac1b3d12
LT
68 change_fn_t change;
69 add_remove_fn_t add_remove;
6b5ee137
JH
70};
71
698ce6f8
JS
72extern const char mime_boundary_leader[];
73
a8baa7b9
JH
74extern void diff_tree_setup_paths(const char **paths, struct diff_options *);
75extern void diff_tree_release_paths(struct diff_options *);
ac1b3d12
LT
76extern int diff_tree(struct tree_desc *t1, struct tree_desc *t2,
77 const char *base, struct diff_options *opt);
78extern int diff_tree_sha1(const unsigned char *old, const unsigned char *new,
79 const char *base, struct diff_options *opt);
80
ea726d02
JH
81struct combine_diff_path {
82 struct combine_diff_path *next;
83 int len;
84 char *path;
2454c962 85 unsigned int mode;
ea726d02 86 unsigned char sha1[20];
2454c962 87 struct combine_diff_parent {
d416df88 88 char status;
2454c962
JH
89 unsigned int mode;
90 unsigned char sha1[20];
91 } parent[FLEX_ARRAY];
ea726d02 92};
2454c962
JH
93#define combine_diff_path_size(n, l) \
94 (sizeof(struct combine_diff_path) + \
95 sizeof(struct combine_diff_parent) * (n) + (l) + 1)
ea726d02 96
91539833
LT
97extern void show_combined_diff(struct combine_diff_path *elem, int num_parent,
98 int dense, struct rev_info *);
ea726d02 99
0fe7c1de
JH
100extern void diff_tree_combined(const unsigned char *sha1, const unsigned char parent[][20], int num_parent, int dense, struct rev_info *rev);
101
91539833 102extern void diff_tree_combined_merge(const unsigned char *sha1, int, struct rev_info *);
af3feefa 103
6b5ee137
JH
104extern void diff_addremove(struct diff_options *,
105 int addremove,
77eb2720
JH
106 unsigned mode,
107 const unsigned char *sha1,
108 const char *base,
109 const char *path);
110
6b5ee137
JH
111extern void diff_change(struct diff_options *,
112 unsigned mode1, unsigned mode2,
113 const unsigned char *sha1,
114 const unsigned char *sha2,
115 const char *base, const char *path);
77eb2720 116
6b5ee137
JH
117extern void diff_unmerge(struct diff_options *,
118 const char *path);
77eb2720 119
57fe64a4
JH
120extern int diff_scoreopt_parse(const char *opt);
121
19feebc8 122#define DIFF_SETUP_REVERSE 1
f0c6b2a2
JH
123#define DIFF_SETUP_USE_CACHE 2
124#define DIFF_SETUP_USE_SIZE_CACHE 4
ce240675 125
83ad63cf 126extern int git_diff_ui_config(const char *var, const char *value);
6b5ee137
JH
127extern void diff_setup(struct diff_options *);
128extern int diff_opt_parse(struct diff_options *, const char **, int);
129extern int diff_setup_done(struct diff_options *);
86436c28 130
6b14d7fa
JH
131#define DIFF_DETECT_RENAME 1
132#define DIFF_DETECT_COPY 2
133
367cec1c 134#define DIFF_PICKAXE_ALL 1
d01d8c67 135#define DIFF_PICKAXE_REGEX 2
f345b0a0 136
6b5ee137 137extern void diffcore_std(struct diff_options *);
f2ce9fde 138
6b5ee137 139extern void diffcore_std_no_resolve(struct diff_options *);
befe8639 140
dda2d79a
JH
141#define COMMON_DIFF_OPTIONS_HELP \
142"\ncommon diff options:\n" \
8082d8d3
JH
143" -z output diff-raw with lines terminated with NUL.\n" \
144" -p output patch format.\n" \
145" -u synonym for -p.\n" \
5c91da25
PB
146" --patch-with-raw\n" \
147" output both a patch and the diff-raw format.\n" \
d75f7952 148" --stat show diffstat instead of patch.\n" \
29353273
JS
149" --patch-with-stat\n" \
150" output a patch and prepend its diffstat.\n" \
8082d8d3 151" --name-only show only names of changed files.\n" \
946f5f7c 152" --name-status show names and status of changed files.\n" \
47dd0d59 153" --full-index show full object name on index lines.\n" \
913419fc 154" --abbrev=<n> abbreviate object names in diff-tree header and diff-raw.\n" \
8082d8d3
JH
155" -R swap input file pairs.\n" \
156" -B detect complete rewrites.\n" \
157" -M detect renames.\n" \
158" -C detect copies.\n" \
dda2d79a 159" --find-copies-harder\n" \
8082d8d3
JH
160" try unchanged files as candidate for copy detection.\n" \
161" -l<n> limit rename attempts up to <n> paths.\n" \
162" -O<file> reorder diffs according to the <file>.\n" \
163" -S<string> find filepair whose only one side contains the string.\n" \
dda2d79a 164" --pickaxe-all\n" \
ca49920f
SF
165" show all files diff when -S is used and hit is found.\n" \
166" -a --text treat all files as text.\n"
dda2d79a 167
38c6f780 168extern int diff_queue_is_empty(void);
6b5ee137 169extern void diff_flush(struct diff_options*);
86436c28 170
e7baa4f4 171/* diff-raw status letters */
ca8c9156 172#define DIFF_STATUS_ADDED 'A'
e7baa4f4
JH
173#define DIFF_STATUS_COPIED 'C'
174#define DIFF_STATUS_DELETED 'D'
175#define DIFF_STATUS_MODIFIED 'M'
176#define DIFF_STATUS_RENAMED 'R'
177#define DIFF_STATUS_TYPE_CHANGED 'T'
178#define DIFF_STATUS_UNKNOWN 'X'
179#define DIFF_STATUS_UNMERGED 'U'
180
181/* these are not diff-raw status letters proper, but used by
182 * diffcore-filter insn to specify additional restrictions.
183 */
0b34379a 184#define DIFF_STATUS_FILTER_AON '*'
e7baa4f4
JH
185#define DIFF_STATUS_FILTER_BROKEN 'B'
186
47dd0d59
JH
187extern const char *diff_unique_abbrev(const unsigned char *, int);
188
6973dcae
JH
189extern int run_diff_files(struct rev_info *revs, int silent_on_removed);
190
5c21ac0e 191extern int run_diff_index(struct rev_info *revs, int cached);
e09ad6e1 192
fcb3d0ad
JS
193extern int diff_flush_patch_id(struct diff_options *, unsigned char *);
194
86436c28 195#endif /* DIFF_H */