diff-files: -c and --cc options.
[git.git] / diff.h
1 /*
2  * Copyright (C) 2005 Junio C Hamano
3  */
4 #ifndef DIFF_H
5 #define DIFF_H
6
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
11 struct tree_desc {
12         void *buf;
13         unsigned long size;
14 };
15
16 struct diff_options;
17
18 typedef 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
24 typedef 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
29 struct diff_options {
30         const char **paths;
31         const char *filter;
32         const char *orderfile;
33         const char *pickaxe;
34         unsigned recursive:1,
35                  tree_in_recursive:1,
36                  full_index:1;
37         int break_opt;
38         int detect_rename;
39         int find_copies_harder;
40         int line_termination;
41         int output_format;
42         int pickaxe_opts;
43         int rename_score;
44         int reverse_diff;
45         int rename_limit;
46         int setup;
47         int abbrev;
48
49         change_fn_t change;
50         add_remove_fn_t add_remove;
51 };
52
53 extern void diff_tree_setup_paths(const char **paths);
54 extern int diff_tree(struct tree_desc *t1, struct tree_desc *t2,
55                      const char *base, struct diff_options *opt);
56 extern int diff_tree_sha1(const unsigned char *old, const unsigned char *new,
57                           const char *base, struct diff_options *opt);
58
59 struct combine_diff_path {
60         struct combine_diff_path *next;
61         int len;
62         char *path;
63         unsigned char sha1[20];
64         unsigned char parent_sha1[FLEX_ARRAY][20];
65 };
66
67 int show_combined_diff(struct combine_diff_path *elem, int num_parent,
68                        int dense, const char *header, int show_empty);
69
70 extern int diff_tree_combined_merge(const unsigned char *sha1, const char *, int, int);
71
72 extern void diff_addremove(struct diff_options *,
73                            int addremove,
74                            unsigned mode,
75                            const unsigned char *sha1,
76                            const char *base,
77                            const char *path);
78
79 extern void diff_change(struct diff_options *,
80                         unsigned mode1, unsigned mode2,
81                         const unsigned char *sha1,
82                         const unsigned char *sha2,
83                         const char *base, const char *path);
84
85 extern void diff_unmerge(struct diff_options *,
86                          const char *path);
87
88 extern int diff_scoreopt_parse(const char *opt);
89
90 #define DIFF_SETUP_REVERSE              1
91 #define DIFF_SETUP_USE_CACHE            2
92 #define DIFF_SETUP_USE_SIZE_CACHE       4
93
94 extern int git_diff_config(const char *var, const char *value);
95 extern void diff_setup(struct diff_options *);
96 extern int diff_opt_parse(struct diff_options *, const char **, int);
97 extern int diff_setup_done(struct diff_options *);
98
99 #define DIFF_DETECT_RENAME      1
100 #define DIFF_DETECT_COPY        2
101
102 #define DIFF_PICKAXE_ALL        1
103
104 #define DIFF_DEFAULT_INDEX_ABBREV       7 /* hex digits */
105 #define DIFF_DEFAULT_ABBREV     7 /* hex digits */
106
107 extern void diffcore_std(struct diff_options *);
108
109 extern void diffcore_std_no_resolve(struct diff_options *);
110
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"
131
132 extern int diff_queue_is_empty(void);
133
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
139
140 extern void diff_flush(struct diff_options*);
141
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'
151
152 /* these are not diff-raw status letters proper, but used by
153  * diffcore-filter insn to specify additional restrictions.
154  */
155 #define DIFF_STATUS_FILTER_AON          '*'
156 #define DIFF_STATUS_FILTER_BROKEN       'B'
157
158 extern const char *diff_unique_abbrev(const unsigned char *, int);
159
160 #endif /* DIFF_H */