2 * Copyright (C) 2005 Junio C Hamano
11 typedef 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
);
17 typedef 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
);
24 const char *orderfile
;
31 int find_copies_harder
;
45 add_remove_fn_t add_remove
;
48 extern void diff_tree_setup_paths(const char **paths
, struct diff_options
*);
49 extern void diff_tree_release_paths(struct diff_options
*);
50 extern int diff_tree(struct tree_desc
*t1
, struct tree_desc
*t2
,
51 const char *base
, struct diff_options
*opt
);
52 extern int diff_tree_sha1(const unsigned char *old
, const unsigned char *new,
53 const char *base
, struct diff_options
*opt
);
55 struct combine_diff_path
{
56 struct combine_diff_path
*next
;
60 unsigned char sha1
[20];
61 struct combine_diff_parent
{
64 unsigned char sha1
[20];
67 #define combine_diff_path_size(n, l) \
68 (sizeof(struct combine_diff_path) + \
69 sizeof(struct combine_diff_parent) * (n) + (l) + 1)
71 extern int show_combined_diff(struct combine_diff_path
*elem
, int num_parent
,
72 int dense
, const char *header
,
73 struct diff_options
*);
75 extern const char *diff_tree_combined_merge(const unsigned char *sha1
, const char *, int, struct diff_options
*opt
);
77 extern void diff_addremove(struct diff_options
*,
80 const unsigned char *sha1
,
84 extern void diff_change(struct diff_options
*,
85 unsigned mode1
, unsigned mode2
,
86 const unsigned char *sha1
,
87 const unsigned char *sha2
,
88 const char *base
, const char *path
);
90 extern void diff_unmerge(struct diff_options
*,
93 extern int diff_scoreopt_parse(const char *opt
);
95 #define DIFF_SETUP_REVERSE 1
96 #define DIFF_SETUP_USE_CACHE 2
97 #define DIFF_SETUP_USE_SIZE_CACHE 4
99 extern int git_diff_config(const char *var
, const char *value
);
100 extern void diff_setup(struct diff_options
*);
101 extern int diff_opt_parse(struct diff_options
*, const char **, int);
102 extern int diff_setup_done(struct diff_options
*);
104 #define DIFF_DETECT_RENAME 1
105 #define DIFF_DETECT_COPY 2
107 #define DIFF_PICKAXE_ALL 1
108 #define DIFF_PICKAXE_REGEX 2
110 extern void diffcore_std(struct diff_options
*);
112 extern void diffcore_std_no_resolve(struct diff_options
*);
114 #define COMMON_DIFF_OPTIONS_HELP \
115 "\ncommon diff options:\n" \
116 " -z output diff-raw with lines terminated with NUL.\n" \
117 " -p output patch format.\n" \
118 " -u synonym for -p.\n" \
119 " --name-only show only names of changed files.\n" \
120 " --name-status show names and status of changed files.\n" \
121 " --full-index show full object name on index lines.\n" \
122 " --abbrev=<n> abbreviate object names in diff-tree header and diff-raw.\n" \
123 " -R swap input file pairs.\n" \
124 " -B detect complete rewrites.\n" \
125 " -M detect renames.\n" \
126 " -C detect copies.\n" \
127 " --find-copies-harder\n" \
128 " try unchanged files as candidate for copy detection.\n" \
129 " -l<n> limit rename attempts up to <n> paths.\n" \
130 " -O<file> reorder diffs according to the <file>.\n" \
131 " -S<string> find filepair whose only one side contains the string.\n" \
133 " show all files diff when -S is used and hit is found.\n"
135 extern int diff_queue_is_empty(void);
137 #define DIFF_FORMAT_RAW 1
138 #define DIFF_FORMAT_PATCH 2
139 #define DIFF_FORMAT_NO_OUTPUT 3
140 #define DIFF_FORMAT_NAME 4
141 #define DIFF_FORMAT_NAME_STATUS 5
143 extern void diff_flush(struct diff_options
*);
145 /* diff-raw status letters */
146 #define DIFF_STATUS_ADDED 'A'
147 #define DIFF_STATUS_COPIED 'C'
148 #define DIFF_STATUS_DELETED 'D'
149 #define DIFF_STATUS_MODIFIED 'M'
150 #define DIFF_STATUS_RENAMED 'R'
151 #define DIFF_STATUS_TYPE_CHANGED 'T'
152 #define DIFF_STATUS_UNKNOWN 'X'
153 #define DIFF_STATUS_UNMERGED 'U'
155 /* these are not diff-raw status letters proper, but used by
156 * diffcore-filter insn to specify additional restrictions.
158 #define DIFF_STATUS_FILTER_AON '*'
159 #define DIFF_STATUS_FILTER_BROKEN 'B'
161 extern const char *diff_unique_abbrev(const unsigned char *, int);