diff.hon commit Merge branch 'rd/man-reflog-add-n' (24065b8)
   1/*
   2 * Copyright (C) 2005 Junio C Hamano
   3 */
   4#ifndef DIFF_H
   5#define DIFF_H
   6
   7#include "tree-walk.h"
   8#include "pathspec.h"
   9#include "object.h"
  10
  11struct rev_info;
  12struct diff_options;
  13struct diff_queue_struct;
  14struct strbuf;
  15struct diff_filespec;
  16struct userdiff_driver;
  17struct oid_array;
  18struct commit;
  19struct combine_diff_path;
  20
  21typedef int (*pathchange_fn_t)(struct diff_options *options,
  22                 struct combine_diff_path *path);
  23
  24typedef void (*change_fn_t)(struct diff_options *options,
  25                 unsigned old_mode, unsigned new_mode,
  26                 const struct object_id *old_oid,
  27                 const struct object_id *new_oid,
  28                 int old_oid_valid, int new_oid_valid,
  29                 const char *fullpath,
  30                 unsigned old_dirty_submodule, unsigned new_dirty_submodule);
  31
  32typedef void (*add_remove_fn_t)(struct diff_options *options,
  33                    int addremove, unsigned mode,
  34                    const struct object_id *oid,
  35                    int oid_valid,
  36                    const char *fullpath, unsigned dirty_submodule);
  37
  38typedef void (*diff_format_fn_t)(struct diff_queue_struct *q,
  39                struct diff_options *options, void *data);
  40
  41typedef struct strbuf *(*diff_prefix_fn_t)(struct diff_options *opt, void *data);
  42
  43#define DIFF_FORMAT_RAW         0x0001
  44#define DIFF_FORMAT_DIFFSTAT    0x0002
  45#define DIFF_FORMAT_NUMSTAT     0x0004
  46#define DIFF_FORMAT_SUMMARY     0x0008
  47#define DIFF_FORMAT_PATCH       0x0010
  48#define DIFF_FORMAT_SHORTSTAT   0x0020
  49#define DIFF_FORMAT_DIRSTAT     0x0040
  50
  51/* These override all above */
  52#define DIFF_FORMAT_NAME        0x0100
  53#define DIFF_FORMAT_NAME_STATUS 0x0200
  54#define DIFF_FORMAT_CHECKDIFF   0x0400
  55
  56/* Same as output_format = 0 but we know that -s flag was given
  57 * and we should not give default value to output_format.
  58 */
  59#define DIFF_FORMAT_NO_OUTPUT   0x0800
  60
  61#define DIFF_FORMAT_CALLBACK    0x1000
  62
  63#define DIFF_FLAGS_INIT { 0 }
  64struct diff_flags {
  65        unsigned recursive:1;
  66        unsigned tree_in_recursive:1;
  67        unsigned binary:1;
  68        unsigned text:1;
  69        unsigned full_index:1;
  70        unsigned silent_on_remove:1;
  71        unsigned find_copies_harder:1;
  72        unsigned follow_renames:1;
  73        unsigned rename_empty:1;
  74        unsigned has_changes:1;
  75        unsigned quick:1;
  76        unsigned no_index:1;
  77        unsigned allow_external:1;
  78        unsigned exit_with_status:1;
  79        unsigned reverse_diff:1;
  80        unsigned check_failed:1;
  81        unsigned relative_name:1;
  82        unsigned ignore_submodules:1;
  83        unsigned dirstat_cumulative:1;
  84        unsigned dirstat_by_file:1;
  85        unsigned allow_textconv:1;
  86        unsigned textconv_set_via_cmdline:1;
  87        unsigned diff_from_contents:1;
  88        unsigned dirty_submodules:1;
  89        unsigned ignore_untracked_in_submodules:1;
  90        unsigned ignore_dirty_submodules:1;
  91        unsigned override_submodule_config:1;
  92        unsigned dirstat_by_line:1;
  93        unsigned funccontext:1;
  94        unsigned pickaxe_ignore_case:1;
  95        unsigned default_follow_renames:1;
  96};
  97
  98static inline void diff_flags_or(struct diff_flags *a,
  99                                 const struct diff_flags *b)
 100{
 101        char *tmp_a = (char *)a;
 102        const char *tmp_b = (const char *)b;
 103        int i;
 104
 105        for (i = 0; i < sizeof(struct diff_flags); i++)
 106                tmp_a[i] |= tmp_b[i];
 107}
 108
 109#define DIFF_XDL_TST(opts, flag)    ((opts)->xdl_opts & XDF_##flag)
 110#define DIFF_XDL_SET(opts, flag)    ((opts)->xdl_opts |= XDF_##flag)
 111#define DIFF_XDL_CLR(opts, flag)    ((opts)->xdl_opts &= ~XDF_##flag)
 112
 113#define DIFF_WITH_ALG(opts, flag)   (((opts)->xdl_opts & ~XDF_DIFF_ALGORITHM_MASK) | XDF_##flag)
 114
 115enum diff_words_type {
 116        DIFF_WORDS_NONE = 0,
 117        DIFF_WORDS_PORCELAIN,
 118        DIFF_WORDS_PLAIN,
 119        DIFF_WORDS_COLOR
 120};
 121
 122enum diff_submodule_format {
 123        DIFF_SUBMODULE_SHORT = 0,
 124        DIFF_SUBMODULE_LOG,
 125        DIFF_SUBMODULE_INLINE_DIFF
 126};
 127
 128struct diff_options {
 129        const char *orderfile;
 130        const char *pickaxe;
 131        const char *single_follow;
 132        const char *a_prefix, *b_prefix;
 133        const char *line_prefix;
 134        size_t line_prefix_length;
 135        struct diff_flags flags;
 136
 137        /* diff-filter bits */
 138        unsigned int filter;
 139
 140        int use_color;
 141        int context;
 142        int interhunkcontext;
 143        int break_opt;
 144        int detect_rename;
 145        int irreversible_delete;
 146        int skip_stat_unmatch;
 147        int line_termination;
 148        int output_format;
 149        int pickaxe_opts;
 150        int rename_score;
 151        int rename_limit;
 152        int needed_rename_limit;
 153        int degraded_cc_to_c;
 154        int show_rename_progress;
 155        int dirstat_permille;
 156        int setup;
 157        int abbrev;
 158        int ita_invisible_in_index;
 159/* white-space error highlighting */
 160#define WSEH_NEW (1<<12)
 161#define WSEH_CONTEXT (1<<13)
 162#define WSEH_OLD (1<<14)
 163        unsigned ws_error_highlight;
 164        const char *prefix;
 165        int prefix_length;
 166        const char *stat_sep;
 167        long xdl_opts;
 168
 169        int stat_width;
 170        int stat_name_width;
 171        int stat_graph_width;
 172        int stat_count;
 173        const char *word_regex;
 174        enum diff_words_type word_diff;
 175        enum diff_submodule_format submodule_format;
 176
 177        /* this is set by diffcore for DIFF_FORMAT_PATCH */
 178        int found_changes;
 179
 180        /* to support internal diff recursion by --follow hack*/
 181        int found_follow;
 182
 183        void (*set_default)(struct diff_options *);
 184
 185        FILE *file;
 186        int close_file;
 187
 188        struct pathspec pathspec;
 189        pathchange_fn_t pathchange;
 190        change_fn_t change;
 191        add_remove_fn_t add_remove;
 192        void *change_fn_data;
 193        diff_format_fn_t format_callback;
 194        void *format_callback_data;
 195        diff_prefix_fn_t output_prefix;
 196        void *output_prefix_data;
 197
 198        int diff_path_counter;
 199
 200        struct emitted_diff_symbols *emitted_symbols;
 201        enum {
 202                COLOR_MOVED_NO = 0,
 203                COLOR_MOVED_PLAIN = 1,
 204                COLOR_MOVED_ZEBRA = 2,
 205                COLOR_MOVED_ZEBRA_DIM = 3,
 206        } color_moved;
 207        #define COLOR_MOVED_DEFAULT COLOR_MOVED_ZEBRA
 208        #define COLOR_MOVED_MIN_ALNUM_COUNT 20
 209};
 210
 211void diff_emit_submodule_del(struct diff_options *o, const char *line);
 212void diff_emit_submodule_add(struct diff_options *o, const char *line);
 213void diff_emit_submodule_untracked(struct diff_options *o, const char *path);
 214void diff_emit_submodule_modified(struct diff_options *o, const char *path);
 215void diff_emit_submodule_header(struct diff_options *o, const char *header);
 216void diff_emit_submodule_error(struct diff_options *o, const char *err);
 217void diff_emit_submodule_pipethrough(struct diff_options *o,
 218                                     const char *line, int len);
 219
 220enum color_diff {
 221        DIFF_RESET = 0,
 222        DIFF_CONTEXT = 1,
 223        DIFF_METAINFO = 2,
 224        DIFF_FRAGINFO = 3,
 225        DIFF_FILE_OLD = 4,
 226        DIFF_FILE_NEW = 5,
 227        DIFF_COMMIT = 6,
 228        DIFF_WHITESPACE = 7,
 229        DIFF_FUNCINFO = 8,
 230        DIFF_FILE_OLD_MOVED = 9,
 231        DIFF_FILE_OLD_MOVED_ALT = 10,
 232        DIFF_FILE_OLD_MOVED_DIM = 11,
 233        DIFF_FILE_OLD_MOVED_ALT_DIM = 12,
 234        DIFF_FILE_NEW_MOVED = 13,
 235        DIFF_FILE_NEW_MOVED_ALT = 14,
 236        DIFF_FILE_NEW_MOVED_DIM = 15,
 237        DIFF_FILE_NEW_MOVED_ALT_DIM = 16
 238};
 239const char *diff_get_color(int diff_use_color, enum color_diff ix);
 240#define diff_get_color_opt(o, ix) \
 241        diff_get_color((o)->use_color, ix)
 242
 243
 244const char *diff_line_prefix(struct diff_options *);
 245
 246
 247extern const char mime_boundary_leader[];
 248
 249extern struct combine_diff_path *diff_tree_paths(
 250        struct combine_diff_path *p, const struct object_id *oid,
 251        const struct object_id **parents_oid, int nparent,
 252        struct strbuf *base, struct diff_options *opt);
 253extern int diff_tree_oid(const struct object_id *old_oid,
 254                         const struct object_id *new_oid,
 255                         const char *base, struct diff_options *opt);
 256extern int diff_root_tree_oid(const struct object_id *new_oid, const char *base,
 257                              struct diff_options *opt);
 258
 259struct combine_diff_path {
 260        struct combine_diff_path *next;
 261        char *path;
 262        unsigned int mode;
 263        struct object_id oid;
 264        struct combine_diff_parent {
 265                char status;
 266                unsigned int mode;
 267                struct object_id oid;
 268        } parent[FLEX_ARRAY];
 269};
 270#define combine_diff_path_size(n, l) \
 271        st_add4(sizeof(struct combine_diff_path), (l), 1, \
 272                st_mult(sizeof(struct combine_diff_parent), (n)))
 273
 274extern void show_combined_diff(struct combine_diff_path *elem, int num_parent,
 275                              int dense, struct rev_info *);
 276
 277extern void diff_tree_combined(const struct object_id *oid, const struct oid_array *parents, int dense, struct rev_info *rev);
 278
 279extern void diff_tree_combined_merge(const struct commit *commit, int dense, struct rev_info *rev);
 280
 281void diff_set_mnemonic_prefix(struct diff_options *options, const char *a, const char *b);
 282
 283extern int diff_can_quit_early(struct diff_options *);
 284
 285extern void diff_addremove(struct diff_options *,
 286                           int addremove,
 287                           unsigned mode,
 288                           const struct object_id *oid,
 289                           int oid_valid,
 290                           const char *fullpath, unsigned dirty_submodule);
 291
 292extern void diff_change(struct diff_options *,
 293                        unsigned mode1, unsigned mode2,
 294                        const struct object_id *old_oid,
 295                        const struct object_id *new_oid,
 296                        int old_oid_valid, int new_oid_valid,
 297                        const char *fullpath,
 298                        unsigned dirty_submodule1, unsigned dirty_submodule2);
 299
 300extern struct diff_filepair *diff_unmerge(struct diff_options *, const char *path);
 301
 302#define DIFF_SETUP_REVERSE              1
 303#define DIFF_SETUP_USE_CACHE            2
 304#define DIFF_SETUP_USE_SIZE_CACHE       4
 305
 306/*
 307 * Poor man's alternative to parse-option, to allow both stuck form
 308 * (--option=value) and separate form (--option value).
 309 */
 310extern int parse_long_opt(const char *opt, const char **argv,
 311                         const char **optarg);
 312
 313extern int git_diff_basic_config(const char *var, const char *value, void *cb);
 314extern int git_diff_heuristic_config(const char *var, const char *value, void *cb);
 315extern void init_diff_ui_defaults(void);
 316extern int git_diff_ui_config(const char *var, const char *value, void *cb);
 317extern void diff_setup(struct diff_options *);
 318extern int diff_opt_parse(struct diff_options *, const char **, int, const char *);
 319extern void diff_setup_done(struct diff_options *);
 320
 321#define DIFF_DETECT_RENAME      1
 322#define DIFF_DETECT_COPY        2
 323
 324#define DIFF_PICKAXE_ALL        1
 325#define DIFF_PICKAXE_REGEX      2
 326
 327#define DIFF_PICKAXE_KIND_S     4 /* traditional plumbing counter */
 328#define DIFF_PICKAXE_KIND_G     8 /* grep in the patch */
 329
 330extern void diffcore_std(struct diff_options *);
 331extern void diffcore_fix_diff_index(struct diff_options *);
 332
 333#define COMMON_DIFF_OPTIONS_HELP \
 334"\ncommon diff options:\n" \
 335"  -z            output diff-raw with lines terminated with NUL.\n" \
 336"  -p            output patch format.\n" \
 337"  -u            synonym for -p.\n" \
 338"  --patch-with-raw\n" \
 339"                output both a patch and the diff-raw format.\n" \
 340"  --stat        show diffstat instead of patch.\n" \
 341"  --numstat     show numeric diffstat instead of patch.\n" \
 342"  --patch-with-stat\n" \
 343"                output a patch and prepend its diffstat.\n" \
 344"  --name-only   show only names of changed files.\n" \
 345"  --name-status show names and status of changed files.\n" \
 346"  --full-index  show full object name on index lines.\n" \
 347"  --abbrev=<n>  abbreviate object names in diff-tree header and diff-raw.\n" \
 348"  -R            swap input file pairs.\n" \
 349"  -B            detect complete rewrites.\n" \
 350"  -M            detect renames.\n" \
 351"  -C            detect copies.\n" \
 352"  --find-copies-harder\n" \
 353"                try unchanged files as candidate for copy detection.\n" \
 354"  -l<n>         limit rename attempts up to <n> paths.\n" \
 355"  -O<file>      reorder diffs according to the <file>.\n" \
 356"  -S<string>    find filepair whose only one side contains the string.\n" \
 357"  --pickaxe-all\n" \
 358"                show all files diff when -S is used and hit is found.\n" \
 359"  -a  --text    treat all files as text.\n"
 360
 361extern int diff_queue_is_empty(void);
 362extern void diff_flush(struct diff_options*);
 363extern void diff_warn_rename_limit(const char *varname, int needed, int degraded_cc);
 364
 365/* diff-raw status letters */
 366#define DIFF_STATUS_ADDED               'A'
 367#define DIFF_STATUS_COPIED              'C'
 368#define DIFF_STATUS_DELETED             'D'
 369#define DIFF_STATUS_MODIFIED            'M'
 370#define DIFF_STATUS_RENAMED             'R'
 371#define DIFF_STATUS_TYPE_CHANGED        'T'
 372#define DIFF_STATUS_UNKNOWN             'X'
 373#define DIFF_STATUS_UNMERGED            'U'
 374
 375/* these are not diff-raw status letters proper, but used by
 376 * diffcore-filter insn to specify additional restrictions.
 377 */
 378#define DIFF_STATUS_FILTER_AON          '*'
 379#define DIFF_STATUS_FILTER_BROKEN       'B'
 380
 381/*
 382 * This is different from find_unique_abbrev() in that
 383 * it stuffs the result with dots for alignment.
 384 */
 385extern const char *diff_aligned_abbrev(const struct object_id *sha1, int);
 386
 387/* do not report anything on removed paths */
 388#define DIFF_SILENT_ON_REMOVED 01
 389/* report racily-clean paths as modified */
 390#define DIFF_RACY_IS_MODIFIED 02
 391extern int run_diff_files(struct rev_info *revs, unsigned int option);
 392extern int run_diff_index(struct rev_info *revs, int cached);
 393
 394extern int do_diff_cache(const struct object_id *, struct diff_options *);
 395extern int diff_flush_patch_id(struct diff_options *, struct object_id *, int);
 396
 397extern int diff_result_code(struct diff_options *, int);
 398
 399extern void diff_no_index(struct rev_info *, int, const char **);
 400
 401extern int index_differs_from(const char *def, const struct diff_flags *flags,
 402                              int ita_invisible_in_index);
 403
 404/*
 405 * Fill the contents of the filespec "df", respecting any textconv defined by
 406 * its userdiff driver.  The "driver" parameter must come from a
 407 * previous call to get_textconv(), and therefore should either be NULL or have
 408 * textconv enabled.
 409 *
 410 * Note that the memory ownership of the resulting buffer depends on whether
 411 * the driver field is NULL. If it is, then the memory belongs to the filespec
 412 * struct. If it is non-NULL, then "outbuf" points to a newly allocated buffer
 413 * that should be freed by the caller.
 414 */
 415extern size_t fill_textconv(struct userdiff_driver *driver,
 416                            struct diff_filespec *df,
 417                            char **outbuf);
 418
 419/*
 420 * Look up the userdiff driver for the given filespec, and return it if
 421 * and only if it has textconv enabled (otherwise return NULL). The result
 422 * can be passed to fill_textconv().
 423 */
 424extern struct userdiff_driver *get_textconv(struct diff_filespec *one);
 425
 426/*
 427 * Prepare diff_filespec and convert it using diff textconv API
 428 * if the textconv driver exists.
 429 * Return 1 if the conversion succeeds, 0 otherwise.
 430 */
 431extern int textconv_object(const char *path, unsigned mode, const struct object_id *oid, int oid_valid, char **buf, unsigned long *buf_size);
 432
 433extern int parse_rename_score(const char **cp_p);
 434
 435extern long parse_algorithm_value(const char *value);
 436
 437extern void print_stat_summary(FILE *fp, int files,
 438                               int insertions, int deletions);
 439extern void setup_diff_pager(struct diff_options *);
 440
 441#endif /* DIFF_H */