]> git.ipfire.org Git - thirdparty/git.git/blame - commit.h
commit-graph: allow cross-alternate chains
[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
35 * member may be NULL. Only access it through get_commit_tree()
36 * or get_commit_tree_oid().
37 */
891435d5 38 struct tree *maybe_tree;
177722b3 39 uint32_t graph_pos;
83073cc9 40 uint32_t generation;
25f859fd 41 unsigned int index;
6eb8ae00
DB
42};
43
60ab26de 44extern int save_commit_buffer;
6eb8ae00
DB
45extern const char *commit_type;
46
ca135e7a 47/* While we can decorate any object with a name, it's only used for commits.. */
ca135e7a
LT
48struct name_decoration {
49 struct name_decoration *next;
eb3005e2 50 int type;
2e3dfb21 51 char name[FLEX_ARRAY];
ca135e7a
LT
52};
53
662174d2
JK
54enum decoration_type {
55 DECORATION_NONE = 0,
56 DECORATION_REF_LOCAL,
57 DECORATION_REF_REMOTE,
58 DECORATION_REF_TAG,
59 DECORATION_REF_STASH,
60 DECORATION_REF_HEAD,
61 DECORATION_GRAFTED,
62};
63
64void add_name_decoration(enum decoration_type type, const char *name, struct object *obj);
2608c249 65const struct name_decoration *get_name_decoration(const struct object *obj);
662174d2 66
bacf1687 67struct commit *lookup_commit(struct repository *r, const struct object_id *oid);
1f6c72fe
SB
68struct commit *lookup_commit_reference(struct repository *r,
69 const struct object_id *oid);
d9a05e74 70struct commit *lookup_commit_reference_gently(struct repository *r,
21e1ee8f 71 const struct object_id *oid,
f76412ed 72 int quiet);
a6fa5992 73struct commit *lookup_commit_reference_by_name(const char *name);
6eb8ae00 74
baf18fc2 75/*
bc83266a 76 * Look up object named by "oid", dereference tag as necessary,
77 * get a commit and return it. If "oid" does not dereference to
baf18fc2
NTND
78 * a commit, use ref_name to report an error and die.
79 */
bc83266a 80struct commit *lookup_commit_or_die(const struct object_id *oid, const char *ref_name);
baf18fc2 81
fd8030c7 82int parse_commit_buffer(struct repository *r, struct commit *item, const void *buffer, unsigned long size, int check_graph);
9e5252ab
SB
83int repo_parse_commit_internal(struct repository *r, struct commit *item,
84 int quiet_on_missing, int use_commit_graph);
85int repo_parse_commit_gently(struct repository *r,
86 struct commit *item,
87 int quiet_on_missing);
88static inline int repo_parse_commit(struct repository *r, struct commit *item)
9cc2b07a 89{
9e5252ab 90 return repo_parse_commit_gently(r, item, 0);
9cc2b07a 91}
43d35618
ÆAB
92
93static inline int parse_commit_no_graph(struct commit *commit)
94{
95 return repo_parse_commit_internal(the_repository, commit, 0, 0);
96}
97
9e5252ab
SB
98#ifndef NO_THE_REPOSITORY_COMPATIBILITY_MACROS
99#define parse_commit_internal(item, quiet, use) repo_parse_commit_internal(the_repository, item, quiet, use)
100#define parse_commit_gently(item, quiet) repo_parse_commit_gently(the_repository, item, quiet)
101#define parse_commit(item) repo_parse_commit(the_repository, item)
102#endif
103
7059dccc 104void parse_commit_or_die(struct commit *item);
6eb8ae00 105
65ea9d4b
SB
106struct buffer_slab;
107struct buffer_slab *allocate_commit_buffer_slab(void);
108void free_commit_buffer_slab(struct buffer_slab *bs);
109
66c2827e
JK
110/*
111 * Associate an object buffer with the commit. The ownership of the
112 * memory is handed over to the commit, and must be free()-able.
113 */
1a40fc45 114void set_commit_buffer(struct repository *r, struct commit *, void *buffer, unsigned long size);
66c2827e 115
152ff1cc
JK
116/*
117 * Get any cached object buffer associated with the commit. Returns NULL
118 * if none. The resulting memory should not be freed.
119 */
4ff7e5c9 120const void *get_cached_commit_buffer(struct repository *, const struct commit *, unsigned long *size);
152ff1cc
JK
121
122/*
123 * Get the commit's object contents, either from cache or by reading the object
124 * from disk. The resulting memory should not be modified, and must be given
125 * to unuse_commit_buffer when the caller is done.
126 */
07de3fd8
SB
127const void *repo_get_commit_buffer(struct repository *r,
128 const struct commit *,
129 unsigned long *size);
130#ifndef NO_THE_REPOSITORY_COMPATIBILITY_MACROS
131#define get_commit_buffer(c, s) repo_get_commit_buffer(the_repository, c, s)
132#endif
152ff1cc
JK
133
134/*
135 * Tell the commit subsytem that we are done with a particular commit buffer.
136 * The commit and buffer should be the input and return value, respectively,
137 * from an earlier call to get_commit_buffer. The buffer may or may not be
138 * freed by this call; callers should not access the memory afterwards.
139 */
70315373
SB
140void repo_unuse_commit_buffer(struct repository *r,
141 const struct commit *,
142 const void *buffer);
143#ifndef NO_THE_REPOSITORY_COMPATIBILITY_MACROS
144#define unuse_commit_buffer(c, b) repo_unuse_commit_buffer(the_repository, c, b)
145#endif
152ff1cc 146
0fb370da
JK
147/*
148 * Free any cached object buffer associated with the commit.
149 */
6a7895fd 150void free_commit_buffer(struct parsed_object_pool *pool, struct commit *);
0fb370da 151
5bb03de1
DS
152struct tree *get_commit_tree(const struct commit *);
153struct object_id *get_commit_tree_oid(const struct commit *);
154
14ba97f8
SB
155/*
156 * Release memory related to a commit, including the parent list and
157 * any cached object buffer.
158 */
6a7895fd 159void release_commit_memory(struct parsed_object_pool *pool, struct commit *c);
14ba97f8 160
0fb370da
JK
161/*
162 * Disassociate any cached object buffer from the commit, but do not free it.
163 * The buffer (or NULL, if none) is returned.
164 */
8597ea3a 165const void *detach_commit_buffer(struct commit *, unsigned long *sizep);
0fb370da 166
11af2aae
CC
167/* Find beginning and length of commit subject. */
168int find_commit_subject(const char *commit_buffer, const char **subject);
169
47e44ed1
TF
170struct commit_list *commit_list_insert(struct commit *item,
171 struct commit_list **list);
89b5f1d9
RS
172struct commit_list **commit_list_append(struct commit *commit,
173 struct commit_list **next);
65319475 174unsigned commit_list_count(const struct commit_list *l);
47e44ed1
TF
175struct commit_list *commit_list_insert_by_date(struct commit *item,
176 struct commit_list **list);
177void commit_list_sort_by_date(struct commit_list **list);
dd97f850 178
53d00b39
TR
179/* Shallow copy of the input list */
180struct commit_list *copy_commit_list(struct commit_list *list);
181
6eb8ae00
DB
182void free_commit_list(struct commit_list *list);
183
6d167fd7
RS
184struct rev_info; /* in revision.h, it circularly uses enum cmit_fmt */
185
28e9cf65 186extern int has_non_ascii(const char *text);
b000c59b
JK
187extern const char *logmsg_reencode(const struct commit *commit,
188 char **commit_encoding,
189 const char *output_encoding);
424510ed
SB
190const char *repo_logmsg_reencode(struct repository *r,
191 const struct commit *commit,
192 char **commit_encoding,
193 const char *output_encoding);
194#ifndef NO_THE_REPOSITORY_COMPATIBILITY_MACROS
195#define logmsg_reencode(c, enc, out) repo_logmsg_reencode(the_repository, c, enc, out)
196#endif
197
77356122 198extern const char *skip_blank_lines(const char *msg);
e3bc7a3b 199
dd97f850
DB
200/** Removes the first commit from a list sorted by date, and adds all
201 * of its parents.
202 **/
a6080a0a 203struct commit *pop_most_recent_commit(struct commit_list **list,
58e28af6 204 unsigned int mark);
dd97f850 205
a3437b8c
JS
206struct commit *pop_commit(struct commit_list **stack);
207
f8f9c73c 208void clear_commit_marks(struct commit *commit, unsigned int mark);
e895cb51 209void clear_commit_marks_many(int nr, struct commit **commit, unsigned int mark);
f8f9c73c 210
08f704f2
JH
211
212enum rev_sort_order {
213 REV_SORT_IN_GRAPH_ORDER = 0,
81c6b38b
JH
214 REV_SORT_BY_COMMIT_DATE,
215 REV_SORT_BY_AUTHOR_DATE
08f704f2
JH
216};
217
ab580ace
JS
218/*
219 * Performs an in-place topological sort of list supplied.
220 *
ab580ace
JS
221 * invariant of resulting list is:
222 * a reachable from b => ord(b) < ord(a)
08f704f2
JH
223 * sort_order further specifies:
224 * REV_SORT_IN_GRAPH_ORDER: try to show a commit on a single-parent
225 * chain together.
226 * REV_SORT_BY_COMMIT_DATE: show eligible commits in committer-date order.
ab580ace 227 */
08f704f2 228void sort_in_topological_order(struct commit_list **, enum rev_sort_order);
5040f17e
JH
229
230struct commit_graft {
7683e2e6 231 struct object_id oid;
ed09aef0 232 int nr_parent; /* < 0 if shallow commit */
7683e2e6 233 struct object_id parent[FLEX_ARRAY]; /* more */
5040f17e 234};
09d46644 235typedef int (*each_commit_graft_fn)(const struct commit_graft *, void *);
5040f17e 236
9a934032 237struct commit_graft *read_graft_line(struct strbuf *line);
a3b78e83 238int register_commit_graft(struct repository *r, struct commit_graft *, int);
20fd6d57 239void prepare_commit_graft(struct repository *r);
b9dbddf6 240struct commit_graft *lookup_commit_graft(struct repository *r, const struct object_id *oid);
5040f17e 241
103148aa
PK
242struct commit *get_fork_point(const char *refname, struct commit *commit);
243
41ccfdd9 244/* largest positive number a signed 32-bit integer can contain */
4dcb167f
NTND
245#define INFINITE_DEPTH 0x7fffffff
246
910650d2 247struct oid_array;
58babfff 248struct ref;
eee4502b 249extern int register_shallow(struct repository *r, const struct object_id *oid);
e92b848c 250extern int unregister_shallow(const struct object_id *oid);
09d46644 251extern int for_each_commit_graft(each_commit_graft_fn, void *);
eee4502b 252extern int is_repository_shallow(struct repository *r);
ed09aef0 253extern struct commit_list *get_shallow_commits(struct object_array *heads,
f53514bc 254 int depth, int shallow_flag, int not_shallow_flag);
3d9ff4d7
NTND
255extern struct commit_list *get_shallow_commits_by_rev_list(
256 int ac, const char **av, int shallow_flag, int not_shallow_flag);
eee4502b 257extern void set_alternate_shallow_file(struct repository *r, const char *path, int override);
1a30f5a2 258extern int write_shallow_commits(struct strbuf *out, int use_pack_protocol,
910650d2 259 const struct oid_array *extra);
3125fe52 260extern void setup_alternate_shallow(struct lock_file *shallow_lock,
1a30f5a2 261 const char **alternate_shallow_file,
910650d2 262 const struct oid_array *extra);
263extern const char *setup_temporary_shallow(const struct oid_array *extra);
ad491366 264extern void advertise_shallow_grafts(int);
ed09aef0 265
58babfff 266struct shallow_info {
910650d2 267 struct oid_array *shallow;
58babfff
NTND
268 int *ours, nr_ours;
269 int *theirs, nr_theirs;
910650d2 270 struct oid_array *ref;
0a1bc12b
NTND
271
272 /* for receive-pack */
273 uint32_t **used_shallow;
274 int *need_reachability_test;
275 int *reachable;
276 int *shallow_ref;
277 struct commit **commits;
278 int nr_commits;
58babfff
NTND
279};
280
910650d2 281extern void prepare_shallow_info(struct shallow_info *, struct oid_array *);
58babfff
NTND
282extern void clear_shallow_info(struct shallow_info *);
283extern void remove_nonexistent_theirs_shallow(struct shallow_info *);
8e277383
NTND
284extern void assign_shallow_commits_to_refs(struct shallow_info *info,
285 uint32_t **used,
286 int *ref_status);
0a1bc12b 287extern int delayed_reachability_test(struct shallow_info *si, int c);
2588f6ed
JS
288#define PRUNE_SHOW_ONLY 1
289#define PRUNE_QUICK 2
290extern void prune_shallow(unsigned options);
6aa30857 291extern struct trace_key trace_shallow;
ed09aef0 292
b4bd4668 293extern int interactive_add(int argc, const char **argv, const char *prefix, int patch);
46b5139c 294extern int run_add_interactive(const char *revision, const char *patch_mode,
480ca644 295 const struct pathspec *pathspec);
58680165 296
5231c633
JH
297struct commit_extra_header {
298 struct commit_extra_header *next;
299 char *key;
300 char *value;
301 size_t len;
302};
303
304extern void append_merge_tag_headers(struct commit_list *parents,
305 struct commit_extra_header ***tail);
306
3ffefb54 307extern int commit_tree(const char *msg, size_t msg_len,
5078f344
PO
308 const struct object_id *tree,
309 struct commit_list *parents, struct object_id *ret,
ba3c69a9 310 const char *author, const char *sign_commit);
5231c633 311
3ffefb54 312extern int commit_tree_extended(const char *msg, size_t msg_len,
5078f344
PO
313 const struct object_id *tree,
314 struct commit_list *parents,
315 struct object_id *ret, const char *author,
316 const char *sign_commit,
5231c633
JH
317 struct commit_extra_header *);
318
c871a1d1 319extern struct commit_extra_header *read_commit_extra_headers(struct commit *, const char **);
ed7a42a0 320
5231c633 321extern void free_commit_extra_headers(struct commit_extra_header *extra);
40d52ff7 322
fe6eb7f2
JK
323/*
324 * Search the commit object contents given by "msg" for the header "key".
325 * Returns a pointer to the start of the header contents, or NULL. The length
326 * of the header, up to the first newline, is returned via out_len.
327 *
328 * Note that some headers (like mergetag) may be multi-line. It is the caller's
329 * responsibility to parse further in this case!
330 */
331extern const char *find_commit_header(const char *msg, const char *key,
332 size_t *out_len);
333
8c384589 334/* Find the end of the log message, the right place for a new trailer. */
66e83d9b 335extern size_t ignore_non_trailer(const char *buf, size_t len);
8c384589 336
fef461ea 337typedef int (*each_mergetag_fn)(struct commit *commit, struct commit_extra_header *extra,
063da62b
CC
338 void *cb_data);
339
fef461ea 340extern int for_each_mergetag(each_mergetag_fn fn, struct commit *commit, void *data);
063da62b 341
ae8e4c9c
JH
342struct merge_remote_desc {
343 struct object *obj; /* the named object, could be a tag */
5447a76a 344 char name[FLEX_ARRAY];
ae8e4c9c 345};
e2e5ac23 346extern struct merge_remote_desc *merge_remote_util(struct commit *);
beb518c9
RS
347extern void set_merge_remote_desc(struct commit *commit,
348 const char *name, struct object *obj);
ae8e4c9c
JH
349
350/*
351 * Given "name" from the command line to merge, find the commit object
352 * and return it, while storing merge_remote_desc in its ->util field,
353 * to allow callers to tell if we are told to merge a tag.
354 */
355struct commit *get_merge_parent(const char *name);
356
218aa3a6 357extern int parse_signed_commit(const struct commit *commit,
0c37f1fc 358 struct strbuf *message, struct strbuf *signature);
0b05ab6f
CC
359extern int remove_signature(struct strbuf *buf);
360
ffb6d7d5 361/*
eb307ae7
SG
362 * Check the signature of the given commit. The result of the check is stored
363 * in sig->check_result, 'G' for a good signature, 'U' for a good signature
364 * from an untrusted signer, 'B' for a bad signature and 'N' for no signature
365 * at all. This may allocate memory for sig->gpg_output, sig->gpg_status,
366 * sig->signer and sig->key.
ffb6d7d5 367 */
434060ec 368extern int check_commit_signature(const struct commit *commit, struct signature_check *sigc);
ffb6d7d5 369
5284fc5c
DS
370/* record author-date for each commit object */
371struct author_date_slab;
372void record_author_date(struct author_date_slab *author_date,
373 struct commit *commit);
374
375int compare_commits_by_author_date(const void *a_, const void *b_, void *unused);
6d2035ee 376
edc4d47d
JK
377/*
378 * Verify a single commit with check_commit_signature() and die() if it is not
379 * a good signature. This isn't really suitable for general use, but is a
380 * helper to implement consistent logic for pull/merge --verify-signatures.
381 */
382void verify_merge_signature(struct commit *commit, int verbose);
383
727377ff 384int compare_commits_by_commit_date(const void *a_, const void *b_, void *unused);
3afc679b 385int compare_commits_by_gen_then_commit_date(const void *a_, const void *b_, void *unused);
727377ff 386
15048f8a
BP
387LAST_ARG_MUST_BE_NULL
388extern int run_commit_hook(int editor_is_used, const char *index_file, const char *name, ...);
389
6eb8ae00 390#endif /* COMMIT_H */