Andrew's git - gitweb.git/blob

   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;
  11
  12typedef void (*change_fn_t)(struct diff_options *options,
  13                 unsigned old_mode, unsigned new_mode,
  14                 const unsigned char *old_sha1,
  15                 const unsigned char *new_sha1,
  16                 const char *base, const char *path);
  17
  18typedef void (*add_remove_fn_t)(struct diff_options *options,
  19                    int addremove, unsigned mode,
  20                    const unsigned char *sha1,
  21                    const char *base, const char *path);
  22
  23#define DIFF_FORMAT_RAW         0x0001
  24#define DIFF_FORMAT_DIFFSTAT    0x0002
  25#define DIFF_FORMAT_SUMMARY     0x0004
  26#define DIFF_FORMAT_PATCH       0x0008
  27
  28/* These override all above */
  29#define DIFF_FORMAT_NAME        0x0010
  30#define DIFF_FORMAT_NAME_STATUS 0x0020
  31#define DIFF_FORMAT_CHECKDIFF   0x0040
  32
  33/* Same as output_format = 0 but we know that -s flag was given
  34 * and we should not give default value to output_format.
  35 */
  36#define DIFF_FORMAT_NO_OUTPUT   0x0080
  37
  38struct diff_options {
  39        const char *filter;
  40        const char *orderfile;
  41        const char *pickaxe;
  42        unsigned recursive:1,
  43                 tree_in_recursive:1,
  44                 binary:1,
  45                 full_index:1,
  46                 silent_on_remove:1,
  47                 find_copies_harder:1,
  48                 color_diff:1;
  49        int context;
  50        int break_opt;
  51        int detect_rename;
  52        int line_termination;
  53        int output_format;
  54        int pickaxe_opts;
  55        int rename_score;
  56        int reverse_diff;
  57        int rename_limit;
  58        int setup;
  59        int abbrev;
  60        const char *msg_sep;
  61        const char *stat_sep;
  62        long xdl_opts;
  63
  64        int nr_paths;
  65        const char **paths;
  66        int *pathlens;
  67        change_fn_t change;
  68        add_remove_fn_t add_remove;
  69};
  70
  71extern const char mime_boundary_leader[];
  72
  73extern void diff_tree_setup_paths(const char **paths, struct diff_options *);
  74extern void diff_tree_release_paths(struct diff_options *);
  75extern int diff_tree(struct tree_desc *t1, struct tree_desc *t2,
  76                     const char *base, struct diff_options *opt);
  77extern int diff_tree_sha1(const unsigned char *old, const unsigned char *new,
  78                          const char *base, struct diff_options *opt);
  79
  80struct combine_diff_path {
  81        struct combine_diff_path *next;
  82        int len;
  83        char *path;
  84        unsigned int mode;
  85        unsigned char sha1[20];
  86        struct combine_diff_parent {
  87                char status;
  88                unsigned int mode;
  89                unsigned char sha1[20];
  90        } parent[FLEX_ARRAY];
  91};
  92#define combine_diff_path_size(n, l) \
  93        (sizeof(struct combine_diff_path) + \
  94         sizeof(struct combine_diff_parent) * (n) + (l) + 1)
  95
  96extern void show_combined_diff(struct combine_diff_path *elem, int num_parent,
  97                              int dense, struct rev_info *);
  98
  99extern void diff_tree_combined(const unsigned char *sha1, const unsigned char parent[][20], int num_parent, int dense, struct rev_info *rev);
 100
 101extern void diff_tree_combined_merge(const unsigned char *sha1, int, struct rev_info *);
 102
 103extern void diff_addremove(struct diff_options *,
 104                           int addremove,
 105                           unsigned mode,
 106                           const unsigned char *sha1,
 107                           const char *base,
 108                           const char *path);
 109
 110extern void diff_change(struct diff_options *,
 111                        unsigned mode1, unsigned mode2,
 112                        const unsigned char *sha1,
 113                        const unsigned char *sha2,
 114                        const char *base, const char *path);
 115
 116extern void diff_unmerge(struct diff_options *,
 117                         const char *path);
 118
 119extern int diff_scoreopt_parse(const char *opt);
 120
 121#define DIFF_SETUP_REVERSE              1
 122#define DIFF_SETUP_USE_CACHE            2
 123#define DIFF_SETUP_USE_SIZE_CACHE       4
 124
 125extern int git_diff_config(const char *var, const char *value);
 126extern void diff_setup(struct diff_options *);
 127extern int diff_opt_parse(struct diff_options *, const char **, int);
 128extern int diff_setup_done(struct diff_options *);
 129
 130#define DIFF_DETECT_RENAME      1
 131#define DIFF_DETECT_COPY        2
 132
 133#define DIFF_PICKAXE_ALL        1
 134#define DIFF_PICKAXE_REGEX      2
 135
 136extern void diffcore_std(struct diff_options *);
 137
 138extern void diffcore_std_no_resolve(struct diff_options *);
 139
 140#define COMMON_DIFF_OPTIONS_HELP \
 141"\ncommon diff options:\n" \
 142"  -z            output diff-raw with lines terminated with NUL.\n" \
 143"  -p            output patch format.\n" \
 144"  -u            synonym for -p.\n" \
 145"  --patch-with-raw\n" \
 146"                output both a patch and the diff-raw format.\n" \
 147"  --stat        show diffstat instead of patch.\n" \
 148"  --patch-with-stat\n" \
 149"                output a patch and prepend its diffstat.\n" \
 150"  --name-only   show only names of changed files.\n" \
 151"  --name-status show names and status of changed files.\n" \
 152"  --full-index  show full object name on index lines.\n" \
 153"  --abbrev=<n>  abbreviate object names in diff-tree header and diff-raw.\n" \
 154"  -R            swap input file pairs.\n" \
 155"  -B            detect complete rewrites.\n" \
 156"  -M            detect renames.\n" \
 157"  -C            detect copies.\n" \
 158"  --find-copies-harder\n" \
 159"                try unchanged files as candidate for copy detection.\n" \
 160"  -l<n>         limit rename attempts up to <n> paths.\n" \
 161"  -O<file>      reorder diffs according to the <file>.\n" \
 162"  -S<string>    find filepair whose only one side contains the string.\n" \
 163"  --pickaxe-all\n" \
 164"                show all files diff when -S is used and hit is found.\n"
 165
 166extern int diff_queue_is_empty(void);
 167extern void diff_flush(struct diff_options*);
 168
 169/* diff-raw status letters */
 170#define DIFF_STATUS_ADDED               'A'
 171#define DIFF_STATUS_COPIED              'C'
 172#define DIFF_STATUS_DELETED             'D'
 173#define DIFF_STATUS_MODIFIED            'M'
 174#define DIFF_STATUS_RENAMED             'R'
 175#define DIFF_STATUS_TYPE_CHANGED        'T'
 176#define DIFF_STATUS_UNKNOWN             'X'
 177#define DIFF_STATUS_UNMERGED            'U'
 178
 179/* these are not diff-raw status letters proper, but used by
 180 * diffcore-filter insn to specify additional restrictions.
 181 */
 182#define DIFF_STATUS_FILTER_AON          '*'
 183#define DIFF_STATUS_FILTER_BROKEN       'B'
 184
 185extern const char *diff_unique_abbrev(const unsigned char *, int);
 186
 187extern int run_diff_files(struct rev_info *revs, int silent_on_removed);
 188
 189extern int run_diff_index(struct rev_info *revs, int cached);
 190
 191#endif /* DIFF_H */