Update draft release notes to 1.7.12
[git/jnareb-git.git] / commit.h
blobd617fa3f28d9fecf0bbf8e87c373f8701c286227
1 #ifndef COMMIT_H
2 #define COMMIT_H
4 #include "object.h"
5 #include "tree.h"
6 #include "strbuf.h"
7 #include "decorate.h"
9 struct commit_list {
10 struct commit *item;
11 struct commit_list *next;
14 struct commit {
15 struct object object;
16 void *util;
17 unsigned int indegree;
18 unsigned long date;
19 struct commit_list *parents;
20 struct tree *tree;
21 char *buffer;
24 extern int save_commit_buffer;
25 extern const char *commit_type;
27 /* While we can decorate any object with a name, it's only used for commits.. */
28 extern struct decoration name_decoration;
29 struct name_decoration {
30 struct name_decoration *next;
31 int type;
32 char name[1];
35 struct commit *lookup_commit(const unsigned char *sha1);
36 struct commit *lookup_commit_reference(const unsigned char *sha1);
37 struct commit *lookup_commit_reference_gently(const unsigned char *sha1,
38 int quiet);
39 struct commit *lookup_commit_reference_by_name(const char *name);
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.
46 struct commit *lookup_commit_or_die(const unsigned char *sha1, const char *ref_name);
48 int parse_commit_buffer(struct commit *item, const void *buffer, unsigned long size);
49 int parse_commit(struct commit *item);
51 /* Find beginning and length of commit subject. */
52 int find_commit_subject(const char *commit_buffer, const char **subject);
54 struct commit_list *commit_list_insert(struct commit *item,
55 struct commit_list **list);
56 struct commit_list **commit_list_append(struct commit *commit,
57 struct commit_list **next);
58 unsigned commit_list_count(const struct commit_list *l);
59 struct commit_list *commit_list_insert_by_date(struct commit *item,
60 struct commit_list **list);
61 void commit_list_sort_by_date(struct commit_list **list);
63 void free_commit_list(struct commit_list *list);
65 /* Commit formats */
66 enum cmit_fmt {
67 CMIT_FMT_RAW,
68 CMIT_FMT_MEDIUM,
69 CMIT_FMT_DEFAULT = CMIT_FMT_MEDIUM,
70 CMIT_FMT_SHORT,
71 CMIT_FMT_FULL,
72 CMIT_FMT_FULLER,
73 CMIT_FMT_ONELINE,
74 CMIT_FMT_EMAIL,
75 CMIT_FMT_USERFORMAT,
77 CMIT_FMT_UNSPECIFIED
80 struct pretty_print_context {
81 enum cmit_fmt fmt;
82 int abbrev;
83 const char *subject;
84 const char *after_subject;
85 int preserve_subject;
86 enum date_mode date_mode;
87 unsigned date_mode_explicit:1;
88 int need_8bit_cte;
89 int show_notes;
90 struct reflog_walk_info *reflog_info;
91 const char *output_encoding;
94 struct userformat_want {
95 unsigned notes:1;
98 extern int has_non_ascii(const char *text);
99 struct rev_info; /* in revision.h, it circularly uses enum cmit_fmt */
100 extern char *logmsg_reencode(const struct commit *commit,
101 const char *output_encoding);
102 extern char *reencode_commit_message(const struct commit *commit,
103 const char **encoding_p);
104 extern void get_commit_format(const char *arg, struct rev_info *);
105 extern const char *format_subject(struct strbuf *sb, const char *msg,
106 const char *line_separator);
107 extern void userformat_find_requirements(const char *fmt, struct userformat_want *w);
108 extern void format_commit_message(const struct commit *commit,
109 const char *format, struct strbuf *sb,
110 const struct pretty_print_context *context);
111 extern void pretty_print_commit(const struct pretty_print_context *pp,
112 const struct commit *commit,
113 struct strbuf *sb);
114 extern void pp_commit_easy(enum cmit_fmt fmt, const struct commit *commit,
115 struct strbuf *sb);
116 void pp_user_info(const struct pretty_print_context *pp,
117 const char *what, struct strbuf *sb,
118 const char *line, const char *encoding);
119 void pp_title_line(const struct pretty_print_context *pp,
120 const char **msg_p,
121 struct strbuf *sb,
122 const char *encoding,
123 int need_8bit_cte);
124 void pp_remainder(const struct pretty_print_context *pp,
125 const char **msg_p,
126 struct strbuf *sb,
127 int indent);
130 /** Removes the first commit from a list sorted by date, and adds all
131 * of its parents.
133 struct commit *pop_most_recent_commit(struct commit_list **list,
134 unsigned int mark);
136 struct commit *pop_commit(struct commit_list **stack);
138 void clear_commit_marks(struct commit *commit, unsigned int mark);
139 void clear_commit_marks_for_object_array(struct object_array *a, unsigned mark);
142 * Performs an in-place topological sort of list supplied.
144 * invariant of resulting list is:
145 * a reachable from b => ord(b) < ord(a)
146 * in addition, when lifo == 0, commits on parallel tracks are
147 * sorted in the dates order.
149 void sort_in_topological_order(struct commit_list ** list, int lifo);
151 struct commit_graft {
152 unsigned char sha1[20];
153 int nr_parent; /* < 0 if shallow commit */
154 unsigned char parent[FLEX_ARRAY][20]; /* more */
156 typedef int (*each_commit_graft_fn)(const struct commit_graft *, void *);
158 struct commit_graft *read_graft_line(char *buf, int len);
159 int register_commit_graft(struct commit_graft *, int);
160 struct commit_graft *lookup_commit_graft(const unsigned char *sha1);
162 extern struct commit_list *get_merge_bases(struct commit *rev1, struct commit *rev2, int cleanup);
163 extern struct commit_list *get_merge_bases_many(struct commit *one, int n, struct commit **twos, int cleanup);
164 extern struct commit_list *get_octopus_merge_bases(struct commit_list *in);
166 extern int register_shallow(const unsigned char *sha1);
167 extern int unregister_shallow(const unsigned char *sha1);
168 extern int for_each_commit_graft(each_commit_graft_fn, void *);
169 extern int is_repository_shallow(void);
170 extern struct commit_list *get_shallow_commits(struct object_array *heads,
171 int depth, int shallow_flag, int not_shallow_flag);
173 int is_descendant_of(struct commit *, struct commit_list *);
174 int in_merge_bases(struct commit *, struct commit **, int);
176 extern int interactive_add(int argc, const char **argv, const char *prefix, int patch);
177 extern int run_add_interactive(const char *revision, const char *patch_mode,
178 const char **pathspec);
180 static inline int single_parent(struct commit *commit)
182 return commit->parents && !commit->parents->next;
185 struct commit_list *reduce_heads(struct commit_list *heads);
187 struct commit_extra_header {
188 struct commit_extra_header *next;
189 char *key;
190 char *value;
191 size_t len;
194 extern void append_merge_tag_headers(struct commit_list *parents,
195 struct commit_extra_header ***tail);
197 extern int commit_tree(const struct strbuf *msg, unsigned char *tree,
198 struct commit_list *parents, unsigned char *ret,
199 const char *author, const char *sign_commit);
201 extern int commit_tree_extended(const struct strbuf *msg, unsigned char *tree,
202 struct commit_list *parents, unsigned char *ret,
203 const char *author, const char *sign_commit,
204 struct commit_extra_header *);
206 extern struct commit_extra_header *read_commit_extra_headers(struct commit *, const char **);
207 extern struct commit_extra_header *read_commit_extra_header_lines(const char *buf, size_t len, const char **);
209 extern void free_commit_extra_headers(struct commit_extra_header *extra);
211 struct merge_remote_desc {
212 struct object *obj; /* the named object, could be a tag */
213 const char *name;
215 #define merge_remote_util(commit) ((struct merge_remote_desc *)((commit)->util))
218 * Given "name" from the command line to merge, find the commit object
219 * and return it, while storing merge_remote_desc in its ->util field,
220 * to allow callers to tell if we are told to merge a tag.
222 struct commit *get_merge_parent(const char *name);
224 extern int parse_signed_commit(const unsigned char *sha1,
225 struct strbuf *message, struct strbuf *signature);
226 #endif /* COMMIT_H */