Merge branch 'rs/commit-h-single-parent-cleanup'
[git/git.git] / commit.h
1 #ifndef COMMIT_H
2 #define COMMIT_H
3
4 #include "object.h"
5 #include "tree.h"
6 #include "strbuf.h"
7 #include "decorate.h"
8 #include "gpg-interface.h"
9 #include "string-list.h"
10
11 struct commit_list {
12 struct commit *item;
13 struct commit_list *next;
14 };
15
16 struct commit {
17 struct object object;
18 void *util;
19 unsigned int index;
20 timestamp_t date;
21 struct commit_list *parents;
22 struct tree *tree;
23 };
24
25 extern int save_commit_buffer;
26 extern const char *commit_type;
27
28 /* While we can decorate any object with a name, it's only used for commits.. */
29 struct name_decoration {
30 struct name_decoration *next;
31 int type;
32 char name[FLEX_ARRAY];
33 };
34
35 enum decoration_type {
36 DECORATION_NONE = 0,
37 DECORATION_REF_LOCAL,
38 DECORATION_REF_REMOTE,
39 DECORATION_REF_TAG,
40 DECORATION_REF_STASH,
41 DECORATION_REF_HEAD,
42 DECORATION_GRAFTED,
43 };
44
45 void add_name_decoration(enum decoration_type type, const char *name, struct object *obj);
46 const struct name_decoration *get_name_decoration(const struct object *obj);
47
48 struct commit *lookup_commit(const struct object_id *oid);
49 struct commit *lookup_commit_reference(const struct object_id *oid);
50 struct commit *lookup_commit_reference_gently(const struct object_id *oid,
51 int quiet);
52 struct commit *lookup_commit_reference_by_name(const char *name);
53
54 /*
55 * Look up object named by "oid", dereference tag as necessary,
56 * get a commit and return it. If "oid" does not dereference to
57 * a commit, use ref_name to report an error and die.
58 */
59 struct commit *lookup_commit_or_die(const struct object_id *oid, const char *ref_name);
60
61 int parse_commit_buffer(struct commit *item, const void *buffer, unsigned long size);
62 int parse_commit_gently(struct commit *item, int quiet_on_missing);
63 static inline int parse_commit(struct commit *item)
64 {
65 return parse_commit_gently(item, 0);
66 }
67 void parse_commit_or_die(struct commit *item);
68
69 /*
70 * Associate an object buffer with the commit. The ownership of the
71 * memory is handed over to the commit, and must be free()-able.
72 */
73 void set_commit_buffer(struct commit *, void *buffer, unsigned long size);
74
75 /*
76 * Get any cached object buffer associated with the commit. Returns NULL
77 * if none. The resulting memory should not be freed.
78 */
79 const void *get_cached_commit_buffer(const struct commit *, unsigned long *size);
80
81 /*
82 * Get the commit's object contents, either from cache or by reading the object
83 * from disk. The resulting memory should not be modified, and must be given
84 * to unuse_commit_buffer when the caller is done.
85 */
86 const void *get_commit_buffer(const struct commit *, unsigned long *size);
87
88 /*
89 * Tell the commit subsytem that we are done with a particular commit buffer.
90 * The commit and buffer should be the input and return value, respectively,
91 * from an earlier call to get_commit_buffer. The buffer may or may not be
92 * freed by this call; callers should not access the memory afterwards.
93 */
94 void unuse_commit_buffer(const struct commit *, const void *buffer);
95
96 /*
97 * Free any cached object buffer associated with the commit.
98 */
99 void free_commit_buffer(struct commit *);
100
101 /*
102 * Disassociate any cached object buffer from the commit, but do not free it.
103 * The buffer (or NULL, if none) is returned.
104 */
105 const void *detach_commit_buffer(struct commit *, unsigned long *sizep);
106
107 /* Find beginning and length of commit subject. */
108 int find_commit_subject(const char *commit_buffer, const char **subject);
109
110 struct commit_list *commit_list_insert(struct commit *item,
111 struct commit_list **list);
112 struct commit_list **commit_list_append(struct commit *commit,
113 struct commit_list **next);
114 unsigned commit_list_count(const struct commit_list *l);
115 struct commit_list *commit_list_insert_by_date(struct commit *item,
116 struct commit_list **list);
117 void commit_list_sort_by_date(struct commit_list **list);
118
119 /* Shallow copy of the input list */
120 struct commit_list *copy_commit_list(struct commit_list *list);
121
122 void free_commit_list(struct commit_list *list);
123
124 /* Commit formats */
125 enum cmit_fmt {
126 CMIT_FMT_RAW,
127 CMIT_FMT_MEDIUM,
128 CMIT_FMT_DEFAULT = CMIT_FMT_MEDIUM,
129 CMIT_FMT_SHORT,
130 CMIT_FMT_FULL,
131 CMIT_FMT_FULLER,
132 CMIT_FMT_ONELINE,
133 CMIT_FMT_EMAIL,
134 CMIT_FMT_MBOXRD,
135 CMIT_FMT_USERFORMAT,
136
137 CMIT_FMT_UNSPECIFIED
138 };
139
140 static inline int cmit_fmt_is_mail(enum cmit_fmt fmt)
141 {
142 return (fmt == CMIT_FMT_EMAIL || fmt == CMIT_FMT_MBOXRD);
143 }
144
145 struct rev_info; /* in revision.h, it circularly uses enum cmit_fmt */
146
147 struct pretty_print_context {
148 /*
149 * Callers should tweak these to change the behavior of pp_* functions.
150 */
151 enum cmit_fmt fmt;
152 int abbrev;
153 const char *after_subject;
154 int preserve_subject;
155 struct date_mode date_mode;
156 unsigned date_mode_explicit:1;
157 int print_email_subject;
158 int expand_tabs_in_log;
159 int need_8bit_cte;
160 char *notes_message;
161 struct reflog_walk_info *reflog_info;
162 struct rev_info *rev;
163 const char *output_encoding;
164 struct string_list *mailmap;
165 int color;
166 struct ident_split *from_ident;
167
168 /*
169 * Fields below here are manipulated internally by pp_* functions and
170 * should not be counted on by callers.
171 */
172 struct string_list in_body_headers;
173 int graph_width;
174 };
175
176 struct userformat_want {
177 unsigned notes:1;
178 };
179
180 extern int has_non_ascii(const char *text);
181 extern const char *logmsg_reencode(const struct commit *commit,
182 char **commit_encoding,
183 const char *output_encoding);
184 extern void get_commit_format(const char *arg, struct rev_info *);
185 extern const char *format_subject(struct strbuf *sb, const char *msg,
186 const char *line_separator);
187 extern void userformat_find_requirements(const char *fmt, struct userformat_want *w);
188 extern int commit_format_is_empty(enum cmit_fmt);
189 extern const char *skip_blank_lines(const char *msg);
190 extern void format_commit_message(const struct commit *commit,
191 const char *format, struct strbuf *sb,
192 const struct pretty_print_context *context);
193 extern void pretty_print_commit(struct pretty_print_context *pp,
194 const struct commit *commit,
195 struct strbuf *sb);
196 extern void pp_commit_easy(enum cmit_fmt fmt, const struct commit *commit,
197 struct strbuf *sb);
198 void pp_user_info(struct pretty_print_context *pp,
199 const char *what, struct strbuf *sb,
200 const char *line, const char *encoding);
201 void pp_title_line(struct pretty_print_context *pp,
202 const char **msg_p,
203 struct strbuf *sb,
204 const char *encoding,
205 int need_8bit_cte);
206 void pp_remainder(struct pretty_print_context *pp,
207 const char **msg_p,
208 struct strbuf *sb,
209 int indent);
210
211
212 /** Removes the first commit from a list sorted by date, and adds all
213 * of its parents.
214 **/
215 struct commit *pop_most_recent_commit(struct commit_list **list,
216 unsigned int mark);
217
218 struct commit *pop_commit(struct commit_list **stack);
219
220 void clear_commit_marks(struct commit *commit, unsigned int mark);
221 void clear_commit_marks_many(int nr, struct commit **commit, unsigned int mark);
222 void clear_commit_marks_for_object_array(struct object_array *a, unsigned mark);
223
224
225 enum rev_sort_order {
226 REV_SORT_IN_GRAPH_ORDER = 0,
227 REV_SORT_BY_COMMIT_DATE,
228 REV_SORT_BY_AUTHOR_DATE
229 };
230
231 /*
232 * Performs an in-place topological sort of list supplied.
233 *
234 * invariant of resulting list is:
235 * a reachable from b => ord(b) < ord(a)
236 * sort_order further specifies:
237 * REV_SORT_IN_GRAPH_ORDER: try to show a commit on a single-parent
238 * chain together.
239 * REV_SORT_BY_COMMIT_DATE: show eligible commits in committer-date order.
240 */
241 void sort_in_topological_order(struct commit_list **, enum rev_sort_order);
242
243 struct commit_graft {
244 struct object_id oid;
245 int nr_parent; /* < 0 if shallow commit */
246 struct object_id parent[FLEX_ARRAY]; /* more */
247 };
248 typedef int (*each_commit_graft_fn)(const struct commit_graft *, void *);
249
250 struct commit_graft *read_graft_line(char *buf, int len);
251 int register_commit_graft(struct commit_graft *, int);
252 struct commit_graft *lookup_commit_graft(const struct object_id *oid);
253
254 extern struct commit_list *get_merge_bases(struct commit *rev1, struct commit *rev2);
255 extern struct commit_list *get_merge_bases_many(struct commit *one, int n, struct commit **twos);
256 extern struct commit_list *get_octopus_merge_bases(struct commit_list *in);
257
258 /* To be used only when object flags after this call no longer matter */
259 extern struct commit_list *get_merge_bases_many_dirty(struct commit *one, int n, struct commit **twos);
260
261 /* largest positive number a signed 32-bit integer can contain */
262 #define INFINITE_DEPTH 0x7fffffff
263
264 struct oid_array;
265 struct ref;
266 extern int register_shallow(const struct object_id *oid);
267 extern int unregister_shallow(const struct object_id *oid);
268 extern int for_each_commit_graft(each_commit_graft_fn, void *);
269 extern int is_repository_shallow(void);
270 extern struct commit_list *get_shallow_commits(struct object_array *heads,
271 int depth, int shallow_flag, int not_shallow_flag);
272 extern struct commit_list *get_shallow_commits_by_rev_list(
273 int ac, const char **av, int shallow_flag, int not_shallow_flag);
274 extern void set_alternate_shallow_file(const char *path, int override);
275 extern int write_shallow_commits(struct strbuf *out, int use_pack_protocol,
276 const struct oid_array *extra);
277 extern void setup_alternate_shallow(struct lock_file *shallow_lock,
278 const char **alternate_shallow_file,
279 const struct oid_array *extra);
280 extern const char *setup_temporary_shallow(const struct oid_array *extra);
281 extern void advertise_shallow_grafts(int);
282
283 struct shallow_info {
284 struct oid_array *shallow;
285 int *ours, nr_ours;
286 int *theirs, nr_theirs;
287 struct oid_array *ref;
288
289 /* for receive-pack */
290 uint32_t **used_shallow;
291 int *need_reachability_test;
292 int *reachable;
293 int *shallow_ref;
294 struct commit **commits;
295 int nr_commits;
296 };
297
298 extern void prepare_shallow_info(struct shallow_info *, struct oid_array *);
299 extern void clear_shallow_info(struct shallow_info *);
300 extern void remove_nonexistent_theirs_shallow(struct shallow_info *);
301 extern void assign_shallow_commits_to_refs(struct shallow_info *info,
302 uint32_t **used,
303 int *ref_status);
304 extern int delayed_reachability_test(struct shallow_info *si, int c);
305 extern void prune_shallow(int show_only);
306 extern struct trace_key trace_shallow;
307
308 int is_descendant_of(struct commit *, struct commit_list *);
309 int in_merge_bases(struct commit *, struct commit *);
310 int in_merge_bases_many(struct commit *, int, struct commit **);
311
312 extern int interactive_add(int argc, const char **argv, const char *prefix, int patch);
313 extern int run_add_interactive(const char *revision, const char *patch_mode,
314 const struct pathspec *pathspec);
315
316 struct commit_list *reduce_heads(struct commit_list *heads);
317
318 struct commit_extra_header {
319 struct commit_extra_header *next;
320 char *key;
321 char *value;
322 size_t len;
323 };
324
325 extern void append_merge_tag_headers(struct commit_list *parents,
326 struct commit_extra_header ***tail);
327
328 extern int commit_tree(const char *msg, size_t msg_len,
329 const unsigned char *tree,
330 struct commit_list *parents, unsigned char *ret,
331 const char *author, const char *sign_commit);
332
333 extern int commit_tree_extended(const char *msg, size_t msg_len,
334 const unsigned char *tree,
335 struct commit_list *parents, unsigned char *ret,
336 const char *author, const char *sign_commit,
337 struct commit_extra_header *);
338
339 extern struct commit_extra_header *read_commit_extra_headers(struct commit *, const char **);
340
341 extern void free_commit_extra_headers(struct commit_extra_header *extra);
342
343 /*
344 * Search the commit object contents given by "msg" for the header "key".
345 * Returns a pointer to the start of the header contents, or NULL. The length
346 * of the header, up to the first newline, is returned via out_len.
347 *
348 * Note that some headers (like mergetag) may be multi-line. It is the caller's
349 * responsibility to parse further in this case!
350 */
351 extern const char *find_commit_header(const char *msg, const char *key,
352 size_t *out_len);
353
354 /* Find the end of the log message, the right place for a new trailer. */
355 extern int ignore_non_trailer(const char *buf, size_t len);
356
357 typedef void (*each_mergetag_fn)(struct commit *commit, struct commit_extra_header *extra,
358 void *cb_data);
359
360 extern void for_each_mergetag(each_mergetag_fn fn, struct commit *commit, void *data);
361
362 struct merge_remote_desc {
363 struct object *obj; /* the named object, could be a tag */
364 char name[FLEX_ARRAY];
365 };
366 #define merge_remote_util(commit) ((struct merge_remote_desc *)((commit)->util))
367 extern void set_merge_remote_desc(struct commit *commit,
368 const char *name, struct object *obj);
369
370 /*
371 * Given "name" from the command line to merge, find the commit object
372 * and return it, while storing merge_remote_desc in its ->util field,
373 * to allow callers to tell if we are told to merge a tag.
374 */
375 struct commit *get_merge_parent(const char *name);
376
377 extern int parse_signed_commit(const struct commit *commit,
378 struct strbuf *message, struct strbuf *signature);
379 extern int remove_signature(struct strbuf *buf);
380
381 /*
382 * Check the signature of the given commit. The result of the check is stored
383 * in sig->check_result, 'G' for a good signature, 'U' for a good signature
384 * from an untrusted signer, 'B' for a bad signature and 'N' for no signature
385 * at all. This may allocate memory for sig->gpg_output, sig->gpg_status,
386 * sig->signer and sig->key.
387 */
388 extern int check_commit_signature(const struct commit *commit, struct signature_check *sigc);
389
390 int compare_commits_by_commit_date(const void *a_, const void *b_, void *unused);
391
392 LAST_ARG_MUST_BE_NULL
393 extern int run_commit_hook(int editor_is_used, const char *index_file, const char *name, ...);
394
395 #endif /* COMMIT_H */