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