Merge branch 'master' into jc/diff
[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
ac1b3d12
LT
9struct diff_options;
10
11typedef void (*change_fn_t)(struct diff_options *options,
12 unsigned old_mode, unsigned new_mode,
13 const unsigned char *old_sha1,
14 const unsigned char *new_sha1,
15 const char *base, const char *path);
16
17typedef void (*add_remove_fn_t)(struct diff_options *options,
18 int addremove, unsigned mode,
19 const unsigned char *sha1,
20 const char *base, const char *path);
21
6b5ee137 22struct diff_options {
6b5ee137
JH
23 const char *filter;
24 const char *orderfile;
25 const char *pickaxe;
ac1b3d12 26 unsigned recursive:1,
80b1e511
JH
27 tree_in_recursive:1,
28 full_index:1;
6b5ee137
JH
29 int break_opt;
30 int detect_rename;
31 int find_copies_harder;
32 int line_termination;
33 int output_format;
34 int pickaxe_opts;
35 int rename_score;
36 int reverse_diff;
8082d8d3 37 int rename_limit;
6b5ee137 38 int setup;
47dd0d59 39 int abbrev;
ac1b3d12
LT
40
41 change_fn_t change;
42 add_remove_fn_t add_remove;
6b5ee137
JH
43};
44
ac1b3d12
LT
45extern void diff_tree_setup_paths(const char **paths);
46extern int diff_tree(struct tree_desc *t1, struct tree_desc *t2,
47 const char *base, struct diff_options *opt);
48extern int diff_tree_sha1(const unsigned char *old, const unsigned char *new,
49 const char *base, struct diff_options *opt);
50
ea726d02
JH
51struct combine_diff_path {
52 struct combine_diff_path *next;
53 int len;
54 char *path;
2454c962 55 unsigned int mode;
ea726d02 56 unsigned char sha1[20];
2454c962 57 struct combine_diff_parent {
d416df88 58 char status;
2454c962
JH
59 unsigned int mode;
60 unsigned char sha1[20];
61 } parent[FLEX_ARRAY];
ea726d02 62};
2454c962
JH
63#define combine_diff_path_size(n, l) \
64 (sizeof(struct combine_diff_path) + \
65 sizeof(struct combine_diff_parent) * (n) + (l) + 1)
ea726d02 66
ee638024 67extern int show_combined_diff(struct combine_diff_path *elem, int num_parent,
0a798076
JH
68 int dense, const char *header,
69 struct diff_options *);
ea726d02 70
ee638024 71extern const char *diff_tree_combined_merge(const unsigned char *sha1, const char *, int, struct diff_options *opt);
af3feefa 72
6b5ee137
JH
73extern void diff_addremove(struct diff_options *,
74 int addremove,
77eb2720
JH
75 unsigned mode,
76 const unsigned char *sha1,
77 const char *base,
78 const char *path);
79
6b5ee137
JH
80extern void diff_change(struct diff_options *,
81 unsigned mode1, unsigned mode2,
82 const unsigned char *sha1,
83 const unsigned char *sha2,
84 const char *base, const char *path);
77eb2720 85
6b5ee137
JH
86extern void diff_unmerge(struct diff_options *,
87 const char *path);
77eb2720 88
57fe64a4
JH
89extern int diff_scoreopt_parse(const char *opt);
90
19feebc8 91#define DIFF_SETUP_REVERSE 1
f0c6b2a2
JH
92#define DIFF_SETUP_USE_CACHE 2
93#define DIFF_SETUP_USE_SIZE_CACHE 4
ce240675 94
9ce392f4 95extern int git_diff_config(const char *var, const char *value);
6b5ee137
JH
96extern void diff_setup(struct diff_options *);
97extern int diff_opt_parse(struct diff_options *, const char **, int);
98extern int diff_setup_done(struct diff_options *);
86436c28 99
6b14d7fa
JH
100#define DIFF_DETECT_RENAME 1
101#define DIFF_DETECT_COPY 2
102
367cec1c 103#define DIFF_PICKAXE_ALL 1
d01d8c67 104#define DIFF_PICKAXE_REGEX 2
f345b0a0 105
6b5ee137 106extern void diffcore_std(struct diff_options *);
f2ce9fde 107
6b5ee137 108extern void diffcore_std_no_resolve(struct diff_options *);
befe8639 109
dda2d79a
JH
110#define COMMON_DIFF_OPTIONS_HELP \
111"\ncommon diff options:\n" \
8082d8d3
JH
112" -z output diff-raw with lines terminated with NUL.\n" \
113" -p output patch format.\n" \
114" -u synonym for -p.\n" \
115" --name-only show only names of changed files.\n" \
946f5f7c 116" --name-status show names and status of changed files.\n" \
47dd0d59 117" --full-index show full object name on index lines.\n" \
913419fc 118" --abbrev=<n> abbreviate object names in diff-tree header and diff-raw.\n" \
8082d8d3
JH
119" -R swap input file pairs.\n" \
120" -B detect complete rewrites.\n" \
121" -M detect renames.\n" \
122" -C detect copies.\n" \
dda2d79a 123" --find-copies-harder\n" \
8082d8d3
JH
124" try unchanged files as candidate for copy detection.\n" \
125" -l<n> limit rename attempts up to <n> paths.\n" \
126" -O<file> reorder diffs according to the <file>.\n" \
127" -S<string> find filepair whose only one side contains the string.\n" \
dda2d79a 128" --pickaxe-all\n" \
8082d8d3 129" show all files diff when -S is used and hit is found.\n"
dda2d79a 130
38c6f780
JH
131extern int diff_queue_is_empty(void);
132
e68b6f15 133#define DIFF_FORMAT_RAW 1
19feebc8
JH
134#define DIFF_FORMAT_PATCH 2
135#define DIFF_FORMAT_NO_OUTPUT 3
52f28529 136#define DIFF_FORMAT_NAME 4
946f5f7c 137#define DIFF_FORMAT_NAME_STATUS 5
19feebc8 138
6b5ee137 139extern void diff_flush(struct diff_options*);
86436c28 140
e7baa4f4 141/* diff-raw status letters */
ca8c9156 142#define DIFF_STATUS_ADDED 'A'
e7baa4f4
JH
143#define DIFF_STATUS_COPIED 'C'
144#define DIFF_STATUS_DELETED 'D'
145#define DIFF_STATUS_MODIFIED 'M'
146#define DIFF_STATUS_RENAMED 'R'
147#define DIFF_STATUS_TYPE_CHANGED 'T'
148#define DIFF_STATUS_UNKNOWN 'X'
149#define DIFF_STATUS_UNMERGED 'U'
150
151/* these are not diff-raw status letters proper, but used by
152 * diffcore-filter insn to specify additional restrictions.
153 */
0b34379a 154#define DIFF_STATUS_FILTER_AON '*'
e7baa4f4
JH
155#define DIFF_STATUS_FILTER_BROKEN 'B'
156
47dd0d59
JH
157extern const char *diff_unique_abbrev(const unsigned char *, int);
158
86436c28 159#endif /* DIFF_H */