commit: add repository argument to lookup_commit_reference_gently
[git/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"
6eb8ae00 11
177722b3 12#define COMMIT_NOT_FROM_GRAPH 0xFFFFFFFF
83073cc9
DS
13#define GENERATION_NUMBER_INFINITY 0xFFFFFFFF
14#define GENERATION_NUMBER_MAX 0x3FFFFFFF
15#define GENERATION_NUMBER_ZERO 0
177722b3 16
6eb8ae00
DB
17struct commit_list {
18 struct commit *item;
19 struct commit_list *next;
20};
21
9d2c9701
NTND
22/*
23 * The size of this struct matters in full repo walk operations like
24 * 'git clone' or 'git gc'. Consider using commit-slab to attach data
25 * to a commit instead of adding new fields here.
26 */
6eb8ae00
DB
27struct commit {
28 struct object object;
dddbad72 29 timestamp_t date;
6eb8ae00 30 struct commit_list *parents;
7b8a21db
DS
31
32 /*
33 * If the commit is loaded from the commit-graph file, then this
34 * member may be NULL. Only access it through get_commit_tree()
35 * or get_commit_tree_oid().
36 */
891435d5 37 struct tree *maybe_tree;
177722b3 38 uint32_t graph_pos;
83073cc9 39 uint32_t generation;
25f859fd 40 unsigned int index;
6eb8ae00
DB
41};
42
60ab26de 43extern int save_commit_buffer;
6eb8ae00
DB
44extern const char *commit_type;
45
ca135e7a 46/* While we can decorate any object with a name, it's only used for commits.. */
ca135e7a
LT
47struct name_decoration {
48 struct name_decoration *next;
eb3005e2 49 int type;
2e3dfb21 50 char name[FLEX_ARRAY];
ca135e7a
LT
51};
52
662174d2
JK
53enum decoration_type {
54 DECORATION_NONE = 0,
55 DECORATION_REF_LOCAL,
56 DECORATION_REF_REMOTE,
57 DECORATION_REF_TAG,
58 DECORATION_REF_STASH,
59 DECORATION_REF_HEAD,
60 DECORATION_GRAFTED,
61};
62
63void add_name_decoration(enum decoration_type type, const char *name, struct object *obj);
2608c249 64const struct name_decoration *get_name_decoration(const struct object *obj);
662174d2 65
bc83266a 66struct commit *lookup_commit(const struct object_id *oid);
67struct commit *lookup_commit_reference(const struct object_id *oid);
21e1ee8f
SB
68#define lookup_commit_reference_gently(r, o, q) \
69 lookup_commit_reference_gently_##r(o, q)
70struct commit *lookup_commit_reference_gently_the_repository(
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
e2838d85 82int parse_commit_buffer(struct commit *item, const void *buffer, unsigned long size, int check_graph);
9cc2b07a
JK
83int parse_commit_gently(struct commit *item, int quiet_on_missing);
84static inline int parse_commit(struct commit *item)
85{
86 return parse_commit_gently(item, 0);
87}
7059dccc 88void parse_commit_or_die(struct commit *item);
6eb8ae00 89
66c2827e
JK
90/*
91 * Associate an object buffer with the commit. The ownership of the
92 * memory is handed over to the commit, and must be free()-able.
93 */
8597ea3a 94void set_commit_buffer(struct commit *, void *buffer, unsigned long size);
66c2827e 95
152ff1cc
JK
96/*
97 * Get any cached object buffer associated with the commit. Returns NULL
98 * if none. The resulting memory should not be freed.
99 */
8597ea3a 100const void *get_cached_commit_buffer(const struct commit *, unsigned long *size);
152ff1cc
JK
101
102/*
103 * Get the commit's object contents, either from cache or by reading the object
104 * from disk. The resulting memory should not be modified, and must be given
105 * to unuse_commit_buffer when the caller is done.
106 */
8597ea3a 107const void *get_commit_buffer(const struct commit *, unsigned long *size);
152ff1cc
JK
108
109/*
110 * Tell the commit subsytem that we are done with a particular commit buffer.
111 * The commit and buffer should be the input and return value, respectively,
112 * from an earlier call to get_commit_buffer. The buffer may or may not be
113 * freed by this call; callers should not access the memory afterwards.
114 */
115void unuse_commit_buffer(const struct commit *, const void *buffer);
116
0fb370da
JK
117/*
118 * Free any cached object buffer associated with the commit.
119 */
120void free_commit_buffer(struct commit *);
121
5bb03de1
DS
122struct tree *get_commit_tree(const struct commit *);
123struct object_id *get_commit_tree_oid(const struct commit *);
124
14ba97f8
SB
125/*
126 * Release memory related to a commit, including the parent list and
127 * any cached object buffer.
128 */
129void release_commit_memory(struct commit *c);
130
0fb370da
JK
131/*
132 * Disassociate any cached object buffer from the commit, but do not free it.
133 * The buffer (or NULL, if none) is returned.
134 */
8597ea3a 135const void *detach_commit_buffer(struct commit *, unsigned long *sizep);
0fb370da 136
11af2aae
CC
137/* Find beginning and length of commit subject. */
138int find_commit_subject(const char *commit_buffer, const char **subject);
139
47e44ed1
TF
140struct commit_list *commit_list_insert(struct commit *item,
141 struct commit_list **list);
89b5f1d9
RS
142struct commit_list **commit_list_append(struct commit *commit,
143 struct commit_list **next);
65319475 144unsigned commit_list_count(const struct commit_list *l);
47e44ed1
TF
145struct commit_list *commit_list_insert_by_date(struct commit *item,
146 struct commit_list **list);
147void commit_list_sort_by_date(struct commit_list **list);
dd97f850 148
53d00b39
TR
149/* Shallow copy of the input list */
150struct commit_list *copy_commit_list(struct commit_list *list);
151
6eb8ae00
DB
152void free_commit_list(struct commit_list *list);
153
6d167fd7
RS
154struct rev_info; /* in revision.h, it circularly uses enum cmit_fmt */
155
28e9cf65 156extern int has_non_ascii(const char *text);
b000c59b
JK
157extern const char *logmsg_reencode(const struct commit *commit,
158 char **commit_encoding,
159 const char *output_encoding);
77356122 160extern const char *skip_blank_lines(const char *msg);
e3bc7a3b 161
dd97f850
DB
162/** Removes the first commit from a list sorted by date, and adds all
163 * of its parents.
164 **/
a6080a0a 165struct commit *pop_most_recent_commit(struct commit_list **list,
58e28af6 166 unsigned int mark);
dd97f850 167
a3437b8c
JS
168struct commit *pop_commit(struct commit_list **stack);
169
f8f9c73c 170void clear_commit_marks(struct commit *commit, unsigned int mark);
e895cb51 171void clear_commit_marks_many(int nr, struct commit **commit, unsigned int mark);
f8f9c73c 172
08f704f2
JH
173
174enum rev_sort_order {
175 REV_SORT_IN_GRAPH_ORDER = 0,
81c6b38b
JH
176 REV_SORT_BY_COMMIT_DATE,
177 REV_SORT_BY_AUTHOR_DATE
08f704f2
JH
178};
179
ab580ace
JS
180/*
181 * Performs an in-place topological sort of list supplied.
182 *
ab580ace
JS
183 * invariant of resulting list is:
184 * a reachable from b => ord(b) < ord(a)
08f704f2
JH
185 * sort_order further specifies:
186 * REV_SORT_IN_GRAPH_ORDER: try to show a commit on a single-parent
187 * chain together.
188 * REV_SORT_BY_COMMIT_DATE: show eligible commits in committer-date order.
ab580ace 189 */
08f704f2 190void sort_in_topological_order(struct commit_list **, enum rev_sort_order);
5040f17e
JH
191
192struct commit_graft {
7683e2e6 193 struct object_id oid;
ed09aef0 194 int nr_parent; /* < 0 if shallow commit */
7683e2e6 195 struct object_id parent[FLEX_ARRAY]; /* more */
5040f17e 196};
09d46644 197typedef int (*each_commit_graft_fn)(const struct commit_graft *, void *);
5040f17e 198
9a934032 199struct commit_graft *read_graft_line(struct strbuf *line);
a3b78e83 200int register_commit_graft(struct repository *r, struct commit_graft *, int);
b9dbddf6 201struct commit_graft *lookup_commit_graft(struct repository *r, const struct object_id *oid);
5040f17e 202
2ce406cc
JH
203extern struct commit_list *get_merge_bases(struct commit *rev1, struct commit *rev2);
204extern struct commit_list *get_merge_bases_many(struct commit *one, int n, struct commit **twos);
5240c9d7 205extern struct commit_list *get_octopus_merge_bases(struct commit_list *in);
7c6f8aaf 206
2ce406cc
JH
207/* To be used only when object flags after this call no longer matter */
208extern struct commit_list *get_merge_bases_many_dirty(struct commit *one, int n, struct commit **twos);
209
41ccfdd9 210/* largest positive number a signed 32-bit integer can contain */
4dcb167f
NTND
211#define INFINITE_DEPTH 0x7fffffff
212
910650d2 213struct oid_array;
58babfff 214struct ref;
eee4502b 215extern int register_shallow(struct repository *r, const struct object_id *oid);
e92b848c 216extern int unregister_shallow(const struct object_id *oid);
09d46644 217extern int for_each_commit_graft(each_commit_graft_fn, void *);
eee4502b 218extern int is_repository_shallow(struct repository *r);
ed09aef0 219extern struct commit_list *get_shallow_commits(struct object_array *heads,
f53514bc 220 int depth, int shallow_flag, int not_shallow_flag);
3d9ff4d7
NTND
221extern struct commit_list *get_shallow_commits_by_rev_list(
222 int ac, const char **av, int shallow_flag, int not_shallow_flag);
eee4502b 223extern void set_alternate_shallow_file(struct repository *r, const char *path, int override);
1a30f5a2 224extern int write_shallow_commits(struct strbuf *out, int use_pack_protocol,
910650d2 225 const struct oid_array *extra);
3125fe52 226extern void setup_alternate_shallow(struct lock_file *shallow_lock,
1a30f5a2 227 const char **alternate_shallow_file,
910650d2 228 const struct oid_array *extra);
229extern const char *setup_temporary_shallow(const struct oid_array *extra);
ad491366 230extern void advertise_shallow_grafts(int);
ed09aef0 231
58babfff 232struct shallow_info {
910650d2 233 struct oid_array *shallow;
58babfff
NTND
234 int *ours, nr_ours;
235 int *theirs, nr_theirs;
910650d2 236 struct oid_array *ref;
0a1bc12b
NTND
237
238 /* for receive-pack */
239 uint32_t **used_shallow;
240 int *need_reachability_test;
241 int *reachable;
242 int *shallow_ref;
243 struct commit **commits;
244 int nr_commits;
58babfff
NTND
245};
246
910650d2 247extern void prepare_shallow_info(struct shallow_info *, struct oid_array *);
58babfff
NTND
248extern void clear_shallow_info(struct shallow_info *);
249extern void remove_nonexistent_theirs_shallow(struct shallow_info *);
8e277383
NTND
250extern void assign_shallow_commits_to_refs(struct shallow_info *info,
251 uint32_t **used,
252 int *ref_status);
0a1bc12b 253extern int delayed_reachability_test(struct shallow_info *si, int c);
eab3296c 254extern void prune_shallow(int show_only);
6aa30857 255extern struct trace_key trace_shallow;
ed09aef0 256
7fcdb36e 257int is_descendant_of(struct commit *, struct commit_list *);
a20efee9 258int in_merge_bases(struct commit *, struct commit *);
4c4b27e8 259int in_merge_bases_many(struct commit *, int, struct commit **);
58680165 260
b4bd4668 261extern int interactive_add(int argc, const char **argv, const char *prefix, int patch);
46b5139c 262extern int run_add_interactive(const char *revision, const char *patch_mode,
480ca644 263 const struct pathspec *pathspec);
58680165 264
4da72644
265/*
266 * Takes a list of commits and returns a new list where those
267 * have been removed that can be reached from other commits in
268 * the list. It is useful for, e.g., reducing the commits
269 * randomly thrown at the git-merge command and removing
270 * redundant commits that the user shouldn't have given to it.
271 *
272 * This function destroys the STALE bit of the commit objects'
273 * flags.
274 */
275extern struct commit_list *reduce_heads(struct commit_list *heads);
276
277/*
278 * Like `reduce_heads()`, except it replaces the list. Use this
279 * instead of `foo = reduce_heads(foo);` to avoid memory leaks.
280 */
281extern void reduce_heads_replace(struct commit_list **heads);
98cf9c3b 282
5231c633
JH
283struct commit_extra_header {
284 struct commit_extra_header *next;
285 char *key;
286 char *value;
287 size_t len;
288};
289
290extern void append_merge_tag_headers(struct commit_list *parents,
291 struct commit_extra_header ***tail);
292
3ffefb54 293extern int commit_tree(const char *msg, size_t msg_len,
5078f344
PO
294 const struct object_id *tree,
295 struct commit_list *parents, struct object_id *ret,
ba3c69a9 296 const char *author, const char *sign_commit);
5231c633 297
3ffefb54 298extern int commit_tree_extended(const char *msg, size_t msg_len,
5078f344
PO
299 const struct object_id *tree,
300 struct commit_list *parents,
301 struct object_id *ret, const char *author,
302 const char *sign_commit,
5231c633
JH
303 struct commit_extra_header *);
304
c871a1d1 305extern struct commit_extra_header *read_commit_extra_headers(struct commit *, const char **);
ed7a42a0 306
5231c633 307extern void free_commit_extra_headers(struct commit_extra_header *extra);
40d52ff7 308
fe6eb7f2
JK
309/*
310 * Search the commit object contents given by "msg" for the header "key".
311 * Returns a pointer to the start of the header contents, or NULL. The length
312 * of the header, up to the first newline, is returned via out_len.
313 *
314 * Note that some headers (like mergetag) may be multi-line. It is the caller's
315 * responsibility to parse further in this case!
316 */
317extern const char *find_commit_header(const char *msg, const char *key,
318 size_t *out_len);
319
8c384589 320/* Find the end of the log message, the right place for a new trailer. */
710714aa 321extern int ignore_non_trailer(const char *buf, size_t len);
8c384589 322
fef461ea 323typedef int (*each_mergetag_fn)(struct commit *commit, struct commit_extra_header *extra,
063da62b
CC
324 void *cb_data);
325
fef461ea 326extern int for_each_mergetag(each_mergetag_fn fn, struct commit *commit, void *data);
063da62b 327
ae8e4c9c
JH
328struct merge_remote_desc {
329 struct object *obj; /* the named object, could be a tag */
5447a76a 330 char name[FLEX_ARRAY];
ae8e4c9c 331};
e2e5ac23 332extern struct merge_remote_desc *merge_remote_util(struct commit *);
beb518c9
RS
333extern void set_merge_remote_desc(struct commit *commit,
334 const char *name, struct object *obj);
ae8e4c9c
JH
335
336/*
337 * Given "name" from the command line to merge, find the commit object
338 * and return it, while storing merge_remote_desc in its ->util field,
339 * to allow callers to tell if we are told to merge a tag.
340 */
341struct commit *get_merge_parent(const char *name);
342
218aa3a6 343extern int parse_signed_commit(const struct commit *commit,
0c37f1fc 344 struct strbuf *message, struct strbuf *signature);
0b05ab6f
CC
345extern int remove_signature(struct strbuf *buf);
346
ffb6d7d5 347/*
eb307ae7
SG
348 * Check the signature of the given commit. The result of the check is stored
349 * in sig->check_result, 'G' for a good signature, 'U' for a good signature
350 * from an untrusted signer, 'B' for a bad signature and 'N' for no signature
351 * at all. This may allocate memory for sig->gpg_output, sig->gpg_status,
352 * sig->signer and sig->key.
ffb6d7d5 353 */
434060ec 354extern int check_commit_signature(const struct commit *commit, struct signature_check *sigc);
ffb6d7d5 355
727377ff 356int compare_commits_by_commit_date(const void *a_, const void *b_, void *unused);
3afc679b 357int compare_commits_by_gen_then_commit_date(const void *a_, const void *b_, void *unused);
727377ff 358
15048f8a
BP
359LAST_ARG_MUST_BE_NULL
360extern int run_commit_hook(int editor_is_used, const char *index_file, const char *name, ...);
361
6eb8ae00 362#endif /* COMMIT_H */