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 *fullpath);
  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 *fullpath);
  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 #define DIFF_FORMAT_SHORTSTAT   0x0020
  33 #define DIFF_FORMAT_DIRSTAT     0x0040
  34
  35 /* These override all above */
  36 #define DIFF_FORMAT_NAME        0x0100
  37 #define DIFF_FORMAT_NAME_STATUS 0x0200
  38 #define DIFF_FORMAT_CHECKDIFF   0x0400
  39
  40 /* Same as output_format = 0 but we know that -s flag was given
  41  * and we should not give default value to output_format.
  42  */
  43 #define DIFF_FORMAT_NO_OUTPUT   0x0800
  44
  45 #define DIFF_FORMAT_CALLBACK    0x1000
  46
  47 #define DIFF_OPT_RECURSIVE           (1 <<  0)
  48 #define DIFF_OPT_TREE_IN_RECURSIVE   (1 <<  1)
  49 #define DIFF_OPT_BINARY              (1 <<  2)
  50 #define DIFF_OPT_TEXT                (1 <<  3)
  51 #define DIFF_OPT_FULL_INDEX          (1 <<  4)
  52 #define DIFF_OPT_SILENT_ON_REMOVE    (1 <<  5)
  53 #define DIFF_OPT_FIND_COPIES_HARDER  (1 <<  6)
  54 #define DIFF_OPT_FOLLOW_RENAMES      (1 <<  7)
  55 #define DIFF_OPT_COLOR_DIFF          (1 <<  8)
  56 #define DIFF_OPT_COLOR_DIFF_WORDS    (1 <<  9)
  57 #define DIFF_OPT_HAS_CHANGES         (1 << 10)
  58 #define DIFF_OPT_QUICK               (1 << 11)
  59 #define DIFF_OPT_NO_INDEX            (1 << 12)
  60 #define DIFF_OPT_ALLOW_EXTERNAL      (1 << 13)
  61 #define DIFF_OPT_EXIT_WITH_STATUS    (1 << 14)
  62 #define DIFF_OPT_REVERSE_DIFF        (1 << 15)
  63 #define DIFF_OPT_CHECK_FAILED        (1 << 16)
  64 #define DIFF_OPT_RELATIVE_NAME       (1 << 17)
  65 #define DIFF_OPT_IGNORE_SUBMODULES   (1 << 18)
  66 #define DIFF_OPT_DIRSTAT_CUMULATIVE  (1 << 19)
  67 #define DIFF_OPT_DIRSTAT_BY_FILE     (1 << 20)
  68 #define DIFF_OPT_ALLOW_TEXTCONV      (1 << 21)
  69 #define DIFF_OPT_DIFF_FROM_CONTENTS  (1 << 22)
  70 #define DIFF_OPT_SUMMARIZE_SUBMODULES (1 << 23)
  71 #define DIFF_OPT_TST(opts, flag)    ((opts)->flags & DIFF_OPT_##flag)
  72 #define DIFF_OPT_SET(opts, flag)    ((opts)->flags |= DIFF_OPT_##flag)
  73 #define DIFF_OPT_CLR(opts, flag)    ((opts)->flags &= ~DIFF_OPT_##flag)
  74 #define DIFF_XDL_TST(opts, flag)    ((opts)->xdl_opts & XDF_##flag)
  75 #define DIFF_XDL_SET(opts, flag)    ((opts)->xdl_opts |= XDF_##flag)
  76 #define DIFF_XDL_CLR(opts, flag)    ((opts)->xdl_opts &= ~XDF_##flag)
  77
  78 struct diff_options {
  79         const char *filter;
  80         const char *orderfile;
  81         const char *pickaxe;
  82         const char *single_follow;
  83         const char *a_prefix, *b_prefix;
  84         unsigned flags;
  85         int context;
  86         int interhunkcontext;
  87         int break_opt;
  88         int detect_rename;
  89         int skip_stat_unmatch;
  90         int line_termination;
  91         int output_format;
  92         int pickaxe_opts;
  93         int rename_score;
  94         int rename_limit;
  95         int warn_on_too_large_rename;
  96         int dirstat_percent;
  97         int setup;
  98         int abbrev;
  99         const char *prefix;
 100         int prefix_length;
 101         const char *stat_sep;
 102         long xdl_opts;
 103
 104         int stat_width;
 105         int stat_name_width;
 106         const char *word_regex;
 107
 108         /* this is set by diffcore for DIFF_FORMAT_PATCH */
 109         int found_changes;
 110
 111         FILE *file;
 112         int close_file;
 113
 114         int nr_paths;
 115         const char **paths;
 116         int *pathlens;
 117         change_fn_t change;
 118         add_remove_fn_t add_remove;
 119         diff_format_fn_t format_callback;
 120         void *format_callback_data;
 121 };
 122
 123 enum color_diff {
 124         DIFF_RESET = 0,
 125         DIFF_PLAIN = 1,
 126         DIFF_METAINFO = 2,
 127         DIFF_FRAGINFO = 3,
 128         DIFF_FILE_OLD = 4,
 129         DIFF_FILE_NEW = 5,
 130         DIFF_COMMIT = 6,
 131         DIFF_WHITESPACE = 7,
 132 };
 133 const char *diff_get_color(int diff_use_color, enum color_diff ix);
 134 #define diff_get_color_opt(o, ix) \
 135         diff_get_color(DIFF_OPT_TST((o), COLOR_DIFF), ix)
 136
 137
 138 extern const char mime_boundary_leader[];
 139
 140 extern void diff_tree_setup_paths(const char **paths, struct diff_options *);
 141 extern void diff_tree_release_paths(struct diff_options *);
 142 extern int diff_tree(struct tree_desc *t1, struct tree_desc *t2,
 143                      const char *base, struct diff_options *opt);
 144 extern int diff_tree_sha1(const unsigned char *old, const unsigned char *new,
 145                           const char *base, struct diff_options *opt);
 146 extern int diff_root_tree_sha1(const unsigned char *new, const char *base,
 147                                struct diff_options *opt);
 148
 149 struct combine_diff_path {
 150         struct combine_diff_path *next;
 151         int len;
 152         char *path;
 153         unsigned int mode;
 154         unsigned char sha1[20];
 155         struct combine_diff_parent {
 156                 char status;
 157                 unsigned int mode;
 158                 unsigned char sha1[20];
 159         } parent[FLEX_ARRAY];
 160 };
 161 #define combine_diff_path_size(n, l) \
 162         (sizeof(struct combine_diff_path) + \
 163          sizeof(struct combine_diff_parent) * (n) + (l) + 1)
 164
 165 extern void show_combined_diff(struct combine_diff_path *elem, int num_parent,
 166                               int dense, struct rev_info *);
 167
 168 extern void diff_tree_combined(const unsigned char *sha1, const unsigned char parent[][20], int num_parent, int dense, struct rev_info *rev);
 169
 170 extern void diff_tree_combined_merge(const unsigned char *sha1, int, struct rev_info *);
 171
 172 void diff_set_mnemonic_prefix(struct diff_options *options, const char *a, const char *b);
 173
 174 extern void diff_addremove(struct diff_options *,
 175                            int addremove,
 176                            unsigned mode,
 177                            const unsigned char *sha1,
 178                            const char *fullpath);
 179
 180 extern void diff_change(struct diff_options *,
 181                         unsigned mode1, unsigned mode2,
 182                         const unsigned char *sha1,
 183                         const unsigned char *sha2,
 184                         const char *fullpath);
 185
 186 extern void diff_unmerge(struct diff_options *,
 187                          const char *path,
 188                          unsigned mode,
 189                          const unsigned char *sha1);
 190
 191 #define DIFF_SETUP_REVERSE              1
 192 #define DIFF_SETUP_USE_CACHE            2
 193 #define DIFF_SETUP_USE_SIZE_CACHE       4
 194
 195 extern int git_diff_basic_config(const char *var, const char *value, void *cb);
 196 extern int git_diff_ui_config(const char *var, const char *value, void *cb);
 197 extern int diff_use_color_default;
 198 extern void diff_setup(struct diff_options *);
 199 extern int diff_opt_parse(struct diff_options *, const char **, int);
 200 extern int diff_setup_done(struct diff_options *);
 201
 202 #define DIFF_DETECT_RENAME      1
 203 #define DIFF_DETECT_COPY        2
 204
 205 #define DIFF_PICKAXE_ALL        1
 206 #define DIFF_PICKAXE_REGEX      2
 207
 208 extern void diffcore_std(struct diff_options *);
 209
 210 #define COMMON_DIFF_OPTIONS_HELP \
 211 "\ncommon diff options:\n" \
 212 "  -z            output diff-raw with lines terminated with NUL.\n" \
 213 "  -p            output patch format.\n" \
 214 "  -u            synonym for -p.\n" \
 215 "  --patch-with-raw\n" \
 216 "                output both a patch and the diff-raw format.\n" \
 217 "  --stat        show diffstat instead of patch.\n" \
 218 "  --numstat     show numeric diffstat instead of patch.\n" \
 219 "  --patch-with-stat\n" \
 220 "                output a patch and prepend its diffstat.\n" \
 221 "  --name-only   show only names of changed files.\n" \
 222 "  --name-status show names and status of changed files.\n" \
 223 "  --full-index  show full object name on index lines.\n" \
 224 "  --abbrev=<n>  abbreviate object names in diff-tree header and diff-raw.\n" \
 225 "  -R            swap input file pairs.\n" \
 226 "  -B            detect complete rewrites.\n" \
 227 "  -M            detect renames.\n" \
 228 "  -C            detect copies.\n" \
 229 "  --find-copies-harder\n" \
 230 "                try unchanged files as candidate for copy detection.\n" \
 231 "  -l<n>         limit rename attempts up to <n> paths.\n" \
 232 "  -O<file>      reorder diffs according to the <file>.\n" \
 233 "  -S<string>    find filepair whose only one side contains the string.\n" \
 234 "  --pickaxe-all\n" \
 235 "                show all files diff when -S is used and hit is found.\n" \
 236 "  -a  --text    treat all files as text.\n"
 237
 238 extern int diff_queue_is_empty(void);
 239 extern void diff_flush(struct diff_options*);
 240
 241 /* diff-raw status letters */
 242 #define DIFF_STATUS_ADDED               'A'
 243 #define DIFF_STATUS_COPIED              'C'
 244 #define DIFF_STATUS_DELETED             'D'
 245 #define DIFF_STATUS_MODIFIED            'M'
 246 #define DIFF_STATUS_RENAMED             'R'
 247 #define DIFF_STATUS_TYPE_CHANGED        'T'
 248 #define DIFF_STATUS_UNKNOWN             'X'
 249 #define DIFF_STATUS_UNMERGED            'U'
 250
 251 /* these are not diff-raw status letters proper, but used by
 252  * diffcore-filter insn to specify additional restrictions.
 253  */
 254 #define DIFF_STATUS_FILTER_AON          '*'
 255 #define DIFF_STATUS_FILTER_BROKEN       'B'
 256
 257 extern const char *diff_unique_abbrev(const unsigned char *, int);
 258
 259 /* do not report anything on removed paths */
 260 #define DIFF_SILENT_ON_REMOVED 01
 261 /* report racily-clean paths as modified */
 262 #define DIFF_RACY_IS_MODIFIED 02
 263 extern int run_diff_files(struct rev_info *revs, unsigned int option);
 264 extern int run_diff_index(struct rev_info *revs, int cached);
 265
 266 extern int do_diff_cache(const unsigned char *, struct diff_options *);
 267 extern int diff_flush_patch_id(struct diff_options *, unsigned char *);
 268
 269 extern int diff_result_code(struct diff_options *, int);
 270
 271 extern void diff_no_index(struct rev_info *, int, const char **, int, const char *);
 272
 273 extern int index_differs_from(const char *def, int diff_flags);
 274
 275 #endif /* DIFF_H */