Junio C Hamano | be3cfa8 | 2005-04-26 09:25:05 -0700 | [diff] [blame] | 1 | /* |
| 2 | * Copyright (C) 2005 Junio C Hamano |
| 3 | */ |
Junio C Hamano | 86436c2 | 2005-04-25 18:22:47 -0700 | [diff] [blame] | 4 | #ifndef DIFF_H |
| 5 | #define DIFF_H |
| 6 | |
Junio C Hamano | 1b0c717 | 2006-03-29 22:55:43 -0800 | [diff] [blame] | 7 | #include "tree-walk.h" |
Linus Torvalds | 50f9a85 | 2006-01-31 14:10:56 -0800 | [diff] [blame] | 8 | |
Linus Torvalds | 9153983 | 2006-04-17 11:59:32 -0700 | [diff] [blame] | 9 | struct rev_info; |
Linus Torvalds | ac1b3d1 | 2005-10-20 21:05:05 -0700 | [diff] [blame] | 10 | struct diff_options; |
| 11 | |
| 12 | typedef 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 | |
| 18 | typedef 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 | |
Junio C Hamano | 6b5ee13 | 2005-09-21 00:00:47 -0700 | [diff] [blame] | 23 | struct diff_options { |
Junio C Hamano | 6b5ee13 | 2005-09-21 00:00:47 -0700 | [diff] [blame] | 24 | const char *filter; |
| 25 | const char *orderfile; |
| 26 | const char *pickaxe; |
Linus Torvalds | ac1b3d1 | 2005-10-20 21:05:05 -0700 | [diff] [blame] | 27 | unsigned recursive:1, |
Junio C Hamano | 86ff1d2 | 2006-04-10 17:36:53 -0700 | [diff] [blame] | 28 | with_raw:1, |
Johannes Schindelin | 2935327 | 2006-04-15 13:41:18 +0200 | [diff] [blame] | 29 | with_stat:1, |
Junio C Hamano | 80b1e51 | 2005-11-14 17:53:22 -0800 | [diff] [blame] | 30 | tree_in_recursive:1, |
Junio C Hamano | 0660626 | 2006-05-05 02:41:53 -0700 | [diff] [blame] | 31 | binary:1, |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 32 | full_index:1, |
| 33 | silent_on_remove:1, |
| 34 | find_copies_harder:1; |
Junio C Hamano | 6b5ee13 | 2005-09-21 00:00:47 -0700 | [diff] [blame] | 35 | int break_opt; |
| 36 | int detect_rename; |
Junio C Hamano | 6b5ee13 | 2005-09-21 00:00:47 -0700 | [diff] [blame] | 37 | int line_termination; |
| 38 | int output_format; |
| 39 | int pickaxe_opts; |
| 40 | int rename_score; |
| 41 | int reverse_diff; |
Junio C Hamano | 8082d8d | 2005-09-21 00:18:27 -0700 | [diff] [blame] | 42 | int rename_limit; |
Junio C Hamano | 6b5ee13 | 2005-09-21 00:00:47 -0700 | [diff] [blame] | 43 | int setup; |
Junio C Hamano | 47dd0d5 | 2005-12-13 17:21:41 -0800 | [diff] [blame] | 44 | int abbrev; |
Linus Torvalds | ac1b3d1 | 2005-10-20 21:05:05 -0700 | [diff] [blame] | 45 | |
Junio C Hamano | a8baa7b | 2006-04-10 16:39:11 -0700 | [diff] [blame] | 46 | int nr_paths; |
| 47 | const char **paths; |
| 48 | int *pathlens; |
Linus Torvalds | ac1b3d1 | 2005-10-20 21:05:05 -0700 | [diff] [blame] | 49 | change_fn_t change; |
| 50 | add_remove_fn_t add_remove; |
Junio C Hamano | 6b5ee13 | 2005-09-21 00:00:47 -0700 | [diff] [blame] | 51 | }; |
| 52 | |
Junio C Hamano | a8baa7b | 2006-04-10 16:39:11 -0700 | [diff] [blame] | 53 | extern void diff_tree_setup_paths(const char **paths, struct diff_options *); |
| 54 | extern void diff_tree_release_paths(struct diff_options *); |
Linus Torvalds | ac1b3d1 | 2005-10-20 21:05:05 -0700 | [diff] [blame] | 55 | extern int diff_tree(struct tree_desc *t1, struct tree_desc *t2, |
| 56 | const char *base, struct diff_options *opt); |
| 57 | extern int diff_tree_sha1(const unsigned char *old, const unsigned char *new, |
| 58 | const char *base, struct diff_options *opt); |
| 59 | |
Junio C Hamano | ea726d0 | 2006-01-28 00:03:38 -0800 | [diff] [blame] | 60 | struct combine_diff_path { |
| 61 | struct combine_diff_path *next; |
| 62 | int len; |
| 63 | char *path; |
Junio C Hamano | 2454c96 | 2006-02-06 12:53:07 -0800 | [diff] [blame] | 64 | unsigned int mode; |
Junio C Hamano | ea726d0 | 2006-01-28 00:03:38 -0800 | [diff] [blame] | 65 | unsigned char sha1[20]; |
Junio C Hamano | 2454c96 | 2006-02-06 12:53:07 -0800 | [diff] [blame] | 66 | struct combine_diff_parent { |
Junio C Hamano | d416df8 | 2006-02-10 02:30:52 -0800 | [diff] [blame] | 67 | char status; |
Junio C Hamano | 2454c96 | 2006-02-06 12:53:07 -0800 | [diff] [blame] | 68 | unsigned int mode; |
| 69 | unsigned char sha1[20]; |
| 70 | } parent[FLEX_ARRAY]; |
Junio C Hamano | ea726d0 | 2006-01-28 00:03:38 -0800 | [diff] [blame] | 71 | }; |
Junio C Hamano | 2454c96 | 2006-02-06 12:53:07 -0800 | [diff] [blame] | 72 | #define combine_diff_path_size(n, l) \ |
| 73 | (sizeof(struct combine_diff_path) + \ |
| 74 | sizeof(struct combine_diff_parent) * (n) + (l) + 1) |
Junio C Hamano | ea726d0 | 2006-01-28 00:03:38 -0800 | [diff] [blame] | 75 | |
Linus Torvalds | 9153983 | 2006-04-17 11:59:32 -0700 | [diff] [blame] | 76 | extern void show_combined_diff(struct combine_diff_path *elem, int num_parent, |
| 77 | int dense, struct rev_info *); |
Junio C Hamano | ea726d0 | 2006-01-28 00:03:38 -0800 | [diff] [blame] | 78 | |
Junio C Hamano | 0fe7c1d | 2006-04-29 01:24:49 -0700 | [diff] [blame] | 79 | extern void diff_tree_combined(const unsigned char *sha1, const unsigned char parent[][20], int num_parent, int dense, struct rev_info *rev); |
| 80 | |
Linus Torvalds | 9153983 | 2006-04-17 11:59:32 -0700 | [diff] [blame] | 81 | extern void diff_tree_combined_merge(const unsigned char *sha1, int, struct rev_info *); |
Junio C Hamano | af3feef | 2006-01-24 01:22:04 -0800 | [diff] [blame] | 82 | |
Junio C Hamano | 6b5ee13 | 2005-09-21 00:00:47 -0700 | [diff] [blame] | 83 | extern void diff_addremove(struct diff_options *, |
| 84 | int addremove, |
Junio C Hamano | 77eb272 | 2005-04-27 09:21:00 -0700 | [diff] [blame] | 85 | unsigned mode, |
| 86 | const unsigned char *sha1, |
| 87 | const char *base, |
| 88 | const char *path); |
| 89 | |
Junio C Hamano | 6b5ee13 | 2005-09-21 00:00:47 -0700 | [diff] [blame] | 90 | extern void diff_change(struct diff_options *, |
| 91 | unsigned mode1, unsigned mode2, |
| 92 | const unsigned char *sha1, |
| 93 | const unsigned char *sha2, |
| 94 | const char *base, const char *path); |
Junio C Hamano | 77eb272 | 2005-04-27 09:21:00 -0700 | [diff] [blame] | 95 | |
Junio C Hamano | 6b5ee13 | 2005-09-21 00:00:47 -0700 | [diff] [blame] | 96 | extern void diff_unmerge(struct diff_options *, |
| 97 | const char *path); |
Junio C Hamano | 77eb272 | 2005-04-27 09:21:00 -0700 | [diff] [blame] | 98 | |
Junio C Hamano | 57fe64a | 2005-05-19 19:00:36 -0700 | [diff] [blame] | 99 | extern int diff_scoreopt_parse(const char *opt); |
| 100 | |
Junio C Hamano | 19feebc | 2005-05-27 15:54:37 -0700 | [diff] [blame] | 101 | #define DIFF_SETUP_REVERSE 1 |
Junio C Hamano | f0c6b2a | 2005-05-27 15:56:38 -0700 | [diff] [blame] | 102 | #define DIFF_SETUP_USE_CACHE 2 |
| 103 | #define DIFF_SETUP_USE_SIZE_CACHE 4 |
Junio C Hamano | ce24067 | 2005-06-03 01:36:43 -0700 | [diff] [blame] | 104 | |
Junio C Hamano | 9ce392f | 2005-11-21 22:52:37 -0800 | [diff] [blame] | 105 | extern int git_diff_config(const char *var, const char *value); |
Junio C Hamano | 6b5ee13 | 2005-09-21 00:00:47 -0700 | [diff] [blame] | 106 | extern void diff_setup(struct diff_options *); |
| 107 | extern int diff_opt_parse(struct diff_options *, const char **, int); |
| 108 | extern int diff_setup_done(struct diff_options *); |
Junio C Hamano | 86436c2 | 2005-04-25 18:22:47 -0700 | [diff] [blame] | 109 | |
Junio C Hamano | 6b14d7f | 2005-05-22 10:04:37 -0700 | [diff] [blame] | 110 | #define DIFF_DETECT_RENAME 1 |
| 111 | #define DIFF_DETECT_COPY 2 |
| 112 | |
Junio C Hamano | 367cec1 | 2005-05-27 15:55:28 -0700 | [diff] [blame] | 113 | #define DIFF_PICKAXE_ALL 1 |
Petr Baudis | d01d8c6 | 2006-03-29 02:16:33 +0200 | [diff] [blame] | 114 | #define DIFF_PICKAXE_REGEX 2 |
Junio C Hamano | f345b0a | 2005-05-30 00:08:37 -0700 | [diff] [blame] | 115 | |
Junio C Hamano | 6b5ee13 | 2005-09-21 00:00:47 -0700 | [diff] [blame] | 116 | extern void diffcore_std(struct diff_options *); |
Junio C Hamano | f2ce9fd | 2005-06-11 20:57:13 -0700 | [diff] [blame] | 117 | |
Junio C Hamano | 6b5ee13 | 2005-09-21 00:00:47 -0700 | [diff] [blame] | 118 | extern void diffcore_std_no_resolve(struct diff_options *); |
Junio C Hamano | befe863 | 2005-05-29 16:56:13 -0700 | [diff] [blame] | 119 | |
Junio C Hamano | dda2d79 | 2005-07-13 12:52:35 -0700 | [diff] [blame] | 120 | #define COMMON_DIFF_OPTIONS_HELP \ |
| 121 | "\ncommon diff options:\n" \ |
Junio C Hamano | 8082d8d | 2005-09-21 00:18:27 -0700 | [diff] [blame] | 122 | " -z output diff-raw with lines terminated with NUL.\n" \ |
| 123 | " -p output patch format.\n" \ |
| 124 | " -u synonym for -p.\n" \ |
Petr Baudis | 5c91da2 | 2006-04-11 13:22:17 +0200 | [diff] [blame] | 125 | " --patch-with-raw\n" \ |
| 126 | " output both a patch and the diff-raw format.\n" \ |
Johannes Schindelin | d75f795 | 2006-04-14 00:15:30 +0200 | [diff] [blame] | 127 | " --stat show diffstat instead of patch.\n" \ |
Johannes Schindelin | 2935327 | 2006-04-15 13:41:18 +0200 | [diff] [blame] | 128 | " --patch-with-stat\n" \ |
| 129 | " output a patch and prepend its diffstat.\n" \ |
Junio C Hamano | 8082d8d | 2005-09-21 00:18:27 -0700 | [diff] [blame] | 130 | " --name-only show only names of changed files.\n" \ |
Junio C Hamano | 946f5f7 | 2005-09-21 00:20:06 -0700 | [diff] [blame] | 131 | " --name-status show names and status of changed files.\n" \ |
Junio C Hamano | 47dd0d5 | 2005-12-13 17:21:41 -0800 | [diff] [blame] | 132 | " --full-index show full object name on index lines.\n" \ |
Junio C Hamano | 913419f | 2005-12-18 02:03:15 -0800 | [diff] [blame] | 133 | " --abbrev=<n> abbreviate object names in diff-tree header and diff-raw.\n" \ |
Junio C Hamano | 8082d8d | 2005-09-21 00:18:27 -0700 | [diff] [blame] | 134 | " -R swap input file pairs.\n" \ |
| 135 | " -B detect complete rewrites.\n" \ |
| 136 | " -M detect renames.\n" \ |
| 137 | " -C detect copies.\n" \ |
Junio C Hamano | dda2d79 | 2005-07-13 12:52:35 -0700 | [diff] [blame] | 138 | " --find-copies-harder\n" \ |
Junio C Hamano | 8082d8d | 2005-09-21 00:18:27 -0700 | [diff] [blame] | 139 | " try unchanged files as candidate for copy detection.\n" \ |
| 140 | " -l<n> limit rename attempts up to <n> paths.\n" \ |
| 141 | " -O<file> reorder diffs according to the <file>.\n" \ |
| 142 | " -S<string> find filepair whose only one side contains the string.\n" \ |
Junio C Hamano | dda2d79 | 2005-07-13 12:52:35 -0700 | [diff] [blame] | 143 | " --pickaxe-all\n" \ |
Junio C Hamano | 8082d8d | 2005-09-21 00:18:27 -0700 | [diff] [blame] | 144 | " show all files diff when -S is used and hit is found.\n" |
Junio C Hamano | dda2d79 | 2005-07-13 12:52:35 -0700 | [diff] [blame] | 145 | |
Junio C Hamano | 38c6f78 | 2005-05-21 19:40:36 -0700 | [diff] [blame] | 146 | extern int diff_queue_is_empty(void); |
| 147 | |
Linus Torvalds | e68b6f1 | 2005-07-14 17:59:17 -0700 | [diff] [blame] | 148 | #define DIFF_FORMAT_RAW 1 |
Junio C Hamano | 19feebc | 2005-05-27 15:54:37 -0700 | [diff] [blame] | 149 | #define DIFF_FORMAT_PATCH 2 |
| 150 | #define DIFF_FORMAT_NO_OUTPUT 3 |
Junio C Hamano | 52f2852 | 2005-07-13 12:45:51 -0700 | [diff] [blame] | 151 | #define DIFF_FORMAT_NAME 4 |
Junio C Hamano | 946f5f7 | 2005-09-21 00:20:06 -0700 | [diff] [blame] | 152 | #define DIFF_FORMAT_NAME_STATUS 5 |
Johannes Schindelin | d75f795 | 2006-04-14 00:15:30 +0200 | [diff] [blame] | 153 | #define DIFF_FORMAT_DIFFSTAT 6 |
Junio C Hamano | 19feebc | 2005-05-27 15:54:37 -0700 | [diff] [blame] | 154 | |
Junio C Hamano | 6b5ee13 | 2005-09-21 00:00:47 -0700 | [diff] [blame] | 155 | extern void diff_flush(struct diff_options*); |
Junio C Hamano | 86436c2 | 2005-04-25 18:22:47 -0700 | [diff] [blame] | 156 | |
Junio C Hamano | e7baa4f | 2005-07-25 13:05:44 -0700 | [diff] [blame] | 157 | /* diff-raw status letters */ |
Junio C Hamano | ca8c915 | 2005-07-25 14:31:19 -0700 | [diff] [blame] | 158 | #define DIFF_STATUS_ADDED 'A' |
Junio C Hamano | e7baa4f | 2005-07-25 13:05:44 -0700 | [diff] [blame] | 159 | #define DIFF_STATUS_COPIED 'C' |
| 160 | #define DIFF_STATUS_DELETED 'D' |
| 161 | #define DIFF_STATUS_MODIFIED 'M' |
| 162 | #define DIFF_STATUS_RENAMED 'R' |
| 163 | #define DIFF_STATUS_TYPE_CHANGED 'T' |
| 164 | #define DIFF_STATUS_UNKNOWN 'X' |
| 165 | #define DIFF_STATUS_UNMERGED 'U' |
| 166 | |
| 167 | /* these are not diff-raw status letters proper, but used by |
| 168 | * diffcore-filter insn to specify additional restrictions. |
| 169 | */ |
Junio C Hamano | 0b34379 | 2005-10-04 17:44:17 -0700 | [diff] [blame] | 170 | #define DIFF_STATUS_FILTER_AON '*' |
Junio C Hamano | e7baa4f | 2005-07-25 13:05:44 -0700 | [diff] [blame] | 171 | #define DIFF_STATUS_FILTER_BROKEN 'B' |
| 172 | |
Junio C Hamano | 47dd0d5 | 2005-12-13 17:21:41 -0800 | [diff] [blame] | 173 | extern const char *diff_unique_abbrev(const unsigned char *, int); |
| 174 | |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 175 | extern int run_diff_files(struct rev_info *revs, int silent_on_removed); |
| 176 | |
Junio C Hamano | 5c21ac0 | 2006-04-22 03:58:04 -0700 | [diff] [blame] | 177 | extern int run_diff_index(struct rev_info *revs, int cached); |
Junio C Hamano | e09ad6e | 2006-04-22 02:43:00 -0700 | [diff] [blame] | 178 | |
Junio C Hamano | 86436c2 | 2005-04-25 18:22:47 -0700 | [diff] [blame] | 179 | #endif /* DIFF_H */ |