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 struct strbuf;
  13 struct diff_filespec;
  14 struct userdiff_driver;
  15 struct sha1_array;
  16 struct commit;
  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 *fullpath,
  23                  unsigned old_dirty_submodule, unsigned new_dirty_submodule);
  24
  25 typedef void (*add_remove_fn_t)(struct diff_options *options,
  26                     int addremove, unsigned mode,
  27                     const unsigned char *sha1,
  28                     const char *fullpath, unsigned dirty_submodule);
  29
  30 typedef void (*diff_format_fn_t)(struct diff_queue_struct *q,
  31                 struct diff_options *options, void *data);
  32
  33 typedef struct strbuf *(*diff_prefix_fn_t)(struct diff_options *opt, void *data);
  34
  35 #define DIFF_FORMAT_RAW         0x0001
  36 #define DIFF_FORMAT_DIFFSTAT    0x0002
  37 #define DIFF_FORMAT_NUMSTAT     0x0004
  38 #define DIFF_FORMAT_SUMMARY     0x0008
  39 #define DIFF_FORMAT_PATCH       0x0010
  40 #define DIFF_FORMAT_SHORTSTAT   0x0020
  41 #define DIFF_FORMAT_DIRSTAT     0x0040
  42
  43 /* These override all above */
  44 #define DIFF_FORMAT_NAME        0x0100
  45 #define DIFF_FORMAT_NAME_STATUS 0x0200
  46 #define DIFF_FORMAT_CHECKDIFF   0x0400
  47
  48 /* Same as output_format = 0 but we know that -s flag was given
  49  * and we should not give default value to output_format.
  50  */
  51 #define DIFF_FORMAT_NO_OUTPUT   0x0800
  52
  53 #define DIFF_FORMAT_CALLBACK    0x1000
  54
  55 #define DIFF_OPT_RECURSIVE           (1 <<  0)
  56 #define DIFF_OPT_TREE_IN_RECURSIVE   (1 <<  1)
  57 #define DIFF_OPT_BINARY              (1 <<  2)
  58 #define DIFF_OPT_TEXT                (1 <<  3)
  59 #define DIFF_OPT_FULL_INDEX          (1 <<  4)
  60 #define DIFF_OPT_SILENT_ON_REMOVE    (1 <<  5)
  61 #define DIFF_OPT_FIND_COPIES_HARDER  (1 <<  6)
  62 #define DIFF_OPT_FOLLOW_RENAMES      (1 <<  7)
  63 #define DIFF_OPT_RENAME_EMPTY        (1 <<  8)
  64 /* (1 <<  9) unused */
  65 #define DIFF_OPT_HAS_CHANGES         (1 << 10)
  66 #define DIFF_OPT_QUICK               (1 << 11)
  67 #define DIFF_OPT_NO_INDEX            (1 << 12)
  68 #define DIFF_OPT_ALLOW_EXTERNAL      (1 << 13)
  69 #define DIFF_OPT_EXIT_WITH_STATUS    (1 << 14)
  70 #define DIFF_OPT_REVERSE_DIFF        (1 << 15)
  71 #define DIFF_OPT_CHECK_FAILED        (1 << 16)
  72 #define DIFF_OPT_RELATIVE_NAME       (1 << 17)
  73 #define DIFF_OPT_IGNORE_SUBMODULES   (1 << 18)
  74 #define DIFF_OPT_DIRSTAT_CUMULATIVE  (1 << 19)
  75 #define DIFF_OPT_DIRSTAT_BY_FILE     (1 << 20)
  76 #define DIFF_OPT_ALLOW_TEXTCONV      (1 << 21)
  77 #define DIFF_OPT_DIFF_FROM_CONTENTS  (1 << 22)
  78 #define DIFF_OPT_SUBMODULE_LOG       (1 << 23)
  79 #define DIFF_OPT_DIRTY_SUBMODULES    (1 << 24)
  80 #define DIFF_OPT_IGNORE_UNTRACKED_IN_SUBMODULES (1 << 25)
  81 #define DIFF_OPT_IGNORE_DIRTY_SUBMODULES (1 << 26)
  82 #define DIFF_OPT_OVERRIDE_SUBMODULE_CONFIG (1 << 27)
  83 #define DIFF_OPT_DIRSTAT_BY_LINE     (1 << 28)
  84 #define DIFF_OPT_FUNCCONTEXT         (1 << 29)
  85 #define DIFF_OPT_PICKAXE_IGNORE_CASE (1 << 30)
  86
  87 #define DIFF_OPT_TST(opts, flag)    ((opts)->flags & DIFF_OPT_##flag)
  88 #define DIFF_OPT_SET(opts, flag)    ((opts)->flags |= DIFF_OPT_##flag)
  89 #define DIFF_OPT_CLR(opts, flag)    ((opts)->flags &= ~DIFF_OPT_##flag)
  90 #define DIFF_XDL_TST(opts, flag)    ((opts)->xdl_opts & XDF_##flag)
  91 #define DIFF_XDL_SET(opts, flag)    ((opts)->xdl_opts |= XDF_##flag)
  92 #define DIFF_XDL_CLR(opts, flag)    ((opts)->xdl_opts &= ~XDF_##flag)
  93
  94 enum diff_words_type {
  95         DIFF_WORDS_NONE = 0,
  96         DIFF_WORDS_PORCELAIN,
  97         DIFF_WORDS_PLAIN,
  98         DIFF_WORDS_COLOR
  99 };
 100
 101 struct diff_options {
 102         const char *filter;
 103         const char *orderfile;
 104         const char *pickaxe;
 105         const char *single_follow;
 106         const char *a_prefix, *b_prefix;
 107         unsigned flags;
 108         int use_color;
 109         int context;
 110         int interhunkcontext;
 111         int break_opt;
 112         int detect_rename;
 113         int irreversible_delete;
 114         int skip_stat_unmatch;
 115         int line_termination;
 116         int output_format;
 117         int pickaxe_opts;
 118         int rename_score;
 119         int rename_limit;
 120         int needed_rename_limit;
 121         int degraded_cc_to_c;
 122         int show_rename_progress;
 123         int dirstat_permille;
 124         int setup;
 125         int abbrev;
 126         const char *prefix;
 127         int prefix_length;
 128         const char *stat_sep;
 129         long xdl_opts;
 130
 131         int stat_width;
 132         int stat_name_width;
 133         int stat_graph_width;
 134         int stat_count;
 135         const char *word_regex;
 136         enum diff_words_type word_diff;
 137
 138         /* this is set by diffcore for DIFF_FORMAT_PATCH */
 139         int found_changes;
 140
 141         /* to support internal diff recursion by --follow hack*/
 142         int found_follow;
 143
 144         FILE *file;
 145         int close_file;
 146
 147         struct pathspec pathspec;
 148         change_fn_t change;
 149         add_remove_fn_t add_remove;
 150         diff_format_fn_t format_callback;
 151         void *format_callback_data;
 152         diff_prefix_fn_t output_prefix;
 153         void *output_prefix_data;
 154 };
 155
 156 enum color_diff {
 157         DIFF_RESET = 0,
 158         DIFF_PLAIN = 1,
 159         DIFF_METAINFO = 2,
 160         DIFF_FRAGINFO = 3,
 161         DIFF_FILE_OLD = 4,
 162         DIFF_FILE_NEW = 5,
 163         DIFF_COMMIT = 6,
 164         DIFF_WHITESPACE = 7,
 165         DIFF_FUNCINFO = 8
 166 };
 167 const char *diff_get_color(int diff_use_color, enum color_diff ix);
 168 #define diff_get_color_opt(o, ix) \
 169         diff_get_color((o)->use_color, ix)
 170
 171
 172 extern const char mime_boundary_leader[];
 173
 174 extern void diff_tree_setup_paths(const char **paths, struct diff_options *);
 175 extern void diff_tree_release_paths(struct diff_options *);
 176 extern int diff_tree(struct tree_desc *t1, struct tree_desc *t2,
 177                      const char *base, struct diff_options *opt);
 178 extern int diff_tree_sha1(const unsigned char *old, const unsigned char *new,
 179                           const char *base, struct diff_options *opt);
 180 extern int diff_root_tree_sha1(const unsigned char *new, const char *base,
 181                                struct diff_options *opt);
 182
 183 struct combine_diff_path {
 184         struct combine_diff_path *next;
 185         int len;
 186         char *path;
 187         unsigned int mode;
 188         unsigned char sha1[20];
 189         struct combine_diff_parent {
 190                 char status;
 191                 unsigned int mode;
 192                 unsigned char sha1[20];
 193         } parent[FLEX_ARRAY];
 194 };
 195 #define combine_diff_path_size(n, l) \
 196         (sizeof(struct combine_diff_path) + \
 197          sizeof(struct combine_diff_parent) * (n) + (l) + 1)
 198
 199 extern void show_combined_diff(struct combine_diff_path *elem, int num_parent,
 200                               int dense, struct rev_info *);
 201
 202 extern void diff_tree_combined(const unsigned char *sha1, const struct sha1_array *parents, int dense, struct rev_info *rev);
 203
 204 extern void diff_tree_combined_merge(const struct commit *commit, int dense, struct rev_info *rev);
 205
 206 void diff_set_mnemonic_prefix(struct diff_options *options, const char *a, const char *b);
 207
 208 extern int diff_can_quit_early(struct diff_options *);
 209
 210 extern void diff_addremove(struct diff_options *,
 211                            int addremove,
 212                            unsigned mode,
 213                            const unsigned char *sha1,
 214                            const char *fullpath, unsigned dirty_submodule);
 215
 216 extern void diff_change(struct diff_options *,
 217                         unsigned mode1, unsigned mode2,
 218                         const unsigned char *sha1,
 219                         const unsigned char *sha2,
 220                         const char *fullpath,
 221                         unsigned dirty_submodule1, unsigned dirty_submodule2);
 222
 223 extern struct diff_filepair *diff_unmerge(struct diff_options *, const char *path);
 224
 225 #define DIFF_SETUP_REVERSE              1
 226 #define DIFF_SETUP_USE_CACHE            2
 227 #define DIFF_SETUP_USE_SIZE_CACHE       4
 228
 229 /*
 230  * Poor man's alternative to parse-option, to allow both sticked form
 231  * (--option=value) and separate form (--option value).
 232  */
 233 extern int parse_long_opt(const char *opt, const char **argv,
 234                          const char **optarg);
 235
 236 extern int git_diff_basic_config(const char *var, const char *value, void *cb);
 237 extern int git_diff_ui_config(const char *var, const char *value, void *cb);
 238 extern int diff_use_color_default;
 239 extern void diff_setup(struct diff_options *);
 240 extern int diff_opt_parse(struct diff_options *, const char **, int);
 241 extern int diff_setup_done(struct diff_options *);
 242
 243 #define DIFF_DETECT_RENAME      1
 244 #define DIFF_DETECT_COPY        2
 245
 246 #define DIFF_PICKAXE_ALL        1
 247 #define DIFF_PICKAXE_REGEX      2
 248
 249 #define DIFF_PICKAXE_KIND_S     4 /* traditional plumbing counter */
 250 #define DIFF_PICKAXE_KIND_G     8 /* grep in the patch */
 251
 252 extern void diffcore_std(struct diff_options *);
 253 extern void diffcore_fix_diff_index(struct diff_options *);
 254
 255 #define COMMON_DIFF_OPTIONS_HELP \
 256 "\ncommon diff options:\n" \
 257 "  -z            output diff-raw with lines terminated with NUL.\n" \
 258 "  -p            output patch format.\n" \
 259 "  -u            synonym for -p.\n" \
 260 "  --patch-with-raw\n" \
 261 "                output both a patch and the diff-raw format.\n" \
 262 "  --stat        show diffstat instead of patch.\n" \
 263 "  --numstat     show numeric diffstat instead of patch.\n" \
 264 "  --patch-with-stat\n" \
 265 "                output a patch and prepend its diffstat.\n" \
 266 "  --name-only   show only names of changed files.\n" \
 267 "  --name-status show names and status of changed files.\n" \
 268 "  --full-index  show full object name on index lines.\n" \
 269 "  --abbrev=<n>  abbreviate object names in diff-tree header and diff-raw.\n" \
 270 "  -R            swap input file pairs.\n" \
 271 "  -B            detect complete rewrites.\n" \
 272 "  -M            detect renames.\n" \
 273 "  -C            detect copies.\n" \
 274 "  --find-copies-harder\n" \
 275 "                try unchanged files as candidate for copy detection.\n" \
 276 "  -l<n>         limit rename attempts up to <n> paths.\n" \
 277 "  -O<file>      reorder diffs according to the <file>.\n" \
 278 "  -S<string>    find filepair whose only one side contains the string.\n" \
 279 "  --pickaxe-all\n" \
 280 "                show all files diff when -S is used and hit is found.\n" \
 281 "  -a  --text    treat all files as text.\n"
 282
 283 extern int diff_queue_is_empty(void);
 284 extern void diff_flush(struct diff_options*);
 285 extern void diff_warn_rename_limit(const char *varname, int needed, int degraded_cc);
 286
 287 /* diff-raw status letters */
 288 #define DIFF_STATUS_ADDED               'A'
 289 #define DIFF_STATUS_COPIED              'C'
 290 #define DIFF_STATUS_DELETED             'D'
 291 #define DIFF_STATUS_MODIFIED            'M'
 292 #define DIFF_STATUS_RENAMED             'R'
 293 #define DIFF_STATUS_TYPE_CHANGED        'T'
 294 #define DIFF_STATUS_UNKNOWN             'X'
 295 #define DIFF_STATUS_UNMERGED            'U'
 296
 297 /* these are not diff-raw status letters proper, but used by
 298  * diffcore-filter insn to specify additional restrictions.
 299  */
 300 #define DIFF_STATUS_FILTER_AON          '*'
 301 #define DIFF_STATUS_FILTER_BROKEN       'B'
 302
 303 extern const char *diff_unique_abbrev(const unsigned char *, int);
 304
 305 /* do not report anything on removed paths */
 306 #define DIFF_SILENT_ON_REMOVED 01
 307 /* report racily-clean paths as modified */
 308 #define DIFF_RACY_IS_MODIFIED 02
 309 extern int run_diff_files(struct rev_info *revs, unsigned int option);
 310 extern int run_diff_index(struct rev_info *revs, int cached);
 311
 312 extern int do_diff_cache(const unsigned char *, struct diff_options *);
 313 extern int diff_flush_patch_id(struct diff_options *, unsigned char *);
 314
 315 extern int diff_result_code(struct diff_options *, int);
 316
 317 extern void diff_no_index(struct rev_info *, int, const char **, int, const char *);
 318
 319 extern int index_differs_from(const char *def, int diff_flags);
 320
 321 extern size_t fill_textconv(struct userdiff_driver *driver,
 322                             struct diff_filespec *df,
 323                             char **outbuf);
 324
 325 extern struct userdiff_driver *get_textconv(struct diff_filespec *one);
 326
 327 extern int parse_rename_score(const char **cp_p);
 328
 329 extern int print_stat_summary(FILE *fp, int files,
 330                               int insertions, int deletions);
 331
 332 #endif /* DIFF_H */