]> git.ipfire.org Git - thirdparty/git.git/blame - commit.h
Merge branch 'jc/log-quiet-fix'
[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"
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
cf7b1cad 41int parse_commit_buffer(struct commit *item, const void *buffer, unsigned long size);
6eb8ae00
DB
42int parse_commit(struct commit *item);
43
11af2aae
CC
44/* Find beginning and length of commit subject. */
45int find_commit_subject(const char *commit_buffer, const char **subject);
46
47e44ed1
TF
47struct commit_list *commit_list_insert(struct commit *item,
48 struct commit_list **list);
65319475 49unsigned commit_list_count(const struct commit_list *l);
47e44ed1
TF
50struct commit_list *commit_list_insert_by_date(struct commit *item,
51 struct commit_list **list);
52void commit_list_sort_by_date(struct commit_list **list);
dd97f850 53
6eb8ae00
DB
54void free_commit_list(struct commit_list *list);
55
000182ea
LT
56/* Commit formats */
57enum cmit_fmt {
58 CMIT_FMT_RAW,
59 CMIT_FMT_MEDIUM,
60 CMIT_FMT_DEFAULT = CMIT_FMT_MEDIUM,
9b66ec04
LT
61 CMIT_FMT_SHORT,
62 CMIT_FMT_FULL,
ff56fe1c 63 CMIT_FMT_FULLER,
d87449c5 64 CMIT_FMT_ONELINE,
3eefc189 65 CMIT_FMT_EMAIL,
e52a5de4 66 CMIT_FMT_USERFORMAT,
6b9c58f4 67
4b05548f 68 CMIT_FMT_UNSPECIFIED
000182ea
LT
69};
70
9cba13ca 71struct pretty_print_context {
dd2e794a
TR
72 int abbrev;
73 const char *subject;
74 const char *after_subject;
75 enum date_mode date_mode;
76 int need_8bit_cte;
66b2ed09 77 int show_notes;
8f8f5476 78 struct reflog_walk_info *reflog_info;
177b29dc 79 const char *output_encoding;
dd2e794a
TR
80};
81
5b163603
JG
82struct userformat_want {
83 unsigned notes:1;
84};
85
28e9cf65 86extern int has_non_ascii(const char *text);
4da45bef 87struct rev_info; /* in revision.h, it circularly uses enum cmit_fmt */
177b29dc
PN
88extern char *logmsg_reencode(const struct commit *commit,
89 const char *output_encoding);
69cd8f63
AG
90extern char *reencode_commit_message(const struct commit *commit,
91 const char **encoding_p);
4da45bef 92extern void get_commit_format(const char *arg, struct rev_info *);
c8f1444d
RJ
93extern const char *format_subject(struct strbuf *sb, const char *msg,
94 const char *line_separator);
5b163603 95extern void userformat_find_requirements(const char *fmt, struct userformat_want *w);
674d1727 96extern void format_commit_message(const struct commit *commit,
7f98ebc8 97 const char *format, struct strbuf *sb,
dd2e794a
TR
98 const struct pretty_print_context *context);
99extern void pretty_print_commit(enum cmit_fmt fmt, const struct commit *commit,
100 struct strbuf *sb,
101 const struct pretty_print_context *context);
b02bd65f
DB
102void pp_user_info(const char *what, enum cmit_fmt fmt, struct strbuf *sb,
103 const char *line, enum date_mode dmode,
104 const char *encoding);
105void pp_title_line(enum cmit_fmt fmt,
106 const char **msg_p,
107 struct strbuf *sb,
108 const char *subject,
109 const char *after_subject,
110 const char *encoding,
267123b4 111 int need_8bit_cte);
b02bd65f
DB
112void pp_remainder(enum cmit_fmt fmt,
113 const char **msg_p,
114 struct strbuf *sb,
115 int indent);
116
e3bc7a3b 117
dd97f850
DB
118/** Removes the first commit from a list sorted by date, and adds all
119 * of its parents.
120 **/
a6080a0a 121struct commit *pop_most_recent_commit(struct commit_list **list,
58e28af6 122 unsigned int mark);
dd97f850 123
a3437b8c
JS
124struct commit *pop_commit(struct commit_list **stack);
125
f8f9c73c
JH
126void clear_commit_marks(struct commit *commit, unsigned int mark);
127
ab580ace
JS
128/*
129 * Performs an in-place topological sort of list supplied.
130 *
ab580ace
JS
131 * invariant of resulting list is:
132 * a reachable from b => ord(b) < ord(a)
4c8725f1
JH
133 * in addition, when lifo == 0, commits on parallel tracks are
134 * sorted in the dates order.
ab580ace 135 */
4c8725f1 136void sort_in_topological_order(struct commit_list ** list, int lifo);
5040f17e
JH
137
138struct commit_graft {
139 unsigned char sha1[20];
ed09aef0 140 int nr_parent; /* < 0 if shallow commit */
5040f17e
JH
141 unsigned char parent[FLEX_ARRAY][20]; /* more */
142};
143
144struct commit_graft *read_graft_line(char *buf, int len);
145int register_commit_graft(struct commit_graft *, int);
45163382 146struct commit_graft *lookup_commit_graft(const unsigned char *sha1);
5040f17e 147
c0fa8255 148extern struct commit_list *get_merge_bases(struct commit *rev1, struct commit *rev2, int cleanup);
53eda89b 149extern struct commit_list *get_merge_bases_many(struct commit *one, int n, struct commit **twos, int cleanup);
5240c9d7 150extern struct commit_list *get_octopus_merge_bases(struct commit_list *in);
7c6f8aaf 151
ed09aef0 152extern int register_shallow(const unsigned char *sha1);
f53514bc 153extern int unregister_shallow(const unsigned char *sha1);
edace6f0 154extern int write_shallow_commits(struct strbuf *out, int use_pack_protocol);
f43117a6 155extern int is_repository_shallow(void);
ed09aef0 156extern struct commit_list *get_shallow_commits(struct object_array *heads,
f53514bc 157 int depth, int shallow_flag, int not_shallow_flag);
ed09aef0 158
7fcdb36e 159int is_descendant_of(struct commit *, struct commit_list *);
03840fc3 160int in_merge_bases(struct commit *, struct commit **, int);
58680165 161
b4bd4668 162extern int interactive_add(int argc, const char **argv, const char *prefix, int patch);
46b5139c
TR
163extern int run_add_interactive(const char *revision, const char *patch_mode,
164 const char **pathspec);
58680165 165
53b2c823
LT
166static inline int single_parent(struct commit *commit)
167{
168 return commit->parents && !commit->parents->next;
169}
170
98cf9c3b
JH
171struct commit_list *reduce_heads(struct commit_list *heads);
172
40d52ff7
JK
173extern int commit_tree(const char *msg, unsigned char *tree,
174 struct commit_list *parents, unsigned char *ret,
175 const char *author);
176
6eb8ae00 177#endif /* COMMIT_H */