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