]> git.ipfire.org Git - thirdparty/git.git/blame - commit.h
Merge branch 'ak/commit-graph-to-slab'
[thirdparty/git.git] / commit.h
CommitLineData
6eb8ae00
DB
1#ifndef COMMIT_H
2#define COMMIT_H
3
4#include "object.h"
5#include "tree.h"
674d1727 6#include "strbuf.h"
ca135e7a 7#include "decorate.h"
ffb6d7d5 8#include "gpg-interface.h"
a9080475 9#include "string-list.h"
cf394719 10#include "pretty.h"
5284fc5c 11#include "commit-slab.h"
6eb8ae00 12
177722b3 13#define COMMIT_NOT_FROM_GRAPH 0xFFFFFFFF
83073cc9
DS
14#define GENERATION_NUMBER_INFINITY 0xFFFFFFFF
15#define GENERATION_NUMBER_MAX 0x3FFFFFFF
16#define GENERATION_NUMBER_ZERO 0
177722b3 17
6eb8ae00
DB
18struct commit_list {
19 struct commit *item;
20 struct commit_list *next;
21};
22
9d2c9701
NTND
23/*
24 * The size of this struct matters in full repo walk operations like
25 * 'git clone' or 'git gc'. Consider using commit-slab to attach data
26 * to a commit instead of adding new fields here.
27 */
6eb8ae00
DB
28struct commit {
29 struct object object;
dddbad72 30 timestamp_t date;
6eb8ae00 31 struct commit_list *parents;
7b8a21db
DS
32
33 /*
34 * If the commit is loaded from the commit-graph file, then this
301b8c7f 35 * member may be NULL. Only access it through repo_get_commit_tree()
7b8a21db
DS
36 * or get_commit_tree_oid().
37 */
891435d5 38 struct tree *maybe_tree;
25f859fd 39 unsigned int index;
6eb8ae00
DB
40};
41
60ab26de 42extern int save_commit_buffer;
6eb8ae00
DB
43extern const char *commit_type;
44
ca135e7a 45/* While we can decorate any object with a name, it's only used for commits.. */
ca135e7a
LT
46struct name_decoration {
47 struct name_decoration *next;
eb3005e2 48 int type;
2e3dfb21 49 char name[FLEX_ARRAY];
ca135e7a
LT
50};
51
662174d2
JK
52enum decoration_type {
53 DECORATION_NONE = 0,
54 DECORATION_REF_LOCAL,
55 DECORATION_REF_REMOTE,
56 DECORATION_REF_TAG,
57 DECORATION_REF_STASH,
58 DECORATION_REF_HEAD,
59 DECORATION_GRAFTED,
60};
61
62void add_name_decoration(enum decoration_type type, const char *name, struct object *obj);
2608c249 63const struct name_decoration *get_name_decoration(const struct object *obj);
662174d2 64
bacf1687 65struct commit *lookup_commit(struct repository *r, const struct object_id *oid);
1f6c72fe
SB
66struct commit *lookup_commit_reference(struct repository *r,
67 const struct object_id *oid);
d9a05e74 68struct commit *lookup_commit_reference_gently(struct repository *r,
21e1ee8f 69 const struct object_id *oid,
f76412ed 70 int quiet);
a6fa5992 71struct commit *lookup_commit_reference_by_name(const char *name);
6eb8ae00 72
baf18fc2 73/*
bc83266a 74 * Look up object named by "oid", dereference tag as necessary,
75 * get a commit and return it. If "oid" does not dereference to
baf18fc2
NTND
76 * a commit, use ref_name to report an error and die.
77 */
bc83266a 78struct commit *lookup_commit_or_die(const struct object_id *oid, const char *ref_name);
baf18fc2 79
fd8030c7 80int parse_commit_buffer(struct repository *r, struct commit *item, const void *buffer, unsigned long size, int check_graph);
9e5252ab
SB
81int repo_parse_commit_internal(struct repository *r, struct commit *item,
82 int quiet_on_missing, int use_commit_graph);
83int repo_parse_commit_gently(struct repository *r,
84 struct commit *item,
85 int quiet_on_missing);
86static inline int repo_parse_commit(struct repository *r, struct commit *item)
9cc2b07a 87{
9e5252ab 88 return repo_parse_commit_gently(r, item, 0);
9cc2b07a 89}
43d35618
ÆAB
90
91static inline int parse_commit_no_graph(struct commit *commit)
92{
93 return repo_parse_commit_internal(the_repository, commit, 0, 0);
94}
95
9e5252ab
SB
96#ifndef NO_THE_REPOSITORY_COMPATIBILITY_MACROS
97#define parse_commit_internal(item, quiet, use) repo_parse_commit_internal(the_repository, item, quiet, use)
98#define parse_commit_gently(item, quiet) repo_parse_commit_gently(the_repository, item, quiet)
99#define parse_commit(item) repo_parse_commit(the_repository, item)
100#endif
101
7059dccc 102void parse_commit_or_die(struct commit *item);
6eb8ae00 103
65ea9d4b
SB
104struct buffer_slab;
105struct buffer_slab *allocate_commit_buffer_slab(void);
106void free_commit_buffer_slab(struct buffer_slab *bs);
107
66c2827e
JK
108/*
109 * Associate an object buffer with the commit. The ownership of the
110 * memory is handed over to the commit, and must be free()-able.
111 */
1a40fc45 112void set_commit_buffer(struct repository *r, struct commit *, void *buffer, unsigned long size);
66c2827e 113
152ff1cc
JK
114/*
115 * Get any cached object buffer associated with the commit. Returns NULL
116 * if none. The resulting memory should not be freed.
117 */
4ff7e5c9 118const void *get_cached_commit_buffer(struct repository *, const struct commit *, unsigned long *size);
152ff1cc
JK
119
120/*
121 * Get the commit's object contents, either from cache or by reading the object
122 * from disk. The resulting memory should not be modified, and must be given
123 * to unuse_commit_buffer when the caller is done.
124 */
07de3fd8
SB
125const void *repo_get_commit_buffer(struct repository *r,
126 const struct commit *,
127 unsigned long *size);
128#ifndef NO_THE_REPOSITORY_COMPATIBILITY_MACROS
129#define get_commit_buffer(c, s) repo_get_commit_buffer(the_repository, c, s)
130#endif
152ff1cc
JK
131
132/*
15beaaa3 133 * Tell the commit subsystem that we are done with a particular commit buffer.
152ff1cc
JK
134 * The commit and buffer should be the input and return value, respectively,
135 * from an earlier call to get_commit_buffer. The buffer may or may not be
136 * freed by this call; callers should not access the memory afterwards.
137 */
70315373
SB
138void repo_unuse_commit_buffer(struct repository *r,
139 const struct commit *,
140 const void *buffer);
141#ifndef NO_THE_REPOSITORY_COMPATIBILITY_MACROS
142#define unuse_commit_buffer(c, b) repo_unuse_commit_buffer(the_repository, c, b)
143#endif
152ff1cc 144
0fb370da
JK
145/*
146 * Free any cached object buffer associated with the commit.
147 */
6a7895fd 148void free_commit_buffer(struct parsed_object_pool *pool, struct commit *);
0fb370da 149
301b8c7f
NTND
150struct tree *repo_get_commit_tree(struct repository *, const struct commit *);
151#define get_commit_tree(c) repo_get_commit_tree(the_repository, c)
5bb03de1
DS
152struct object_id *get_commit_tree_oid(const struct commit *);
153
14ba97f8
SB
154/*
155 * Release memory related to a commit, including the parent list and
156 * any cached object buffer.
157 */
6a7895fd 158void release_commit_memory(struct parsed_object_pool *pool, struct commit *c);
14ba97f8 159
0fb370da
JK
160/*
161 * Disassociate any cached object buffer from the commit, but do not free it.
162 * The buffer (or NULL, if none) is returned.
163 */
8597ea3a 164const void *detach_commit_buffer(struct commit *, unsigned long *sizep);
0fb370da 165
11af2aae
CC
166/* Find beginning and length of commit subject. */
167int find_commit_subject(const char *commit_buffer, const char **subject);
168
47e44ed1
TF
169struct commit_list *commit_list_insert(struct commit *item,
170 struct commit_list **list);
89b5f1d9
RS
171struct commit_list **commit_list_append(struct commit *commit,
172 struct commit_list **next);
65319475 173unsigned commit_list_count(const struct commit_list *l);
47e44ed1
TF
174struct commit_list *commit_list_insert_by_date(struct commit *item,
175 struct commit_list **list);
176void commit_list_sort_by_date(struct commit_list **list);
dd97f850 177
53d00b39
TR
178/* Shallow copy of the input list */
179struct commit_list *copy_commit_list(struct commit_list *list);
180
6eb8ae00
DB
181void free_commit_list(struct commit_list *list);
182
6d167fd7
RS
183struct rev_info; /* in revision.h, it circularly uses enum cmit_fmt */
184
55454427
DL
185int has_non_ascii(const char *text);
186const char *logmsg_reencode(const struct commit *commit,
ad6dad09
DL
187 char **commit_encoding,
188 const char *output_encoding);
424510ed
SB
189const char *repo_logmsg_reencode(struct repository *r,
190 const struct commit *commit,
191 char **commit_encoding,
192 const char *output_encoding);
193#ifndef NO_THE_REPOSITORY_COMPATIBILITY_MACROS
194#define logmsg_reencode(c, enc, out) repo_logmsg_reencode(the_repository, c, enc, out)
195#endif
196
55454427 197const char *skip_blank_lines(const char *msg);
e3bc7a3b 198
dd97f850
DB
199/** Removes the first commit from a list sorted by date, and adds all
200 * of its parents.
201 **/
a6080a0a 202struct commit *pop_most_recent_commit(struct commit_list **list,
58e28af6 203 unsigned int mark);
dd97f850 204
a3437b8c
JS
205struct commit *pop_commit(struct commit_list **stack);
206
f8f9c73c 207void clear_commit_marks(struct commit *commit, unsigned int mark);
e895cb51 208void clear_commit_marks_many(int nr, struct commit **commit, unsigned int mark);
f8f9c73c 209
08f704f2
JH
210
211enum rev_sort_order {
212 REV_SORT_IN_GRAPH_ORDER = 0,
81c6b38b
JH
213 REV_SORT_BY_COMMIT_DATE,
214 REV_SORT_BY_AUTHOR_DATE
08f704f2
JH
215};
216
ab580ace
JS
217/*
218 * Performs an in-place topological sort of list supplied.
219 *
ab580ace
JS
220 * invariant of resulting list is:
221 * a reachable from b => ord(b) < ord(a)
08f704f2
JH
222 * sort_order further specifies:
223 * REV_SORT_IN_GRAPH_ORDER: try to show a commit on a single-parent
224 * chain together.
225 * REV_SORT_BY_COMMIT_DATE: show eligible commits in committer-date order.
ab580ace 226 */
08f704f2 227void sort_in_topological_order(struct commit_list **, enum rev_sort_order);
5040f17e
JH
228
229struct commit_graft {
7683e2e6 230 struct object_id oid;
ed09aef0 231 int nr_parent; /* < 0 if shallow commit */
7683e2e6 232 struct object_id parent[FLEX_ARRAY]; /* more */
5040f17e 233};
09d46644 234typedef int (*each_commit_graft_fn)(const struct commit_graft *, void *);
5040f17e 235
9a934032 236struct commit_graft *read_graft_line(struct strbuf *line);
183df649
TB
237/* commit_graft_pos returns an index into r->parsed_objects->grafts. */
238int commit_graft_pos(struct repository *r, const unsigned char *sha1);
a3b78e83 239int register_commit_graft(struct repository *r, struct commit_graft *, int);
20fd6d57 240void prepare_commit_graft(struct repository *r);
b9dbddf6 241struct commit_graft *lookup_commit_graft(struct repository *r, const struct object_id *oid);
5040f17e 242
103148aa
PK
243struct commit *get_fork_point(const char *refname, struct commit *commit);
244
41ccfdd9 245/* largest positive number a signed 32-bit integer can contain */
4dcb167f
NTND
246#define INFINITE_DEPTH 0x7fffffff
247
910650d2 248struct oid_array;
58babfff 249struct ref;
55454427 250int for_each_commit_graft(each_commit_graft_fn, void *);
ed09aef0 251
55454427
DL
252int interactive_add(int argc, const char **argv, const char *prefix, int patch);
253int run_add_interactive(const char *revision, const char *patch_mode,
ad6dad09 254 const struct pathspec *pathspec);
58680165 255
5231c633
JH
256struct commit_extra_header {
257 struct commit_extra_header *next;
258 char *key;
259 char *value;
260 size_t len;
261};
262
55454427 263void append_merge_tag_headers(struct commit_list *parents,
ad6dad09 264 struct commit_extra_header ***tail);
5231c633 265
55454427 266int commit_tree(const char *msg, size_t msg_len,
ad6dad09
DL
267 const struct object_id *tree,
268 struct commit_list *parents, struct object_id *ret,
269 const char *author, const char *sign_commit);
5231c633 270
55454427 271int commit_tree_extended(const char *msg, size_t msg_len,
ad6dad09
DL
272 const struct object_id *tree,
273 struct commit_list *parents,
274 struct object_id *ret, const char *author,
275 const char *sign_commit,
276 struct commit_extra_header *);
5231c633 277
55454427 278struct commit_extra_header *read_commit_extra_headers(struct commit *, const char **);
ed7a42a0 279
55454427 280void free_commit_extra_headers(struct commit_extra_header *extra);
40d52ff7 281
fe6eb7f2
JK
282/*
283 * Search the commit object contents given by "msg" for the header "key".
284 * Returns a pointer to the start of the header contents, or NULL. The length
285 * of the header, up to the first newline, is returned via out_len.
286 *
287 * Note that some headers (like mergetag) may be multi-line. It is the caller's
288 * responsibility to parse further in this case!
289 */
55454427 290const char *find_commit_header(const char *msg, const char *key,
ad6dad09 291 size_t *out_len);
fe6eb7f2 292
8c384589 293/* Find the end of the log message, the right place for a new trailer. */
55454427 294size_t ignore_non_trailer(const char *buf, size_t len);
8c384589 295
fef461ea 296typedef int (*each_mergetag_fn)(struct commit *commit, struct commit_extra_header *extra,
ad6dad09 297 void *cb_data);
063da62b 298
55454427 299int for_each_mergetag(each_mergetag_fn fn, struct commit *commit, void *data);
063da62b 300
ae8e4c9c
JH
301struct merge_remote_desc {
302 struct object *obj; /* the named object, could be a tag */
5447a76a 303 char name[FLEX_ARRAY];
ae8e4c9c 304};
55454427
DL
305struct merge_remote_desc *merge_remote_util(struct commit *);
306void set_merge_remote_desc(struct commit *commit,
ad6dad09 307 const char *name, struct object *obj);
ae8e4c9c
JH
308
309/*
310 * Given "name" from the command line to merge, find the commit object
311 * and return it, while storing merge_remote_desc in its ->util field,
312 * to allow callers to tell if we are told to merge a tag.
313 */
314struct commit *get_merge_parent(const char *name);
315
55454427 316int parse_signed_commit(const struct commit *commit,
ad6dad09 317 struct strbuf *message, struct strbuf *signature);
55454427 318int remove_signature(struct strbuf *buf);
0b05ab6f 319
ffb6d7d5 320/*
eb307ae7
SG
321 * Check the signature of the given commit. The result of the check is stored
322 * in sig->check_result, 'G' for a good signature, 'U' for a good signature
323 * from an untrusted signer, 'B' for a bad signature and 'N' for no signature
324 * at all. This may allocate memory for sig->gpg_output, sig->gpg_status,
325 * sig->signer and sig->key.
ffb6d7d5 326 */
55454427 327int check_commit_signature(const struct commit *commit, struct signature_check *sigc);
ffb6d7d5 328
5284fc5c
DS
329/* record author-date for each commit object */
330struct author_date_slab;
331void record_author_date(struct author_date_slab *author_date,
332 struct commit *commit);
333
334int compare_commits_by_author_date(const void *a_, const void *b_, void *unused);
6d2035ee 335
edc4d47d
JK
336/*
337 * Verify a single commit with check_commit_signature() and die() if it is not
338 * a good signature. This isn't really suitable for general use, but is a
339 * helper to implement consistent logic for pull/merge --verify-signatures.
54887b46
HJI
340 *
341 * The check_trust parameter is meant for backward-compatibility. The GPG
342 * interface verifies key trust with a default trust level that is below the
343 * default trust level for merge operations. Its value should be non-zero if
344 * the user hasn't set a minimum trust level explicitly in their configuration.
345 *
346 * If the user has set a minimum trust level, then that value should be obeyed
347 * and check_trust should be zero, even if the configured trust level is below
348 * the default trust level for merges.
edc4d47d 349 */
54887b46
HJI
350void verify_merge_signature(struct commit *commit, int verbose,
351 int check_trust);
edc4d47d 352
727377ff 353int compare_commits_by_commit_date(const void *a_, const void *b_, void *unused);
3afc679b 354int compare_commits_by_gen_then_commit_date(const void *a_, const void *b_, void *unused);
727377ff 355
15048f8a 356LAST_ARG_MUST_BE_NULL
b199d714 357int run_commit_hook(int editor_is_used, const char *index_file, const char *name, ...);
15048f8a 358
6eb8ae00 359#endif /* COMMIT_H */