log: use true parents for diff even when rewriting
[git/mingw.git] / commit.h
blobca766d2f4aa0df98d958e19449ab24d417c5539b
1 #ifndef COMMIT_H
2 #define COMMIT_H
4 #include "object.h"
5 #include "tree.h"
6 #include "strbuf.h"
7 #include "decorate.h"
8 #include "gpg-interface.h"
9 #include "string-list.h"
11 struct commit_list {
12 struct commit *item;
13 struct commit_list *next;
16 struct commit {
17 struct object object;
18 void *util;
19 unsigned int index;
20 unsigned long date;
21 struct commit_list *parents;
22 struct tree *tree;
23 char *buffer;
26 extern int save_commit_buffer;
27 extern const char *commit_type;
29 /* While we can decorate any object with a name, it's only used for commits.. */
30 extern struct decoration name_decoration;
31 struct name_decoration {
32 struct name_decoration *next;
33 int type;
34 char name[1];
37 struct commit *lookup_commit(const unsigned char *sha1);
38 struct commit *lookup_commit_reference(const unsigned char *sha1);
39 struct commit *lookup_commit_reference_gently(const unsigned char *sha1,
40 int quiet);
41 struct commit *lookup_commit_reference_by_name(const char *name);
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.
48 struct commit *lookup_commit_or_die(const unsigned char *sha1, const char *ref_name);
50 int parse_commit_buffer(struct commit *item, const void *buffer, unsigned long size);
51 int parse_commit(struct commit *item);
53 /* Find beginning and length of commit subject. */
54 int find_commit_subject(const char *commit_buffer, const char **subject);
56 struct commit_list *commit_list_insert(struct commit *item,
57 struct commit_list **list);
58 struct commit_list **commit_list_append(struct commit *commit,
59 struct commit_list **next);
60 unsigned commit_list_count(const struct commit_list *l);
61 struct commit_list *commit_list_insert_by_date(struct commit *item,
62 struct commit_list **list);
63 void commit_list_sort_by_date(struct commit_list **list);
65 /* Shallow copy of the input list */
66 struct commit_list *copy_commit_list(struct commit_list *list);
68 void free_commit_list(struct commit_list *list);
70 /* Commit formats */
71 enum cmit_fmt {
72 CMIT_FMT_RAW,
73 CMIT_FMT_MEDIUM,
74 CMIT_FMT_DEFAULT = CMIT_FMT_MEDIUM,
75 CMIT_FMT_SHORT,
76 CMIT_FMT_FULL,
77 CMIT_FMT_FULLER,
78 CMIT_FMT_ONELINE,
79 CMIT_FMT_EMAIL,
80 CMIT_FMT_USERFORMAT,
82 CMIT_FMT_UNSPECIFIED
85 struct pretty_print_context {
87 * Callers should tweak these to change the behavior of pp_* functions.
89 enum cmit_fmt fmt;
90 int abbrev;
91 const char *subject;
92 const char *after_subject;
93 int preserve_subject;
94 enum date_mode date_mode;
95 unsigned date_mode_explicit:1;
96 int need_8bit_cte;
97 char *notes_message;
98 struct reflog_walk_info *reflog_info;
99 const char *output_encoding;
100 struct string_list *mailmap;
101 int color;
102 struct ident_split *from_ident;
105 * Fields below here are manipulated internally by pp_* functions and
106 * should not be counted on by callers.
109 /* Manipulated by the pp_* functions internally. */
110 struct string_list in_body_headers;
113 struct userformat_want {
114 unsigned notes:1;
117 extern int has_non_ascii(const char *text);
118 struct rev_info; /* in revision.h, it circularly uses enum cmit_fmt */
119 extern char *logmsg_reencode(const struct commit *commit,
120 char **commit_encoding,
121 const char *output_encoding);
122 extern void logmsg_free(char *msg, const struct commit *commit);
123 extern void get_commit_format(const char *arg, struct rev_info *);
124 extern const char *format_subject(struct strbuf *sb, const char *msg,
125 const char *line_separator);
126 extern void userformat_find_requirements(const char *fmt, struct userformat_want *w);
127 extern void format_commit_message(const struct commit *commit,
128 const char *format, struct strbuf *sb,
129 const struct pretty_print_context *context);
130 extern void pretty_print_commit(struct pretty_print_context *pp,
131 const struct commit *commit,
132 struct strbuf *sb);
133 extern void pp_commit_easy(enum cmit_fmt fmt, const struct commit *commit,
134 struct strbuf *sb);
135 void pp_user_info(struct pretty_print_context *pp,
136 const char *what, struct strbuf *sb,
137 const char *line, const char *encoding);
138 void pp_title_line(struct pretty_print_context *pp,
139 const char **msg_p,
140 struct strbuf *sb,
141 const char *encoding,
142 int need_8bit_cte);
143 void pp_remainder(struct pretty_print_context *pp,
144 const char **msg_p,
145 struct strbuf *sb,
146 int indent);
149 /** Removes the first commit from a list sorted by date, and adds all
150 * of its parents.
152 struct commit *pop_most_recent_commit(struct commit_list **list,
153 unsigned int mark);
155 struct commit *pop_commit(struct commit_list **stack);
157 void clear_commit_marks(struct commit *commit, unsigned int mark);
158 void clear_commit_marks_many(int nr, struct commit **commit, unsigned int mark);
159 void clear_commit_marks_for_object_array(struct object_array *a, unsigned mark);
162 enum rev_sort_order {
163 REV_SORT_IN_GRAPH_ORDER = 0,
164 REV_SORT_BY_COMMIT_DATE,
165 REV_SORT_BY_AUTHOR_DATE
169 * Performs an in-place topological sort of list supplied.
171 * invariant of resulting list is:
172 * a reachable from b => ord(b) < ord(a)
173 * sort_order further specifies:
174 * REV_SORT_IN_GRAPH_ORDER: try to show a commit on a single-parent
175 * chain together.
176 * REV_SORT_BY_COMMIT_DATE: show eligible commits in committer-date order.
178 void sort_in_topological_order(struct commit_list **, enum rev_sort_order);
180 struct commit_graft {
181 unsigned char sha1[20];
182 int nr_parent; /* < 0 if shallow commit */
183 unsigned char parent[FLEX_ARRAY][20]; /* more */
185 typedef int (*each_commit_graft_fn)(const struct commit_graft *, void *);
187 struct commit_graft *read_graft_line(char *buf, int len);
188 int register_commit_graft(struct commit_graft *, int);
189 struct commit_graft *lookup_commit_graft(const unsigned char *sha1);
191 extern struct commit_list *get_merge_bases(struct commit *rev1, struct commit *rev2, int cleanup);
192 extern struct commit_list *get_merge_bases_many(struct commit *one, int n, struct commit **twos, int cleanup);
193 extern struct commit_list *get_octopus_merge_bases(struct commit_list *in);
195 /* largest positive number a signed 32-bit integer can contain */
196 #define INFINITE_DEPTH 0x7fffffff
198 extern int register_shallow(const unsigned char *sha1);
199 extern int unregister_shallow(const unsigned char *sha1);
200 extern int for_each_commit_graft(each_commit_graft_fn, void *);
201 extern int is_repository_shallow(void);
202 extern struct commit_list *get_shallow_commits(struct object_array *heads,
203 int depth, int shallow_flag, int not_shallow_flag);
204 extern void check_shallow_file_for_update(void);
205 extern void set_alternate_shallow_file(const char *path);
207 int is_descendant_of(struct commit *, struct commit_list *);
208 int in_merge_bases(struct commit *, struct commit *);
209 int in_merge_bases_many(struct commit *, int, struct commit **);
211 extern int interactive_add(int argc, const char **argv, const char *prefix, int patch);
212 extern int run_add_interactive(const char *revision, const char *patch_mode,
213 const char **pathspec);
215 static inline int single_parent(struct commit *commit)
217 return commit->parents && !commit->parents->next;
220 struct commit_list *reduce_heads(struct commit_list *heads);
222 struct commit_extra_header {
223 struct commit_extra_header *next;
224 char *key;
225 char *value;
226 size_t len;
229 extern void append_merge_tag_headers(struct commit_list *parents,
230 struct commit_extra_header ***tail);
232 extern int commit_tree(const struct strbuf *msg, unsigned char *tree,
233 struct commit_list *parents, unsigned char *ret,
234 const char *author, const char *sign_commit);
236 extern int commit_tree_extended(const struct strbuf *msg, unsigned char *tree,
237 struct commit_list *parents, unsigned char *ret,
238 const char *author, const char *sign_commit,
239 struct commit_extra_header *);
241 extern struct commit_extra_header *read_commit_extra_headers(struct commit *, const char **);
243 extern void free_commit_extra_headers(struct commit_extra_header *extra);
245 struct merge_remote_desc {
246 struct object *obj; /* the named object, could be a tag */
247 const char *name;
249 #define merge_remote_util(commit) ((struct merge_remote_desc *)((commit)->util))
252 * Given "name" from the command line to merge, find the commit object
253 * and return it, while storing merge_remote_desc in its ->util field,
254 * to allow callers to tell if we are told to merge a tag.
256 struct commit *get_merge_parent(const char *name);
258 extern int parse_signed_commit(const unsigned char *sha1,
259 struct strbuf *message, struct strbuf *signature);
260 extern void print_commit_list(struct commit_list *list,
261 const char *format_cur,
262 const char *format_last);
265 * Check the signature of the given commit. The result of the check is stored
266 * in sig->check_result, 'G' for a good signature, 'U' for a good signature
267 * from an untrusted signer, 'B' for a bad signature and 'N' for no signature
268 * at all. This may allocate memory for sig->gpg_output, sig->gpg_status,
269 * sig->signer and sig->key.
271 extern void check_commit_signature(const struct commit* commit, struct signature_check *sigc);
273 int compare_commits_by_commit_date(const void *a_, const void *b_, void *unused);
275 #endif /* COMMIT_H */