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