git.oblomov.eu Git - git/blob - diff.h

   1 /*
   2  * Copyright (C) 2005 Junio C Hamano
   3  */
   4 #ifndef DIFF_H
   5 #define DIFF_H
   6
   7 #include "tree-walk.h"
   8
   9 struct rev_info;
  10 struct diff_options;
  11 struct diff_queue_struct;
  12
  13 typedef 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
  19 typedef 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
  24 typedef void (*diff_format_fn_t)(struct diff_queue_struct *q,
  25                 struct diff_options *options, void *data);
  26
  27 #define DIFF_FORMAT_RAW         0x0001
  28 #define DIFF_FORMAT_DIFFSTAT    0x0002
  29 #define DIFF_FORMAT_NUMSTAT     0x0004
  30 #define DIFF_FORMAT_SUMMARY     0x0008
  31 #define DIFF_FORMAT_PATCH       0x0010
  32
  33 /* These override all above */
  34 #define DIFF_FORMAT_NAME        0x0100
  35 #define DIFF_FORMAT_NAME_STATUS 0x0200
  36 #define DIFF_FORMAT_CHECKDIFF   0x0400
  37
  38 /* Same as output_format = 0 but we know that -s flag was given
  39  * and we should not give default value to output_format.
  40  */
  41 #define DIFF_FORMAT_NO_OUTPUT   0x0800
  42
  43 #define DIFF_FORMAT_CALLBACK    0x1000
  44
  45 struct diff_options {
  46         const char *filter;
  47         const char *orderfile;
  48         const char *pickaxe;
  49         const char *single_follow;
  50         unsigned recursive:1,
  51                  tree_in_recursive:1,
  52                  binary:1,
  53                  text:1,
  54                  full_index:1,
  55                  silent_on_remove:1,
  56                  find_copies_harder:1,
  57                  color_diff:1,
  58                  color_diff_words:1;
  59         int context;
  60         int break_opt;
  61         int detect_rename;
  62         int line_termination;
  63         int output_format;
  64         int pickaxe_opts;
  65         int rename_score;
  66         int reverse_diff;
  67         int rename_limit;
  68         int setup;
  69         int abbrev;
  70         const char *msg_sep;
  71         const char *stat_sep;
  72         long xdl_opts;
  73
  74         int stat_width;
  75         int stat_name_width;
  76
  77         int nr_paths;
  78         const char **paths;
  79         int *pathlens;
  80         change_fn_t change;
  81         add_remove_fn_t add_remove;
  82         diff_format_fn_t format_callback;
  83         void *format_callback_data;
  84 };
  85
  86 enum color_diff {
  87         DIFF_RESET = 0,
  88         DIFF_PLAIN = 1,
  89         DIFF_METAINFO = 2,
  90         DIFF_FRAGINFO = 3,
  91         DIFF_FILE_OLD = 4,
  92         DIFF_FILE_NEW = 5,
  93         DIFF_COMMIT = 6,
  94         DIFF_WHITESPACE = 7,
  95 };
  96 const char *diff_get_color(int diff_use_color, enum color_diff ix);
  97
  98 extern const char mime_boundary_leader[];
  99
 100 extern void diff_tree_setup_paths(const char **paths, struct diff_options *);
 101 extern void diff_tree_release_paths(struct diff_options *);
 102 extern int diff_tree(struct tree_desc *t1, struct tree_desc *t2,
 103                      const char *base, struct diff_options *opt);
 104 extern int diff_tree_sha1(const unsigned char *old, const unsigned char *new,
 105                           const char *base, struct diff_options *opt);
 106 extern int diff_root_tree_sha1(const unsigned char *new, const char *base,
 107                                struct diff_options *opt);
 108
 109 struct combine_diff_path {
 110         struct combine_diff_path *next;
 111         int len;
 112         char *path;
 113         unsigned int mode;
 114         unsigned char sha1[20];
 115         struct combine_diff_parent {
 116                 char status;
 117                 unsigned int mode;
 118                 unsigned char sha1[20];
 119         } parent[FLEX_ARRAY];
 120 };
 121 #define combine_diff_path_size(n, l) \
 122         (sizeof(struct combine_diff_path) + \
 123          sizeof(struct combine_diff_parent) * (n) + (l) + 1)
 124
 125 extern void show_combined_diff(struct combine_diff_path *elem, int num_parent,
 126                               int dense, struct rev_info *);
 127
 128 extern void diff_tree_combined(const unsigned char *sha1, const unsigned char parent[][20], int num_parent, int dense, struct rev_info *rev);
 129
 130 extern void diff_tree_combined_merge(const unsigned char *sha1, int, struct rev_info *);
 131
 132 extern void diff_addremove(struct diff_options *,
 133                            int addremove,
 134                            unsigned mode,
 135                            const unsigned char *sha1,
 136                            const char *base,
 137                            const char *path);
 138
 139 extern void diff_change(struct diff_options *,
 140                         unsigned mode1, unsigned mode2,
 141                         const unsigned char *sha1,
 142                         const unsigned char *sha2,
 143                         const char *base, const char *path);
 144
 145 extern void diff_unmerge(struct diff_options *,
 146                          const char *path);
 147
 148 extern int diff_scoreopt_parse(const char *opt);
 149
 150 #define DIFF_SETUP_REVERSE              1
 151 #define DIFF_SETUP_USE_CACHE            2
 152 #define DIFF_SETUP_USE_SIZE_CACHE       4
 153
 154 extern int git_diff_ui_config(const char *var, const char *value);
 155 extern void diff_setup(struct diff_options *);
 156 extern int diff_opt_parse(struct diff_options *, const char **, int);
 157 extern int diff_setup_done(struct diff_options *);
 158
 159 #define DIFF_DETECT_RENAME      1
 160 #define DIFF_DETECT_COPY        2
 161
 162 #define DIFF_PICKAXE_ALL        1
 163 #define DIFF_PICKAXE_REGEX      2
 164
 165 extern void diffcore_std(struct diff_options *);
 166
 167 extern void diffcore_std_no_resolve(struct diff_options *);
 168
 169 #define COMMON_DIFF_OPTIONS_HELP \
 170 "\ncommon diff options:\n" \
 171 "  -z            output diff-raw with lines terminated with NUL.\n" \
 172 "  -p            output patch format.\n" \
 173 "  -u            synonym for -p.\n" \
 174 "  --patch-with-raw\n" \
 175 "                output both a patch and the diff-raw format.\n" \
 176 "  --stat        show diffstat instead of patch.\n" \
 177 "  --numstat     show numeric diffstat instead of patch.\n" \
 178 "  --patch-with-stat\n" \
 179 "                output a patch and prepend its diffstat.\n" \
 180 "  --name-only   show only names of changed files.\n" \
 181 "  --name-status show names and status of changed files.\n" \
 182 "  --full-index  show full object name on index lines.\n" \
 183 "  --abbrev=<n>  abbreviate object names in diff-tree header and diff-raw.\n" \
 184 "  -R            swap input file pairs.\n" \
 185 "  -B            detect complete rewrites.\n" \
 186 "  -M            detect renames.\n" \
 187 "  -C            detect copies.\n" \
 188 "  --find-copies-harder\n" \
 189 "                try unchanged files as candidate for copy detection.\n" \
 190 "  -l<n>         limit rename attempts up to <n> paths.\n" \
 191 "  -O<file>      reorder diffs according to the <file>.\n" \
 192 "  -S<string>    find filepair whose only one side contains the string.\n" \
 193 "  --pickaxe-all\n" \
 194 "                show all files diff when -S is used and hit is found.\n" \
 195 "  -a  --text    treat all files as text.\n"
 196
 197 extern int diff_queue_is_empty(void);
 198 extern void diff_flush(struct diff_options*);
 199
 200 /* diff-raw status letters */
 201 #define DIFF_STATUS_ADDED               'A'
 202 #define DIFF_STATUS_COPIED              'C'
 203 #define DIFF_STATUS_DELETED             'D'
 204 #define DIFF_STATUS_MODIFIED            'M'
 205 #define DIFF_STATUS_RENAMED             'R'
 206 #define DIFF_STATUS_TYPE_CHANGED        'T'
 207 #define DIFF_STATUS_UNKNOWN             'X'
 208 #define DIFF_STATUS_UNMERGED            'U'
 209
 210 /* these are not diff-raw status letters proper, but used by
 211  * diffcore-filter insn to specify additional restrictions.
 212  */
 213 #define DIFF_STATUS_FILTER_AON          '*'
 214 #define DIFF_STATUS_FILTER_BROKEN       'B'
 215
 216 extern const char *diff_unique_abbrev(const unsigned char *, int);
 217
 218 extern int run_diff_files(struct rev_info *revs, int silent_on_removed);
 219
 220 extern int run_diff_index(struct rev_info *revs, int cached);
 221
 222 extern int diff_flush_patch_id(struct diff_options *, unsigned char *);
 223
 224 #endif /* DIFF_H */