blob: 4b435e8b1933222da02f9e4cf2c28d2fef44d292 [file] [log] [blame]
Junio C Hamanobe3cfa82005-04-26 09:25:05 -07001/*
2 * Copyright (C) 2005 Junio C Hamano
3 */
Junio C Hamano86436c22005-04-25 18:22:47 -07004#ifndef DIFF_H
5#define DIFF_H
6
Junio C Hamano1b0c7172006-03-29 22:55:43 -08007#include "tree-walk.h"
Linus Torvalds50f9a852006-01-31 14:10:56 -08008
Linus Torvalds91539832006-04-17 11:59:32 -07009struct rev_info;
Linus Torvaldsac1b3d12005-10-20 21:05:05 -070010struct diff_options;
Jeff King04245582006-09-07 02:35:42 -040011struct diff_queue_struct;
Linus Torvaldsac1b3d12005-10-20 21:05:05 -070012
13typedef void (*change_fn_t)(struct diff_options *options,
14 unsigned old_mode, unsigned new_mode,
15 const unsigned char *old_sha1,
16 const unsigned char *new_sha1,
17 const char *base, const char *path);
18
19typedef void (*add_remove_fn_t)(struct diff_options *options,
20 int addremove, unsigned mode,
21 const unsigned char *sha1,
22 const char *base, const char *path);
23
Jeff King04245582006-09-07 02:35:42 -040024typedef void (*diff_format_fn_t)(struct diff_queue_struct *q,
25 struct diff_options *options, void *data);
26
Timo Hirvonenc6744342006-06-24 20:21:53 +030027#define DIFF_FORMAT_RAW 0x0001
28#define DIFF_FORMAT_DIFFSTAT 0x0002
Junio C Hamano74e2abe2006-10-12 03:01:00 -070029#define DIFF_FORMAT_NUMSTAT 0x0004
30#define DIFF_FORMAT_SUMMARY 0x0008
31#define DIFF_FORMAT_PATCH 0x0010
Nicolas Pitreebd124c2006-12-14 23:15:44 -050032#define DIFF_FORMAT_SHORTSTAT 0x0020
Timo Hirvonenc6744342006-06-24 20:21:53 +030033
34/* These override all above */
Junio C Hamano74e2abe2006-10-12 03:01:00 -070035#define DIFF_FORMAT_NAME 0x0100
36#define DIFF_FORMAT_NAME_STATUS 0x0200
37#define DIFF_FORMAT_CHECKDIFF 0x0400
Timo Hirvonenc6744342006-06-24 20:21:53 +030038
39/* Same as output_format = 0 but we know that -s flag was given
40 * and we should not give default value to output_format.
41 */
Junio C Hamano74e2abe2006-10-12 03:01:00 -070042#define DIFF_FORMAT_NO_OUTPUT 0x0800
Timo Hirvonenc6744342006-06-24 20:21:53 +030043
Junio C Hamano74e2abe2006-10-12 03:01:00 -070044#define DIFF_FORMAT_CALLBACK 0x1000
Jeff King04245582006-09-07 02:35:42 -040045
Junio C Hamano6b5ee132005-09-21 00:00:47 -070046struct diff_options {
Junio C Hamano6b5ee132005-09-21 00:00:47 -070047 const char *filter;
48 const char *orderfile;
49 const char *pickaxe;
Junio C Hamano2f3f8b22006-11-02 00:02:11 -080050 const char *single_follow;
Linus Torvaldsac1b3d12005-10-20 21:05:05 -070051 unsigned recursive:1,
Junio C Hamano80b1e512005-11-14 17:53:22 -080052 tree_in_recursive:1,
Junio C Hamano06606262006-05-05 02:41:53 -070053 binary:1,
Stephan Feder6d64ea92006-07-07 12:33:57 +020054 text:1,
Junio C Hamano6973dca2006-04-21 23:57:45 -070055 full_index:1,
56 silent_on_remove:1,
Sean4bbd2612006-05-14 08:13:49 -040057 find_copies_harder:1,
Johannes Schindelinf59a59e2006-07-28 23:56:15 +020058 color_diff:1,
59 color_diff_words:1;
Linus Torvaldsee1e5412006-05-13 13:23:48 -070060 int context;
Junio C Hamano6b5ee132005-09-21 00:00:47 -070061 int break_opt;
62 int detect_rename;
Junio C Hamano6b5ee132005-09-21 00:00:47 -070063 int line_termination;
64 int output_format;
65 int pickaxe_opts;
66 int rename_score;
67 int reverse_diff;
Junio C Hamano8082d8d2005-09-21 00:18:27 -070068 int rename_limit;
Junio C Hamano6b5ee132005-09-21 00:00:47 -070069 int setup;
Junio C Hamano47dd0d52005-12-13 17:21:41 -080070 int abbrev;
Timo Hirvonen39bc9a62006-06-25 13:54:14 +030071 const char *msg_sep;
Johannes Schindelin698ce6f2006-05-20 15:40:29 +020072 const char *stat_sep;
Johannes Schindelin0d21efa2006-06-14 17:40:23 +020073 long xdl_opts;
Linus Torvaldsac1b3d12005-10-20 21:05:05 -070074
Junio C Hamanoa2540022006-09-26 18:53:02 -070075 int stat_width;
76 int stat_name_width;
77
Johannes Schindelin34a5e1a2007-02-25 23:34:54 +010078 /* this is set by diffcore for DIFF_FORMAT_PATCH */
79 int found_changes;
80
Junio C Hamanoa8baa7b2006-04-10 16:39:11 -070081 int nr_paths;
82 const char **paths;
83 int *pathlens;
Linus Torvaldsac1b3d12005-10-20 21:05:05 -070084 change_fn_t change;
85 add_remove_fn_t add_remove;
Jeff King04245582006-09-07 02:35:42 -040086 diff_format_fn_t format_callback;
87 void *format_callback_data;
Junio C Hamano6b5ee132005-09-21 00:00:47 -070088};
89
Jeff Kingce436972006-07-23 05:24:18 -040090enum color_diff {
91 DIFF_RESET = 0,
92 DIFF_PLAIN = 1,
93 DIFF_METAINFO = 2,
94 DIFF_FRAGINFO = 3,
95 DIFF_FILE_OLD = 4,
96 DIFF_FILE_NEW = 5,
97 DIFF_COMMIT = 6,
Junio C Hamano448c3ef2006-09-22 22:48:39 -070098 DIFF_WHITESPACE = 7,
Jeff Kingce436972006-07-23 05:24:18 -040099};
100const char *diff_get_color(int diff_use_color, enum color_diff ix);
101
Johannes Schindelin698ce6f2006-05-20 15:40:29 +0200102extern const char mime_boundary_leader[];
103
Junio C Hamanoa8baa7b2006-04-10 16:39:11 -0700104extern void diff_tree_setup_paths(const char **paths, struct diff_options *);
105extern void diff_tree_release_paths(struct diff_options *);
Linus Torvaldsac1b3d12005-10-20 21:05:05 -0700106extern int diff_tree(struct tree_desc *t1, struct tree_desc *t2,
107 const char *base, struct diff_options *opt);
108extern int diff_tree_sha1(const unsigned char *old, const unsigned char *new,
109 const char *base, struct diff_options *opt);
Rene Scharfe2b603562006-10-26 18:52:39 +0200110extern int diff_root_tree_sha1(const unsigned char *new, const char *base,
111 struct diff_options *opt);
Linus Torvaldsac1b3d12005-10-20 21:05:05 -0700112
Junio C Hamanoea726d02006-01-28 00:03:38 -0800113struct combine_diff_path {
114 struct combine_diff_path *next;
115 int len;
116 char *path;
Junio C Hamano2454c962006-02-06 12:53:07 -0800117 unsigned int mode;
Junio C Hamanoea726d02006-01-28 00:03:38 -0800118 unsigned char sha1[20];
Junio C Hamano2454c962006-02-06 12:53:07 -0800119 struct combine_diff_parent {
Junio C Hamanod416df82006-02-10 02:30:52 -0800120 char status;
Junio C Hamano2454c962006-02-06 12:53:07 -0800121 unsigned int mode;
122 unsigned char sha1[20];
123 } parent[FLEX_ARRAY];
Junio C Hamanoea726d02006-01-28 00:03:38 -0800124};
Junio C Hamano2454c962006-02-06 12:53:07 -0800125#define combine_diff_path_size(n, l) \
126 (sizeof(struct combine_diff_path) + \
127 sizeof(struct combine_diff_parent) * (n) + (l) + 1)
Junio C Hamanoea726d02006-01-28 00:03:38 -0800128
Linus Torvalds91539832006-04-17 11:59:32 -0700129extern void show_combined_diff(struct combine_diff_path *elem, int num_parent,
130 int dense, struct rev_info *);
Junio C Hamanoea726d02006-01-28 00:03:38 -0800131
Junio C Hamano0fe7c1d2006-04-29 01:24:49 -0700132extern void diff_tree_combined(const unsigned char *sha1, const unsigned char parent[][20], int num_parent, int dense, struct rev_info *rev);
133
Linus Torvalds91539832006-04-17 11:59:32 -0700134extern void diff_tree_combined_merge(const unsigned char *sha1, int, struct rev_info *);
Junio C Hamanoaf3feef2006-01-24 01:22:04 -0800135
Junio C Hamano6b5ee132005-09-21 00:00:47 -0700136extern void diff_addremove(struct diff_options *,
137 int addremove,
Junio C Hamano77eb2722005-04-27 09:21:00 -0700138 unsigned mode,
139 const unsigned char *sha1,
140 const char *base,
141 const char *path);
142
Junio C Hamano6b5ee132005-09-21 00:00:47 -0700143extern void diff_change(struct diff_options *,
144 unsigned mode1, unsigned mode2,
145 const unsigned char *sha1,
146 const unsigned char *sha2,
147 const char *base, const char *path);
Junio C Hamano77eb2722005-04-27 09:21:00 -0700148
Junio C Hamano6b5ee132005-09-21 00:00:47 -0700149extern void diff_unmerge(struct diff_options *,
Junio C Hamanoe9c84092007-01-05 01:25:18 -0800150 const char *path,
151 unsigned mode,
152 const unsigned char *sha1);
Junio C Hamano77eb2722005-04-27 09:21:00 -0700153
Junio C Hamano57fe64a2005-05-19 19:00:36 -0700154extern int diff_scoreopt_parse(const char *opt);
155
Junio C Hamano19feebc2005-05-27 15:54:37 -0700156#define DIFF_SETUP_REVERSE 1
Junio C Hamanof0c6b2a2005-05-27 15:56:38 -0700157#define DIFF_SETUP_USE_CACHE 2
158#define DIFF_SETUP_USE_SIZE_CACHE 4
Junio C Hamanoce240672005-06-03 01:36:43 -0700159
Junio C Hamano83ad63c2006-07-08 01:05:16 -0700160extern int git_diff_ui_config(const char *var, const char *value);
Junio C Hamano6b5ee132005-09-21 00:00:47 -0700161extern void diff_setup(struct diff_options *);
162extern int diff_opt_parse(struct diff_options *, const char **, int);
163extern int diff_setup_done(struct diff_options *);
Junio C Hamano86436c22005-04-25 18:22:47 -0700164
Junio C Hamano6b14d7f2005-05-22 10:04:37 -0700165#define DIFF_DETECT_RENAME 1
166#define DIFF_DETECT_COPY 2
167
Junio C Hamano367cec12005-05-27 15:55:28 -0700168#define DIFF_PICKAXE_ALL 1
Petr Baudisd01d8c62006-03-29 02:16:33 +0200169#define DIFF_PICKAXE_REGEX 2
Junio C Hamanof345b0a2005-05-30 00:08:37 -0700170
Junio C Hamano6b5ee132005-09-21 00:00:47 -0700171extern void diffcore_std(struct diff_options *);
Junio C Hamanof2ce9fd2005-06-11 20:57:13 -0700172
Junio C Hamano6b5ee132005-09-21 00:00:47 -0700173extern void diffcore_std_no_resolve(struct diff_options *);
Junio C Hamanobefe8632005-05-29 16:56:13 -0700174
Junio C Hamanodda2d792005-07-13 12:52:35 -0700175#define COMMON_DIFF_OPTIONS_HELP \
176"\ncommon diff options:\n" \
Junio C Hamano8082d8d2005-09-21 00:18:27 -0700177" -z output diff-raw with lines terminated with NUL.\n" \
178" -p output patch format.\n" \
179" -u synonym for -p.\n" \
Petr Baudis5c91da22006-04-11 13:22:17 +0200180" --patch-with-raw\n" \
181" output both a patch and the diff-raw format.\n" \
Johannes Schindelind75f7952006-04-14 00:15:30 +0200182" --stat show diffstat instead of patch.\n" \
Junio C Hamano74e2abe2006-10-12 03:01:00 -0700183" --numstat show numeric diffstat instead of patch.\n" \
Johannes Schindelin29353272006-04-15 13:41:18 +0200184" --patch-with-stat\n" \
185" output a patch and prepend its diffstat.\n" \
Junio C Hamano8082d8d2005-09-21 00:18:27 -0700186" --name-only show only names of changed files.\n" \
Junio C Hamano946f5f72005-09-21 00:20:06 -0700187" --name-status show names and status of changed files.\n" \
Junio C Hamano47dd0d52005-12-13 17:21:41 -0800188" --full-index show full object name on index lines.\n" \
Junio C Hamano913419f2005-12-18 02:03:15 -0800189" --abbrev=<n> abbreviate object names in diff-tree header and diff-raw.\n" \
Junio C Hamano8082d8d2005-09-21 00:18:27 -0700190" -R swap input file pairs.\n" \
191" -B detect complete rewrites.\n" \
192" -M detect renames.\n" \
193" -C detect copies.\n" \
Junio C Hamanodda2d792005-07-13 12:52:35 -0700194" --find-copies-harder\n" \
Junio C Hamano8082d8d2005-09-21 00:18:27 -0700195" try unchanged files as candidate for copy detection.\n" \
196" -l<n> limit rename attempts up to <n> paths.\n" \
197" -O<file> reorder diffs according to the <file>.\n" \
198" -S<string> find filepair whose only one side contains the string.\n" \
Junio C Hamanodda2d792005-07-13 12:52:35 -0700199" --pickaxe-all\n" \
Stephan Federca499202006-07-07 15:57:08 +0200200" show all files diff when -S is used and hit is found.\n" \
201" -a --text treat all files as text.\n"
Junio C Hamanodda2d792005-07-13 12:52:35 -0700202
Junio C Hamano38c6f782005-05-21 19:40:36 -0700203extern int diff_queue_is_empty(void);
Junio C Hamano6b5ee132005-09-21 00:00:47 -0700204extern void diff_flush(struct diff_options*);
Junio C Hamano86436c22005-04-25 18:22:47 -0700205
Junio C Hamanoe7baa4f2005-07-25 13:05:44 -0700206/* diff-raw status letters */
Junio C Hamanoca8c9152005-07-25 14:31:19 -0700207#define DIFF_STATUS_ADDED 'A'
Junio C Hamanoe7baa4f2005-07-25 13:05:44 -0700208#define DIFF_STATUS_COPIED 'C'
209#define DIFF_STATUS_DELETED 'D'
210#define DIFF_STATUS_MODIFIED 'M'
211#define DIFF_STATUS_RENAMED 'R'
212#define DIFF_STATUS_TYPE_CHANGED 'T'
213#define DIFF_STATUS_UNKNOWN 'X'
214#define DIFF_STATUS_UNMERGED 'U'
215
216/* these are not diff-raw status letters proper, but used by
217 * diffcore-filter insn to specify additional restrictions.
218 */
Junio C Hamano0b343792005-10-04 17:44:17 -0700219#define DIFF_STATUS_FILTER_AON '*'
Junio C Hamanoe7baa4f2005-07-25 13:05:44 -0700220#define DIFF_STATUS_FILTER_BROKEN 'B'
221
Junio C Hamano47dd0d52005-12-13 17:21:41 -0800222extern const char *diff_unique_abbrev(const unsigned char *, int);
223
Junio C Hamano6973dca2006-04-21 23:57:45 -0700224extern int run_diff_files(struct rev_info *revs, int silent_on_removed);
Johannes Schindelinfcfa33e2007-02-25 23:35:27 +0100225extern int setup_diff_no_index(struct rev_info *revs,
226 int argc, const char ** argv, int nongit, const char *prefix);
Johannes Schindelind516c2d2007-02-22 21:50:10 +0100227extern int run_diff_files_cmd(struct rev_info *revs, int argc, const char **argv);
Junio C Hamano6973dca2006-04-21 23:57:45 -0700228
Junio C Hamano5c21ac02006-04-22 03:58:04 -0700229extern int run_diff_index(struct rev_info *revs, int cached);
Junio C Hamanoe09ad6e2006-04-22 02:43:00 -0700230
Junio C Hamano1cfe7732007-01-30 01:11:08 -0800231extern int do_diff_cache(const unsigned char *, struct diff_options *);
Johannes Schindelinfcb3d0a2006-06-25 03:51:08 +0200232extern int diff_flush_patch_id(struct diff_options *, unsigned char *);
233
Junio C Hamano86436c22005-04-25 18:22:47 -0700234#endif /* DIFF_H */