blob: 0fb8271665c6c98ccca803fbe002327bf38fcfb3 [file] [log] [blame]
Daniel Barkalow6eb8ae02005-04-18 11:39:48 -07001#ifndef COMMIT_H
2#define COMMIT_H
3
4#include "object.h"
5#include "tree.h"
Pierre Habouzit674d1722007-09-10 12:35:06 +02006#include "strbuf.h"
Linus Torvaldsca135e72007-04-16 16:05:10 -07007#include "decorate.h"
Sebastian Götteffb6d7d2013-03-31 18:00:14 +02008#include "gpg-interface.h"
Jeff Kinga9080472013-07-03 03:08:22 -04009#include "string-list.h"
Olga Telezhnayacf394712017-12-12 08:55:35 +000010#include "pretty.h"
Daniel Barkalow6eb8ae02005-04-18 11:39:48 -070011
12struct commit_list {
13 struct commit *item;
14 struct commit_list *next;
15};
16
17struct commit {
18 struct object object;
Linus Torvaldsd3ff6f52006-06-17 18:26:18 -070019 void *util;
Jeff King96c4f4a2013-04-09 02:52:56 -040020 unsigned int index;
Johannes Schindelindddbad72017-04-26 21:29:31 +020021 timestamp_t date;
Daniel Barkalow6eb8ae02005-04-18 11:39:48 -070022 struct commit_list *parents;
23 struct tree *tree;
24};
25
Linus Torvalds60ab26d2005-09-15 14:43:17 -070026extern int save_commit_buffer;
Daniel Barkalow6eb8ae02005-04-18 11:39:48 -070027extern const char *commit_type;
28
Linus Torvaldsca135e72007-04-16 16:05:10 -070029/* While we can decorate any object with a name, it's only used for commits.. */
Linus Torvaldsca135e72007-04-16 16:05:10 -070030struct name_decoration {
31 struct name_decoration *next;
Nazri Ramliyeb3005e2010-06-19 09:37:33 +080032 int type;
Jeff King2e3dfb22014-08-26 06:24:20 -040033 char name[FLEX_ARRAY];
Linus Torvaldsca135e72007-04-16 16:05:10 -070034};
35
Jeff King662174d2014-08-26 06:23:36 -040036enum decoration_type {
37 DECORATION_NONE = 0,
38 DECORATION_REF_LOCAL,
39 DECORATION_REF_REMOTE,
40 DECORATION_REF_TAG,
41 DECORATION_REF_STASH,
42 DECORATION_REF_HEAD,
43 DECORATION_GRAFTED,
44};
45
46void add_name_decoration(enum decoration_type type, const char *name, struct object *obj);
Jeff King2608c242014-08-26 06:23:54 -040047const struct name_decoration *get_name_decoration(const struct object *obj);
Jeff King662174d2014-08-26 06:23:36 -040048
brian m. carlsonbc832662017-05-06 22:10:10 +000049struct commit *lookup_commit(const struct object_id *oid);
50struct commit *lookup_commit_reference(const struct object_id *oid);
51struct commit *lookup_commit_reference_gently(const struct object_id *oid,
Junio C Hamanof76412e2005-08-21 02:51:10 -070052 int quiet);
Pat Notza6fa5992010-11-02 13:59:07 -060053struct commit *lookup_commit_reference_by_name(const char *name);
Daniel Barkalow6eb8ae02005-04-18 11:39:48 -070054
Nguyễn Thái Ngọc Duybaf18fc2011-09-17 21:57:45 +100055/*
brian m. carlsonbc832662017-05-06 22:10:10 +000056 * Look up object named by "oid", dereference tag as necessary,
57 * get a commit and return it. If "oid" does not dereference to
Nguyễn Thái Ngọc Duybaf18fc2011-09-17 21:57:45 +100058 * a commit, use ref_name to report an error and die.
59 */
brian m. carlsonbc832662017-05-06 22:10:10 +000060struct commit *lookup_commit_or_die(const struct object_id *oid, const char *ref_name);
Nguyễn Thái Ngọc Duybaf18fc2011-09-17 21:57:45 +100061
Nguyễn Thái Ngọc Duycf7b1ca2011-02-05 17:52:20 +070062int parse_commit_buffer(struct commit *item, const void *buffer, unsigned long size);
Jeff King9cc2b072015-06-01 05:56:26 -040063int parse_commit_gently(struct commit *item, int quiet_on_missing);
64static inline int parse_commit(struct commit *item)
65{
66 return parse_commit_gently(item, 0);
67}
Jeff King7059dcc2013-10-24 04:52:36 -040068void parse_commit_or_die(struct commit *item);
Daniel Barkalow6eb8ae02005-04-18 11:39:48 -070069
Jeff King0fb370d2014-06-12 18:05:37 -040070/*
Jeff King66c28272014-06-10 17:40:14 -040071 * Associate an object buffer with the commit. The ownership of the
72 * memory is handed over to the commit, and must be free()-able.
73 */
Jeff King8597ea32014-06-10 17:44:13 -040074void set_commit_buffer(struct commit *, void *buffer, unsigned long size);
Jeff King66c28272014-06-10 17:40:14 -040075
76/*
Jeff King152ff1c2014-06-10 17:40:39 -040077 * Get any cached object buffer associated with the commit. Returns NULL
78 * if none. The resulting memory should not be freed.
79 */
Jeff King8597ea32014-06-10 17:44:13 -040080const void *get_cached_commit_buffer(const struct commit *, unsigned long *size);
Jeff King152ff1c2014-06-10 17:40:39 -040081
82/*
83 * Get the commit's object contents, either from cache or by reading the object
84 * from disk. The resulting memory should not be modified, and must be given
85 * to unuse_commit_buffer when the caller is done.
86 */
Jeff King8597ea32014-06-10 17:44:13 -040087const void *get_commit_buffer(const struct commit *, unsigned long *size);
Jeff King152ff1c2014-06-10 17:40:39 -040088
89/*
90 * Tell the commit subsytem that we are done with a particular commit buffer.
91 * The commit and buffer should be the input and return value, respectively,
92 * from an earlier call to get_commit_buffer. The buffer may or may not be
93 * freed by this call; callers should not access the memory afterwards.
94 */
95void unuse_commit_buffer(const struct commit *, const void *buffer);
96
97/*
Jeff King0fb370d2014-06-12 18:05:37 -040098 * Free any cached object buffer associated with the commit.
99 */
100void free_commit_buffer(struct commit *);
101
102/*
103 * Disassociate any cached object buffer from the commit, but do not free it.
104 * The buffer (or NULL, if none) is returned.
105 */
Jeff King8597ea32014-06-10 17:44:13 -0400106const void *detach_commit_buffer(struct commit *, unsigned long *sizep);
Jeff King0fb370d2014-06-12 18:05:37 -0400107
Christian Couder11af2aa2010-07-22 15:18:30 +0200108/* Find beginning and length of commit subject. */
109int find_commit_subject(const char *commit_buffer, const char **subject);
110
Thiago Farina47e44ed2010-11-26 23:58:14 -0200111struct commit_list *commit_list_insert(struct commit *item,
112 struct commit_list **list);
René Scharfe89b5f1d2012-04-25 22:35:27 +0200113struct commit_list **commit_list_append(struct commit *commit,
114 struct commit_list **next);
Miklos Vajna65319472008-06-27 18:21:55 +0200115unsigned commit_list_count(const struct commit_list *l);
Thiago Farina47e44ed2010-11-26 23:58:14 -0200116struct commit_list *commit_list_insert_by_date(struct commit *item,
117 struct commit_list **list);
118void commit_list_sort_by_date(struct commit_list **list);
Daniel Barkalowdd97f852005-04-23 18:47:23 -0700119
Thomas Rast53d00b32013-07-31 22:13:20 +0200120/* Shallow copy of the input list */
121struct commit_list *copy_commit_list(struct commit_list *list);
122
Daniel Barkalow6eb8ae02005-04-18 11:39:48 -0700123void free_commit_list(struct commit_list *list);
124
René Scharfe6d167fd2017-03-01 12:37:07 +0100125struct rev_info; /* in revision.h, it circularly uses enum cmit_fmt */
126
Johannes Schindelin28e9cf62009-08-10 18:22:18 +0200127extern int has_non_ascii(const char *text);
Jeff Kingb000c592014-06-10 17:39:30 -0400128extern const char *logmsg_reencode(const struct commit *commit,
129 char **commit_encoding,
130 const char *output_encoding);
Johannes Schindelin77356122016-06-22 22:20:16 +0200131extern const char *skip_blank_lines(const char *msg);
Linus Torvaldse3bc7a32005-06-01 08:34:23 -0700132
Daniel Barkalowdd97f852005-04-23 18:47:23 -0700133/** Removes the first commit from a list sorted by date, and adds all
134 * of its parents.
135 **/
Junio C Hamanoa6080a02007-06-07 00:04:01 -0700136struct commit *pop_most_recent_commit(struct commit_list **list,
Daniel Barkalow58e28af2005-04-23 20:29:22 -0700137 unsigned int mark);
Daniel Barkalowdd97f852005-04-23 18:47:23 -0700138
jon@blackcubes.dyndns.orga3437b82005-06-06 15:39:40 +0000139struct commit *pop_commit(struct commit_list **stack);
140
Junio C Hamanof8f9c732006-01-07 18:52:42 -0800141void clear_commit_marks(struct commit *commit, unsigned int mark);
Junio C Hamanoe895cb52013-03-05 11:42:20 -0800142void clear_commit_marks_many(int nr, struct commit **commit, unsigned int mark);
Junio C Hamanof8f9c732006-01-07 18:52:42 -0800143
Junio C Hamano08f704f2013-06-06 16:07:14 -0700144
145enum rev_sort_order {
146 REV_SORT_IN_GRAPH_ORDER = 0,
Junio C Hamano81c6b382013-06-07 10:35:54 -0700147 REV_SORT_BY_COMMIT_DATE,
148 REV_SORT_BY_AUTHOR_DATE
Junio C Hamano08f704f2013-06-06 16:07:14 -0700149};
150
Jon Seymourab580ac2005-07-07 02:39:34 +1000151/*
152 * Performs an in-place topological sort of list supplied.
153 *
Jon Seymourab580ac2005-07-07 02:39:34 +1000154 * invariant of resulting list is:
155 * a reachable from b => ord(b) < ord(a)
Junio C Hamano08f704f2013-06-06 16:07:14 -0700156 * sort_order further specifies:
157 * REV_SORT_IN_GRAPH_ORDER: try to show a commit on a single-parent
158 * chain together.
159 * REV_SORT_BY_COMMIT_DATE: show eligible commits in committer-date order.
Jon Seymourab580ac2005-07-07 02:39:34 +1000160 */
Junio C Hamano08f704f2013-06-06 16:07:14 -0700161void sort_in_topological_order(struct commit_list **, enum rev_sort_order);
Junio C Hamano5040f172006-04-06 23:58:51 -0700162
163struct commit_graft {
brian m. carlson7683e2e2015-03-13 23:39:34 +0000164 struct object_id oid;
Johannes Schindelined09aef2006-10-30 20:09:06 +0100165 int nr_parent; /* < 0 if shallow commit */
brian m. carlson7683e2e2015-03-13 23:39:34 +0000166 struct object_id parent[FLEX_ARRAY]; /* more */
Junio C Hamano5040f172006-04-06 23:58:51 -0700167};
Nguyễn Thái Ngọc Duy09d46642011-08-18 19:29:35 +0700168typedef int (*each_commit_graft_fn)(const struct commit_graft *, void *);
Junio C Hamano5040f172006-04-06 23:58:51 -0700169
Patryk Obara9a934032017-08-18 20:33:12 +0200170struct commit_graft *read_graft_line(struct strbuf *line);
Junio C Hamano5040f172006-04-06 23:58:51 -0700171int register_commit_graft(struct commit_graft *, int);
Stefan Beller8b65a342017-07-12 17:44:14 -0700172struct commit_graft *lookup_commit_graft(const struct object_id *oid);
Junio C Hamano5040f172006-04-06 23:58:51 -0700173
Junio C Hamano2ce406c2014-10-30 12:20:44 -0700174extern struct commit_list *get_merge_bases(struct commit *rev1, struct commit *rev2);
175extern struct commit_list *get_merge_bases_many(struct commit *one, int n, struct commit **twos);
Miklos Vajna5240c9d2008-06-27 18:22:00 +0200176extern struct commit_list *get_octopus_merge_bases(struct commit_list *in);
Johannes Schindelin7c6f8aa2006-06-29 15:17:32 +0200177
Junio C Hamano2ce406c2014-10-30 12:20:44 -0700178/* To be used only when object flags after this call no longer matter */
179extern struct commit_list *get_merge_bases_many_dirty(struct commit *one, int n, struct commit **twos);
180
Stefano Lattarini41ccfdd2013-04-12 00:36:10 +0200181/* largest positive number a signed 32-bit integer can contain */
Nguyễn Thái Ngọc Duy4dcb1672013-01-11 16:05:46 +0700182#define INFINITE_DEPTH 0x7fffffff
183
brian m. carlson910650d2017-03-31 01:40:00 +0000184struct oid_array;
Nguyễn Thái Ngọc Duy58babff2013-12-05 20:02:35 +0700185struct ref;
brian m. carlsone92b8482017-05-06 22:10:06 +0000186extern int register_shallow(const struct object_id *oid);
187extern int unregister_shallow(const struct object_id *oid);
Nguyễn Thái Ngọc Duy09d46642011-08-18 19:29:35 +0700188extern int for_each_commit_graft(each_commit_graft_fn, void *);
Junio C Hamanof43117a2007-01-21 22:22:23 -0800189extern int is_repository_shallow(void);
Johannes Schindelined09aef2006-10-30 20:09:06 +0100190extern struct commit_list *get_shallow_commits(struct object_array *heads,
Johannes Schindelinf53514b2006-10-30 20:09:53 +0100191 int depth, int shallow_flag, int not_shallow_flag);
Nguyễn Thái Ngọc Duy3d9ff4d2016-06-12 17:53:57 +0700192extern struct commit_list *get_shallow_commits_by_rev_list(
193 int ac, const char **av, int shallow_flag, int not_shallow_flag);
Nguyễn Thái Ngọc Duy069c0532013-12-05 20:02:45 +0700194extern void set_alternate_shallow_file(const char *path, int override);
Nguyễn Thái Ngọc Duy1a30f5a2013-12-05 20:02:34 +0700195extern int write_shallow_commits(struct strbuf *out, int use_pack_protocol,
brian m. carlson910650d2017-03-31 01:40:00 +0000196 const struct oid_array *extra);
Nguyễn Thái Ngọc Duy3125fe52013-08-16 16:52:02 +0700197extern void setup_alternate_shallow(struct lock_file *shallow_lock,
Nguyễn Thái Ngọc Duy1a30f5a2013-12-05 20:02:34 +0700198 const char **alternate_shallow_file,
brian m. carlson910650d2017-03-31 01:40:00 +0000199 const struct oid_array *extra);
200extern const char *setup_temporary_shallow(const struct oid_array *extra);
Nguyễn Thái Ngọc Duyad491362013-12-05 20:02:32 +0700201extern void advertise_shallow_grafts(int);
Johannes Schindelined09aef2006-10-30 20:09:06 +0100202
Nguyễn Thái Ngọc Duy58babff2013-12-05 20:02:35 +0700203struct shallow_info {
brian m. carlson910650d2017-03-31 01:40:00 +0000204 struct oid_array *shallow;
Nguyễn Thái Ngọc Duy58babff2013-12-05 20:02:35 +0700205 int *ours, nr_ours;
206 int *theirs, nr_theirs;
brian m. carlson910650d2017-03-31 01:40:00 +0000207 struct oid_array *ref;
Nguyễn Thái Ngọc Duy0a1bc122013-12-05 20:02:47 +0700208
209 /* for receive-pack */
210 uint32_t **used_shallow;
211 int *need_reachability_test;
212 int *reachable;
213 int *shallow_ref;
214 struct commit **commits;
215 int nr_commits;
Nguyễn Thái Ngọc Duy58babff2013-12-05 20:02:35 +0700216};
217
brian m. carlson910650d2017-03-31 01:40:00 +0000218extern void prepare_shallow_info(struct shallow_info *, struct oid_array *);
Nguyễn Thái Ngọc Duy58babff2013-12-05 20:02:35 +0700219extern void clear_shallow_info(struct shallow_info *);
220extern void remove_nonexistent_theirs_shallow(struct shallow_info *);
Nguyễn Thái Ngọc Duy8e277382013-12-05 20:02:36 +0700221extern void assign_shallow_commits_to_refs(struct shallow_info *info,
222 uint32_t **used,
223 int *ref_status);
Nguyễn Thái Ngọc Duy0a1bc122013-12-05 20:02:47 +0700224extern int delayed_reachability_test(struct shallow_info *si, int c);
Nguyễn Thái Ngọc Duyeab32962013-12-05 20:02:54 +0700225extern void prune_shallow(int show_only);
Karsten Blees6aa30852014-07-12 02:00:06 +0200226extern struct trace_key trace_shallow;
Daniel Barkalow6eb8ae02005-04-18 11:39:48 -0700227
Jake Goulding7fcdb362009-01-26 09:13:24 -0500228int is_descendant_of(struct commit *, struct commit_list *);
Junio C Hamanoa20efee2012-08-27 14:46:01 -0700229int in_merge_bases(struct commit *, struct commit *);
Junio C Hamano4c4b27e2013-03-04 10:16:42 -0800230int in_merge_bases_many(struct commit *, int, struct commit **);
Kristian Høgsberg58680162007-09-17 20:06:44 -0400231
Conrad Irwinb4bd4662011-05-07 10:58:07 -0700232extern int interactive_add(int argc, const char **argv, const char *prefix, int patch);
Thomas Rast46b51392009-08-13 14:29:41 +0200233extern int run_add_interactive(const char *revision, const char *patch_mode,
Nguyễn Thái Ngọc Duy480ca642013-07-14 15:35:50 +0700234 const struct pathspec *pathspec);
Kristian Høgsberg58680162007-09-17 20:06:44 -0400235
Martin Ågren4da72642017-11-07 21:39:45 +0100236/*
237 * Takes a list of commits and returns a new list where those
238 * have been removed that can be reached from other commits in
239 * the list. It is useful for, e.g., reducing the commits
240 * randomly thrown at the git-merge command and removing
241 * redundant commits that the user shouldn't have given to it.
242 *
243 * This function destroys the STALE bit of the commit objects'
244 * flags.
245 */
246extern struct commit_list *reduce_heads(struct commit_list *heads);
247
248/*
249 * Like `reduce_heads()`, except it replaces the list. Use this
250 * instead of `foo = reduce_heads(foo);` to avoid memory leaks.
251 */
252extern void reduce_heads_replace(struct commit_list **heads);
Junio C Hamano98cf9c32008-06-27 18:22:03 +0200253
Junio C Hamano5231c632011-11-07 16:21:32 -0800254struct commit_extra_header {
255 struct commit_extra_header *next;
256 char *key;
257 char *value;
258 size_t len;
259};
260
261extern void append_merge_tag_headers(struct commit_list *parents,
262 struct commit_extra_header ***tail);
263
Jeff King3ffefb52014-06-10 17:36:52 -0400264extern int commit_tree(const char *msg, size_t msg_len,
Patryk Obara5078f342018-01-28 01:13:16 +0100265 const struct object_id *tree,
266 struct commit_list *parents, struct object_id *ret,
Junio C Hamanoba3c69a2011-10-05 17:23:20 -0700267 const char *author, const char *sign_commit);
Junio C Hamano5231c632011-11-07 16:21:32 -0800268
Jeff King3ffefb52014-06-10 17:36:52 -0400269extern int commit_tree_extended(const char *msg, size_t msg_len,
Patryk Obara5078f342018-01-28 01:13:16 +0100270 const struct object_id *tree,
271 struct commit_list *parents,
272 struct object_id *ret, const char *author,
273 const char *sign_commit,
Junio C Hamano5231c632011-11-07 16:21:32 -0800274 struct commit_extra_header *);
275
Junio C Hamanoc871a1d2012-01-05 10:54:14 -0800276extern struct commit_extra_header *read_commit_extra_headers(struct commit *, const char **);
Junio C Hamanoed7a42a2011-11-08 15:38:07 -0800277
Junio C Hamano5231c632011-11-07 16:21:32 -0800278extern void free_commit_extra_headers(struct commit_extra_header *extra);
Jeff King40d52ff2010-04-01 20:05:23 -0400279
Jeff Kingfe6eb7f2014-08-27 03:56:01 -0400280/*
281 * Search the commit object contents given by "msg" for the header "key".
282 * Returns a pointer to the start of the header contents, or NULL. The length
283 * of the header, up to the first newline, is returned via out_len.
284 *
285 * Note that some headers (like mergetag) may be multi-line. It is the caller's
286 * responsibility to parse further in this case!
287 */
288extern const char *find_commit_header(const char *msg, const char *key,
289 size_t *out_len);
290
Christian Couder8c384582014-11-09 10:23:41 +0100291/* Find the end of the log message, the right place for a new trailer. */
Jonathan Tan710714a2016-11-02 10:29:17 -0700292extern int ignore_non_trailer(const char *buf, size_t len);
Christian Couder8c384582014-11-09 10:23:41 +0100293
Christian Couder063da622014-07-07 08:35:37 +0200294typedef void (*each_mergetag_fn)(struct commit *commit, struct commit_extra_header *extra,
295 void *cb_data);
296
297extern void for_each_mergetag(each_mergetag_fn fn, struct commit *commit, void *data);
298
Junio C Hamanoae8e4c92011-11-07 13:26:22 -0800299struct merge_remote_desc {
300 struct object *obj; /* the named object, could be a tag */
René Scharfe5447a762016-08-13 14:21:27 +0200301 char name[FLEX_ARRAY];
Junio C Hamanoae8e4c92011-11-07 13:26:22 -0800302};
303#define merge_remote_util(commit) ((struct merge_remote_desc *)((commit)->util))
René Scharfebeb518c2016-08-13 14:11:27 +0200304extern void set_merge_remote_desc(struct commit *commit,
305 const char *name, struct object *obj);
Junio C Hamanoae8e4c92011-11-07 13:26:22 -0800306
307/*
308 * Given "name" from the command line to merge, find the commit object
309 * and return it, while storing merge_remote_desc in its ->util field,
310 * to allow callers to tell if we are told to merge a tag.
311 */
312struct commit *get_merge_parent(const char *name);
313
Jeff King218aa3a2014-06-13 02:32:11 -0400314extern int parse_signed_commit(const struct commit *commit,
Junio C Hamano0c37f1f2011-10-18 15:53:23 -0700315 struct strbuf *message, struct strbuf *signature);
Christian Couder0b05ab62014-07-19 17:01:12 +0200316extern int remove_signature(struct strbuf *buf);
317
Sebastian Götteffb6d7d2013-03-31 18:00:14 +0200318/*
Sebastian Götteeb307ae2013-03-31 18:02:46 +0200319 * Check the signature of the given commit. The result of the check is stored
320 * in sig->check_result, 'G' for a good signature, 'U' for a good signature
321 * from an untrusted signer, 'B' for a bad signature and 'N' for no signature
322 * at all. This may allocate memory for sig->gpg_output, sig->gpg_status,
323 * sig->signer and sig->key.
Sebastian Götteffb6d7d2013-03-31 18:00:14 +0200324 */
brian m. carlson434060e2015-06-21 23:14:40 +0000325extern int check_commit_signature(const struct commit *commit, struct signature_check *sigc);
Sebastian Götteffb6d7d2013-03-31 18:00:14 +0200326
Jeff King727377f2013-07-02 02:21:48 -0400327int compare_commits_by_commit_date(const void *a_, const void *b_, void *unused);
328
Benoit Pierre15048f82014-03-18 11:00:53 +0100329LAST_ARG_MUST_BE_NULL
330extern int run_commit_hook(int editor_is_used, const char *index_file, const char *name, ...);
331
Daniel Barkalow6eb8ae02005-04-18 11:39:48 -0700332#endif /* COMMIT_H */