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