Make "--parents" logs also be incremental
[git/mergetool.git] / diff.h
blob0cebec113f69e05debfe3ab20327aa6c4d0a3020
1 /*
2 * Copyright (C) 2005 Junio C Hamano
3 */
4 #ifndef DIFF_H
5 #define DIFF_H
7 #include "tree-walk.h"
9 struct diff_options;
11 typedef 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);
17 typedef 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);
22 struct diff_options {
23 const char **paths;
24 const char *filter;
25 const char *orderfile;
26 const char *pickaxe;
27 unsigned recursive:1,
28 tree_in_recursive:1,
29 full_index:1;
30 int break_opt;
31 int detect_rename;
32 int find_copies_harder;
33 int line_termination;
34 int output_format;
35 int pickaxe_opts;
36 int rename_score;
37 int reverse_diff;
38 int rename_limit;
39 int setup;
40 int abbrev;
42 change_fn_t change;
43 add_remove_fn_t add_remove;
46 extern void diff_tree_setup_paths(const char **paths);
47 extern int diff_tree(struct tree_desc *t1, struct tree_desc *t2,
48 const char *base, struct diff_options *opt);
49 extern int diff_tree_sha1(const unsigned char *old, const unsigned char *new,
50 const char *base, struct diff_options *opt);
52 struct combine_diff_path {
53 struct combine_diff_path *next;
54 int len;
55 char *path;
56 unsigned int mode;
57 unsigned char sha1[20];
58 struct combine_diff_parent {
59 char status;
60 unsigned int mode;
61 unsigned char sha1[20];
62 } parent[FLEX_ARRAY];
64 #define combine_diff_path_size(n, l) \
65 (sizeof(struct combine_diff_path) + \
66 sizeof(struct combine_diff_parent) * (n) + (l) + 1)
68 extern int show_combined_diff(struct combine_diff_path *elem, int num_parent,
69 int dense, const char *header,
70 struct diff_options *);
72 extern const char *diff_tree_combined_merge(const unsigned char *sha1, const char *, int, struct diff_options *opt);
74 extern void diff_addremove(struct diff_options *,
75 int addremove,
76 unsigned mode,
77 const unsigned char *sha1,
78 const char *base,
79 const char *path);
81 extern void diff_change(struct diff_options *,
82 unsigned mode1, unsigned mode2,
83 const unsigned char *sha1,
84 const unsigned char *sha2,
85 const char *base, const char *path);
87 extern void diff_unmerge(struct diff_options *,
88 const char *path);
90 extern int diff_scoreopt_parse(const char *opt);
92 #define DIFF_SETUP_REVERSE 1
93 #define DIFF_SETUP_USE_CACHE 2
94 #define DIFF_SETUP_USE_SIZE_CACHE 4
96 extern int git_diff_config(const char *var, const char *value);
97 extern void diff_setup(struct diff_options *);
98 extern int diff_opt_parse(struct diff_options *, const char **, int);
99 extern int diff_setup_done(struct diff_options *);
101 #define DIFF_DETECT_RENAME 1
102 #define DIFF_DETECT_COPY 2
104 #define DIFF_PICKAXE_ALL 1
105 #define DIFF_PICKAXE_REGEX 2
107 extern void diffcore_std(struct diff_options *);
109 extern void diffcore_std_no_resolve(struct diff_options *);
111 #define COMMON_DIFF_OPTIONS_HELP \
112 "\ncommon diff options:\n" \
113 " -z output diff-raw with lines terminated with NUL.\n" \
114 " -p output patch format.\n" \
115 " -u synonym for -p.\n" \
116 " --name-only show only names of changed files.\n" \
117 " --name-status show names and status of changed files.\n" \
118 " --full-index show full object name on index lines.\n" \
119 " --abbrev=<n> abbreviate object names in diff-tree header and diff-raw.\n" \
120 " -R swap input file pairs.\n" \
121 " -B detect complete rewrites.\n" \
122 " -M detect renames.\n" \
123 " -C detect copies.\n" \
124 " --find-copies-harder\n" \
125 " try unchanged files as candidate for copy detection.\n" \
126 " -l<n> limit rename attempts up to <n> paths.\n" \
127 " -O<file> reorder diffs according to the <file>.\n" \
128 " -S<string> find filepair whose only one side contains the string.\n" \
129 " --pickaxe-all\n" \
130 " show all files diff when -S is used and hit is found.\n"
132 extern int diff_queue_is_empty(void);
134 #define DIFF_FORMAT_RAW 1
135 #define DIFF_FORMAT_PATCH 2
136 #define DIFF_FORMAT_NO_OUTPUT 3
137 #define DIFF_FORMAT_NAME 4
138 #define DIFF_FORMAT_NAME_STATUS 5
140 extern void diff_flush(struct diff_options*);
142 /* diff-raw status letters */
143 #define DIFF_STATUS_ADDED 'A'
144 #define DIFF_STATUS_COPIED 'C'
145 #define DIFF_STATUS_DELETED 'D'
146 #define DIFF_STATUS_MODIFIED 'M'
147 #define DIFF_STATUS_RENAMED 'R'
148 #define DIFF_STATUS_TYPE_CHANGED 'T'
149 #define DIFF_STATUS_UNKNOWN 'X'
150 #define DIFF_STATUS_UNMERGED 'U'
152 /* these are not diff-raw status letters proper, but used by
153 * diffcore-filter insn to specify additional restrictions.
155 #define DIFF_STATUS_FILTER_AON '*'
156 #define DIFF_STATUS_FILTER_BROKEN 'B'
158 extern const char *diff_unique_abbrev(const unsigned char *, int);
160 #endif /* DIFF_H */