Andrew's git - gitweb.git/blob

219a28aa0f9c848a22060da1b127afd1532987db
   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 sha1_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 unsigned char *old_sha1,
  27                 const unsigned char *new_sha1,
  28                 int old_sha1_valid, int new_sha1_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 unsigned char *sha1,
  35                    int sha1_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_OPT_RECURSIVE           (1 <<  0)
  64#define DIFF_OPT_TREE_IN_RECURSIVE   (1 <<  1)
  65#define DIFF_OPT_BINARY              (1 <<  2)
  66#define DIFF_OPT_TEXT                (1 <<  3)
  67#define DIFF_OPT_FULL_INDEX          (1 <<  4)
  68#define DIFF_OPT_SILENT_ON_REMOVE    (1 <<  5)
  69#define DIFF_OPT_FIND_COPIES_HARDER  (1 <<  6)
  70#define DIFF_OPT_FOLLOW_RENAMES      (1 <<  7)
  71#define DIFF_OPT_RENAME_EMPTY        (1 <<  8)
  72/* (1 <<  9) unused */
  73#define DIFF_OPT_HAS_CHANGES         (1 << 10)
  74#define DIFF_OPT_QUICK               (1 << 11)
  75#define DIFF_OPT_NO_INDEX            (1 << 12)
  76#define DIFF_OPT_ALLOW_EXTERNAL      (1 << 13)
  77#define DIFF_OPT_EXIT_WITH_STATUS    (1 << 14)
  78#define DIFF_OPT_REVERSE_DIFF        (1 << 15)
  79#define DIFF_OPT_CHECK_FAILED        (1 << 16)
  80#define DIFF_OPT_RELATIVE_NAME       (1 << 17)
  81#define DIFF_OPT_IGNORE_SUBMODULES   (1 << 18)
  82#define DIFF_OPT_DIRSTAT_CUMULATIVE  (1 << 19)
  83#define DIFF_OPT_DIRSTAT_BY_FILE     (1 << 20)
  84#define DIFF_OPT_ALLOW_TEXTCONV      (1 << 21)
  85#define DIFF_OPT_DIFF_FROM_CONTENTS  (1 << 22)
  86#define DIFF_OPT_SUBMODULE_LOG       (1 << 23)
  87#define DIFF_OPT_DIRTY_SUBMODULES    (1 << 24)
  88#define DIFF_OPT_IGNORE_UNTRACKED_IN_SUBMODULES (1 << 25)
  89#define DIFF_OPT_IGNORE_DIRTY_SUBMODULES (1 << 26)
  90#define DIFF_OPT_OVERRIDE_SUBMODULE_CONFIG (1 << 27)
  91#define DIFF_OPT_DIRSTAT_BY_LINE     (1 << 28)
  92#define DIFF_OPT_FUNCCONTEXT         (1 << 29)
  93#define DIFF_OPT_PICKAXE_IGNORE_CASE (1 << 30)
  94#define DIFF_OPT_DEFAULT_FOLLOW_RENAMES (1U << 31)
  95
  96#define DIFF_OPT_TST(opts, flag)    ((opts)->flags & DIFF_OPT_##flag)
  97#define DIFF_OPT_TOUCHED(opts, flag)    ((opts)->touched_flags & DIFF_OPT_##flag)
  98#define DIFF_OPT_SET(opts, flag)    (((opts)->flags |= DIFF_OPT_##flag),((opts)->touched_flags |= DIFF_OPT_##flag))
  99#define DIFF_OPT_CLR(opts, flag)    (((opts)->flags &= ~DIFF_OPT_##flag),((opts)->touched_flags |= DIFF_OPT_##flag))
 100#define DIFF_XDL_TST(opts, flag)    ((opts)->xdl_opts & XDF_##flag)
 101#define DIFF_XDL_SET(opts, flag)    ((opts)->xdl_opts |= XDF_##flag)
 102#define DIFF_XDL_CLR(opts, flag)    ((opts)->xdl_opts &= ~XDF_##flag)
 103
 104#define DIFF_WITH_ALG(opts, flag)   (((opts)->xdl_opts & ~XDF_DIFF_ALGORITHM_MASK) | XDF_##flag)
 105
 106enum diff_words_type {
 107        DIFF_WORDS_NONE = 0,
 108        DIFF_WORDS_PORCELAIN,
 109        DIFF_WORDS_PLAIN,
 110        DIFF_WORDS_COLOR
 111};
 112
 113struct diff_options {
 114        const char *orderfile;
 115        const char *pickaxe;
 116        const char *single_follow;
 117        const char *a_prefix, *b_prefix;
 118        const char *line_prefix;
 119        size_t line_prefix_length;
 120        unsigned flags;
 121        unsigned touched_flags;
 122
 123        /* diff-filter bits */
 124        unsigned int filter;
 125
 126        int use_color;
 127        int context;
 128        int interhunkcontext;
 129        int break_opt;
 130        int detect_rename;
 131        int irreversible_delete;
 132        int skip_stat_unmatch;
 133        int line_termination;
 134        int output_format;
 135        int pickaxe_opts;
 136        int rename_score;
 137        int rename_limit;
 138        int needed_rename_limit;
 139        int degraded_cc_to_c;
 140        int show_rename_progress;
 141        int dirstat_permille;
 142        int setup;
 143        int abbrev;
 144/* white-space error highlighting */
 145#define WSEH_NEW 1
 146#define WSEH_CONTEXT 2
 147#define WSEH_OLD 4
 148        unsigned ws_error_highlight;
 149        const char *prefix;
 150        int prefix_length;
 151        const char *stat_sep;
 152        long xdl_opts;
 153
 154        int stat_width;
 155        int stat_name_width;
 156        int stat_graph_width;
 157        int stat_count;
 158        const char *word_regex;
 159        enum diff_words_type word_diff;
 160
 161        /* this is set by diffcore for DIFF_FORMAT_PATCH */
 162        int found_changes;
 163
 164        /* to support internal diff recursion by --follow hack*/
 165        int found_follow;
 166
 167        void (*set_default)(struct diff_options *);
 168
 169        FILE *file;
 170        int close_file;
 171
 172        struct pathspec pathspec;
 173        pathchange_fn_t pathchange;
 174        change_fn_t change;
 175        add_remove_fn_t add_remove;
 176        diff_format_fn_t format_callback;
 177        void *format_callback_data;
 178        diff_prefix_fn_t output_prefix;
 179        void *output_prefix_data;
 180
 181        int diff_path_counter;
 182};
 183
 184enum color_diff {
 185        DIFF_RESET = 0,
 186        DIFF_CONTEXT = 1,
 187        DIFF_METAINFO = 2,
 188        DIFF_FRAGINFO = 3,
 189        DIFF_FILE_OLD = 4,
 190        DIFF_FILE_NEW = 5,
 191        DIFF_COMMIT = 6,
 192        DIFF_WHITESPACE = 7,
 193        DIFF_FUNCINFO = 8
 194};
 195const char *diff_get_color(int diff_use_color, enum color_diff ix);
 196#define diff_get_color_opt(o, ix) \
 197        diff_get_color((o)->use_color, ix)
 198
 199
 200const char *diff_line_prefix(struct diff_options *);
 201
 202
 203extern const char mime_boundary_leader[];
 204
 205extern struct combine_diff_path *diff_tree_paths(
 206        struct combine_diff_path *p, const unsigned char *sha1,
 207        const unsigned char **parent_sha1, int nparent,
 208        struct strbuf *base, struct diff_options *opt);
 209extern int diff_tree_sha1(const unsigned char *old, const unsigned char *new,
 210                          const char *base, struct diff_options *opt);
 211extern int diff_root_tree_sha1(const unsigned char *new, const char *base,
 212                               struct diff_options *opt);
 213
 214struct combine_diff_path {
 215        struct combine_diff_path *next;
 216        char *path;
 217        unsigned int mode;
 218        struct object_id oid;
 219        struct combine_diff_parent {
 220                char status;
 221                unsigned int mode;
 222                struct object_id oid;
 223        } parent[FLEX_ARRAY];
 224};
 225#define combine_diff_path_size(n, l) \
 226        st_add4(sizeof(struct combine_diff_path), (l), 1, \
 227                st_mult(sizeof(struct combine_diff_parent), (n)))
 228
 229extern void show_combined_diff(struct combine_diff_path *elem, int num_parent,
 230                              int dense, struct rev_info *);
 231
 232extern void diff_tree_combined(const unsigned char *sha1, const struct sha1_array *parents, int dense, struct rev_info *rev);
 233
 234extern void diff_tree_combined_merge(const struct commit *commit, int dense, struct rev_info *rev);
 235
 236void diff_set_mnemonic_prefix(struct diff_options *options, const char *a, const char *b);
 237
 238extern int diff_can_quit_early(struct diff_options *);
 239
 240extern void diff_addremove(struct diff_options *,
 241                           int addremove,
 242                           unsigned mode,
 243                           const unsigned char *sha1,
 244                           int sha1_valid,
 245                           const char *fullpath, unsigned dirty_submodule);
 246
 247extern void diff_change(struct diff_options *,
 248                        unsigned mode1, unsigned mode2,
 249                        const unsigned char *sha1,
 250                        const unsigned char *sha2,
 251                        int sha1_valid,
 252                        int sha2_valid,
 253                        const char *fullpath,
 254                        unsigned dirty_submodule1, unsigned dirty_submodule2);
 255
 256extern struct diff_filepair *diff_unmerge(struct diff_options *, const char *path);
 257
 258#define DIFF_SETUP_REVERSE              1
 259#define DIFF_SETUP_USE_CACHE            2
 260#define DIFF_SETUP_USE_SIZE_CACHE       4
 261
 262/*
 263 * Poor man's alternative to parse-option, to allow both stuck form
 264 * (--option=value) and separate form (--option value).
 265 */
 266extern int parse_long_opt(const char *opt, const char **argv,
 267                         const char **optarg);
 268
 269extern int git_diff_basic_config(const char *var, const char *value, void *cb);
 270extern void init_diff_ui_defaults(void);
 271extern int git_diff_ui_config(const char *var, const char *value, void *cb);
 272extern void diff_setup(struct diff_options *);
 273extern int diff_opt_parse(struct diff_options *, const char **, int, const char *);
 274extern void diff_setup_done(struct diff_options *);
 275
 276#define DIFF_DETECT_RENAME      1
 277#define DIFF_DETECT_COPY        2
 278
 279#define DIFF_PICKAXE_ALL        1
 280#define DIFF_PICKAXE_REGEX      2
 281
 282#define DIFF_PICKAXE_KIND_S     4 /* traditional plumbing counter */
 283#define DIFF_PICKAXE_KIND_G     8 /* grep in the patch */
 284
 285extern void diffcore_std(struct diff_options *);
 286extern void diffcore_fix_diff_index(struct diff_options *);
 287
 288#define COMMON_DIFF_OPTIONS_HELP \
 289"\ncommon diff options:\n" \
 290"  -z            output diff-raw with lines terminated with NUL.\n" \
 291"  -p            output patch format.\n" \
 292"  -u            synonym for -p.\n" \
 293"  --patch-with-raw\n" \
 294"                output both a patch and the diff-raw format.\n" \
 295"  --stat        show diffstat instead of patch.\n" \
 296"  --numstat     show numeric diffstat instead of patch.\n" \
 297"  --patch-with-stat\n" \
 298"                output a patch and prepend its diffstat.\n" \
 299"  --name-only   show only names of changed files.\n" \
 300"  --name-status show names and status of changed files.\n" \
 301"  --full-index  show full object name on index lines.\n" \
 302"  --abbrev=<n>  abbreviate object names in diff-tree header and diff-raw.\n" \
 303"  -R            swap input file pairs.\n" \
 304"  -B            detect complete rewrites.\n" \
 305"  -M            detect renames.\n" \
 306"  -C            detect copies.\n" \
 307"  --find-copies-harder\n" \
 308"                try unchanged files as candidate for copy detection.\n" \
 309"  -l<n>         limit rename attempts up to <n> paths.\n" \
 310"  -O<file>      reorder diffs according to the <file>.\n" \
 311"  -S<string>    find filepair whose only one side contains the string.\n" \
 312"  --pickaxe-all\n" \
 313"                show all files diff when -S is used and hit is found.\n" \
 314"  -a  --text    treat all files as text.\n"
 315
 316extern int diff_queue_is_empty(void);
 317extern void diff_flush(struct diff_options*);
 318extern void diff_warn_rename_limit(const char *varname, int needed, int degraded_cc);
 319
 320/* diff-raw status letters */
 321#define DIFF_STATUS_ADDED               'A'
 322#define DIFF_STATUS_COPIED              'C'
 323#define DIFF_STATUS_DELETED             'D'
 324#define DIFF_STATUS_MODIFIED            'M'
 325#define DIFF_STATUS_RENAMED             'R'
 326#define DIFF_STATUS_TYPE_CHANGED        'T'
 327#define DIFF_STATUS_UNKNOWN             'X'
 328#define DIFF_STATUS_UNMERGED            'U'
 329
 330/* these are not diff-raw status letters proper, but used by
 331 * diffcore-filter insn to specify additional restrictions.
 332 */
 333#define DIFF_STATUS_FILTER_AON          '*'
 334#define DIFF_STATUS_FILTER_BROKEN       'B'
 335
 336extern const char *diff_unique_abbrev(const unsigned char *, int);
 337
 338/* do not report anything on removed paths */
 339#define DIFF_SILENT_ON_REMOVED 01
 340/* report racily-clean paths as modified */
 341#define DIFF_RACY_IS_MODIFIED 02
 342extern int run_diff_files(struct rev_info *revs, unsigned int option);
 343extern int run_diff_index(struct rev_info *revs, int cached);
 344
 345extern int do_diff_cache(const unsigned char *, struct diff_options *);
 346extern int diff_flush_patch_id(struct diff_options *, unsigned char *);
 347
 348extern int diff_result_code(struct diff_options *, int);
 349
 350extern void diff_no_index(struct rev_info *, int, const char **);
 351
 352extern int index_differs_from(const char *def, int diff_flags);
 353
 354/*
 355 * Fill the contents of the filespec "df", respecting any textconv defined by
 356 * its userdiff driver.  The "driver" parameter must come from a
 357 * previous call to get_textconv(), and therefore should either be NULL or have
 358 * textconv enabled.
 359 *
 360 * Note that the memory ownership of the resulting buffer depends on whether
 361 * the driver field is NULL. If it is, then the memory belongs to the filespec
 362 * struct. If it is non-NULL, then "outbuf" points to a newly allocated buffer
 363 * that should be freed by the caller.
 364 */
 365extern size_t fill_textconv(struct userdiff_driver *driver,
 366                            struct diff_filespec *df,
 367                            char **outbuf);
 368
 369/*
 370 * Look up the userdiff driver for the given filespec, and return it if
 371 * and only if it has textconv enabled (otherwise return NULL). The result
 372 * can be passed to fill_textconv().
 373 */
 374extern struct userdiff_driver *get_textconv(struct diff_filespec *one);
 375
 376extern int parse_rename_score(const char **cp_p);
 377
 378extern long parse_algorithm_value(const char *value);
 379
 380extern int print_stat_summary(FILE *fp, int files,
 381                              int insertions, int deletions);
 382extern void setup_diff_pager(struct diff_options *);
 383
 384#endif /* DIFF_H */