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