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