Merge branch 'maint'
[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"
6eb8ae00
DB
8
9struct commit_list {
10 struct commit *item;
11 struct commit_list *next;
12};
13
14struct commit {
15 struct object object;
d3ff6f55 16 void *util;
23c17d4a 17 unsigned int indegree;
6eb8ae00
DB
18 unsigned long date;
19 struct commit_list *parents;
20 struct tree *tree;
bd1e17e2 21 char *buffer;
6eb8ae00
DB
22};
23
60ab26de 24extern int save_commit_buffer;
6eb8ae00
DB
25extern const char *commit_type;
26
ca135e7a
LT
27/* While we can decorate any object with a name, it's only used for commits.. */
28extern struct decoration name_decoration;
29struct name_decoration {
30 struct name_decoration *next;
eb3005e2 31 int type;
ca135e7a
LT
32 char name[1];
33};
34
5d6ccf5c
JM
35struct commit *lookup_commit(const unsigned char *sha1);
36struct commit *lookup_commit_reference(const unsigned char *sha1);
f76412ed
JH
37struct commit *lookup_commit_reference_gently(const unsigned char *sha1,
38 int quiet);
a6fa5992 39struct commit *lookup_commit_reference_by_name(const char *name);
6eb8ae00 40
baf18fc2
NTND
41/*
42 * Look up object named by "sha1", dereference tag as necessary,
43 * get a commit and return it. If "sha1" does not dereference to
44 * a commit, use ref_name to report an error and die.
45 */
46struct commit *lookup_commit_or_die(const unsigned char *sha1, const char *ref_name);
47
cf7b1cad 48int parse_commit_buffer(struct commit *item, const void *buffer, unsigned long size);
6eb8ae00
DB
49int parse_commit(struct commit *item);
50
11af2aae
CC
51/* Find beginning and length of commit subject. */
52int find_commit_subject(const char *commit_buffer, const char **subject);
53
47e44ed1
TF
54struct commit_list *commit_list_insert(struct commit *item,
55 struct commit_list **list);
89b5f1d9
RS
56struct commit_list **commit_list_append(struct commit *commit,
57 struct commit_list **next);
65319475 58unsigned commit_list_count(const struct commit_list *l);
47e44ed1
TF
59struct commit_list *commit_list_insert_by_date(struct commit *item,
60 struct commit_list **list);
61void commit_list_sort_by_date(struct commit_list **list);
dd97f850 62
6eb8ae00
DB
63void free_commit_list(struct commit_list *list);
64
000182ea
LT
65/* Commit formats */
66enum cmit_fmt {
67 CMIT_FMT_RAW,
68 CMIT_FMT_MEDIUM,
69 CMIT_FMT_DEFAULT = CMIT_FMT_MEDIUM,
9b66ec04
LT
70 CMIT_FMT_SHORT,
71 CMIT_FMT_FULL,
ff56fe1c 72 CMIT_FMT_FULLER,
d87449c5 73 CMIT_FMT_ONELINE,
3eefc189 74 CMIT_FMT_EMAIL,
e52a5de4 75 CMIT_FMT_USERFORMAT,
6b9c58f4 76
4b05548f 77 CMIT_FMT_UNSPECIFIED
000182ea
LT
78};
79
9cba13ca 80struct pretty_print_context {
6bf13944 81 enum cmit_fmt fmt;
dd2e794a
TR
82 int abbrev;
83 const char *subject;
84 const char *after_subject;
9553d2b2 85 int preserve_subject;
dd2e794a 86 enum date_mode date_mode;
f026c756 87 unsigned date_mode_explicit:1;
dd2e794a 88 int need_8bit_cte;
ddf333f6 89 char *notes_message;
8f8f5476 90 struct reflog_walk_info *reflog_info;
177b29dc 91 const char *output_encoding;
0e2913b0 92 struct string_list *mailmap;
30825178 93 int color;
dd2e794a
TR
94};
95
5b163603
JG
96struct userformat_want {
97 unsigned notes:1;
98};
99
28e9cf65 100extern int has_non_ascii(const char *text);
4da45bef 101struct rev_info; /* in revision.h, it circularly uses enum cmit_fmt */
177b29dc
PN
102extern char *logmsg_reencode(const struct commit *commit,
103 const char *output_encoding);
dd0d388c 104extern void logmsg_free(char *msg, const struct commit *commit);
4da45bef 105extern void get_commit_format(const char *arg, struct rev_info *);
c8f1444d
RJ
106extern const char *format_subject(struct strbuf *sb, const char *msg,
107 const char *line_separator);
5b163603 108extern void userformat_find_requirements(const char *fmt, struct userformat_want *w);
674d1727 109extern void format_commit_message(const struct commit *commit,
7f98ebc8 110 const char *format, struct strbuf *sb,
dd2e794a 111 const struct pretty_print_context *context);
6bf13944
JK
112extern void pretty_print_commit(const struct pretty_print_context *pp,
113 const struct commit *commit,
114 struct strbuf *sb);
8b8a5374
JK
115extern void pp_commit_easy(enum cmit_fmt fmt, const struct commit *commit,
116 struct strbuf *sb);
6bf13944
JK
117void pp_user_info(const struct pretty_print_context *pp,
118 const char *what, struct strbuf *sb,
119 const char *line, const char *encoding);
120void pp_title_line(const struct pretty_print_context *pp,
b02bd65f
DB
121 const char **msg_p,
122 struct strbuf *sb,
b02bd65f 123 const char *encoding,
267123b4 124 int need_8bit_cte);
6bf13944 125void pp_remainder(const struct pretty_print_context *pp,
b02bd65f
DB
126 const char **msg_p,
127 struct strbuf *sb,
128 int indent);
129
e3bc7a3b 130
dd97f850
DB
131/** Removes the first commit from a list sorted by date, and adds all
132 * of its parents.
133 **/
a6080a0a 134struct commit *pop_most_recent_commit(struct commit_list **list,
58e28af6 135 unsigned int mark);
dd97f850 136
a3437b8c
JS
137struct commit *pop_commit(struct commit_list **stack);
138
f8f9c73c 139void clear_commit_marks(struct commit *commit, unsigned int mark);
e895cb51 140void clear_commit_marks_many(int nr, struct commit **commit, unsigned int mark);
86a0a408 141void clear_commit_marks_for_object_array(struct object_array *a, unsigned mark);
f8f9c73c 142
ab580ace
JS
143/*
144 * Performs an in-place topological sort of list supplied.
145 *
ab580ace
JS
146 * invariant of resulting list is:
147 * a reachable from b => ord(b) < ord(a)
4c8725f1
JH
148 * in addition, when lifo == 0, commits on parallel tracks are
149 * sorted in the dates order.
ab580ace 150 */
4c8725f1 151void sort_in_topological_order(struct commit_list ** list, int lifo);
5040f17e
JH
152
153struct commit_graft {
154 unsigned char sha1[20];
ed09aef0 155 int nr_parent; /* < 0 if shallow commit */
5040f17e
JH
156 unsigned char parent[FLEX_ARRAY][20]; /* more */
157};
09d46644 158typedef int (*each_commit_graft_fn)(const struct commit_graft *, void *);
5040f17e
JH
159
160struct commit_graft *read_graft_line(char *buf, int len);
161int register_commit_graft(struct commit_graft *, int);
45163382 162struct commit_graft *lookup_commit_graft(const unsigned char *sha1);
5040f17e 163
c0fa8255 164extern struct commit_list *get_merge_bases(struct commit *rev1, struct commit *rev2, int cleanup);
53eda89b 165extern struct commit_list *get_merge_bases_many(struct commit *one, int n, struct commit **twos, int cleanup);
5240c9d7 166extern struct commit_list *get_octopus_merge_bases(struct commit_list *in);
7c6f8aaf 167
4dcb167f
NTND
168/* largest postive number a signed 32-bit integer can contain */
169#define INFINITE_DEPTH 0x7fffffff
170
ed09aef0 171extern int register_shallow(const unsigned char *sha1);
f53514bc 172extern int unregister_shallow(const unsigned char *sha1);
09d46644 173extern int for_each_commit_graft(each_commit_graft_fn, void *);
f43117a6 174extern int is_repository_shallow(void);
ed09aef0 175extern struct commit_list *get_shallow_commits(struct object_array *heads,
f53514bc 176 int depth, int shallow_flag, int not_shallow_flag);
ed09aef0 177
7fcdb36e 178int is_descendant_of(struct commit *, struct commit_list *);
a20efee9 179int in_merge_bases(struct commit *, struct commit *);
4c4b27e8 180int in_merge_bases_many(struct commit *, int, struct commit **);
58680165 181
b4bd4668 182extern int interactive_add(int argc, const char **argv, const char *prefix, int patch);
46b5139c
TR
183extern int run_add_interactive(const char *revision, const char *patch_mode,
184 const char **pathspec);
58680165 185
53b2c823
LT
186static inline int single_parent(struct commit *commit)
187{
188 return commit->parents && !commit->parents->next;
189}
190
98cf9c3b
JH
191struct commit_list *reduce_heads(struct commit_list *heads);
192
5231c633
JH
193struct commit_extra_header {
194 struct commit_extra_header *next;
195 char *key;
196 char *value;
197 size_t len;
198};
199
200extern void append_merge_tag_headers(struct commit_list *parents,
201 struct commit_extra_header ***tail);
202
13f8b72d 203extern int commit_tree(const struct strbuf *msg, unsigned char *tree,
5231c633 204 struct commit_list *parents, unsigned char *ret,
ba3c69a9 205 const char *author, const char *sign_commit);
5231c633 206
f35ccd9b 207extern int commit_tree_extended(const struct strbuf *msg, unsigned char *tree,
5231c633 208 struct commit_list *parents, unsigned char *ret,
ba3c69a9 209 const char *author, const char *sign_commit,
5231c633
JH
210 struct commit_extra_header *);
211
c871a1d1 212extern struct commit_extra_header *read_commit_extra_headers(struct commit *, const char **);
ed7a42a0 213
5231c633 214extern void free_commit_extra_headers(struct commit_extra_header *extra);
40d52ff7 215
ae8e4c9c
JH
216struct merge_remote_desc {
217 struct object *obj; /* the named object, could be a tag */
218 const char *name;
219};
220#define merge_remote_util(commit) ((struct merge_remote_desc *)((commit)->util))
221
222/*
223 * Given "name" from the command line to merge, find the commit object
224 * and return it, while storing merge_remote_desc in its ->util field,
225 * to allow callers to tell if we are told to merge a tag.
226 */
227struct commit *get_merge_parent(const char *name);
228
0c37f1fc
JH
229extern int parse_signed_commit(const unsigned char *sha1,
230 struct strbuf *message, struct strbuf *signature);
efc7df45
NTND
231extern void print_commit_list(struct commit_list *list,
232 const char *format_cur,
233 const char *format_last);
234
6eb8ae00 235#endif /* COMMIT_H */