Introduce get_merge_bases_many()
[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;
31 char name[1];
32};
33
5d6ccf5c
JM
34struct commit *lookup_commit(const unsigned char *sha1);
35struct commit *lookup_commit_reference(const unsigned char *sha1);
f76412ed
JH
36struct commit *lookup_commit_reference_gently(const unsigned char *sha1,
37 int quiet);
6eb8ae00 38
bd2c39f5
NP
39int parse_commit_buffer(struct commit *item, void *buffer, unsigned long size);
40
6eb8ae00
DB
41int parse_commit(struct commit *item);
42
ac5155ef 43struct commit_list * commit_list_insert(struct commit *item, struct commit_list **list_p);
65319475 44unsigned commit_list_count(const struct commit_list *l);
f755494c 45struct commit_list * insert_by_date(struct commit *item, struct commit_list **list);
dd97f850 46
6eb8ae00
DB
47void free_commit_list(struct commit_list *list);
48
dd97f850
DB
49void sort_by_date(struct commit_list **list);
50
000182ea
LT
51/* Commit formats */
52enum cmit_fmt {
53 CMIT_FMT_RAW,
54 CMIT_FMT_MEDIUM,
55 CMIT_FMT_DEFAULT = CMIT_FMT_MEDIUM,
9b66ec04
LT
56 CMIT_FMT_SHORT,
57 CMIT_FMT_FULL,
ff56fe1c 58 CMIT_FMT_FULLER,
d87449c5 59 CMIT_FMT_ONELINE,
3eefc189 60 CMIT_FMT_EMAIL,
e52a5de4 61 CMIT_FMT_USERFORMAT,
6b9c58f4
JH
62
63 CMIT_FMT_UNSPECIFIED,
000182ea
LT
64};
65
4593fb84 66extern int non_ascii(int);
4da45bef
JH
67struct rev_info; /* in revision.h, it circularly uses enum cmit_fmt */
68extern void get_commit_format(const char *arg, struct rev_info *);
674d1727
PH
69extern void format_commit_message(const struct commit *commit,
70 const void *format, struct strbuf *sb);
71extern void pretty_print_commit(enum cmit_fmt fmt, const struct commit*,
72 struct strbuf *,
73 int abbrev, const char *subject,
4593fb84 74 const char *after_subject, enum date_mode,
6bf4f1b4 75 int need_8bit_cte);
b02bd65f
DB
76void pp_user_info(const char *what, enum cmit_fmt fmt, struct strbuf *sb,
77 const char *line, enum date_mode dmode,
78 const char *encoding);
79void pp_title_line(enum cmit_fmt fmt,
80 const char **msg_p,
81 struct strbuf *sb,
82 const char *subject,
83 const char *after_subject,
84 const char *encoding,
267123b4 85 int need_8bit_cte);
b02bd65f
DB
86void pp_remainder(enum cmit_fmt fmt,
87 const char **msg_p,
88 struct strbuf *sb,
89 int indent);
90
e3bc7a3b 91
dd97f850
DB
92/** Removes the first commit from a list sorted by date, and adds all
93 * of its parents.
94 **/
a6080a0a 95struct commit *pop_most_recent_commit(struct commit_list **list,
58e28af6 96 unsigned int mark);
dd97f850 97
a3437b8c
JS
98struct commit *pop_commit(struct commit_list **stack);
99
f8f9c73c
JH
100void clear_commit_marks(struct commit *commit, unsigned int mark);
101
ab580ace
JS
102/*
103 * Performs an in-place topological sort of list supplied.
104 *
ab580ace
JS
105 * invariant of resulting list is:
106 * a reachable from b => ord(b) < ord(a)
4c8725f1
JH
107 * in addition, when lifo == 0, commits on parallel tracks are
108 * sorted in the dates order.
ab580ace 109 */
4c8725f1 110void sort_in_topological_order(struct commit_list ** list, int lifo);
5040f17e
JH
111
112struct commit_graft {
113 unsigned char sha1[20];
ed09aef0 114 int nr_parent; /* < 0 if shallow commit */
5040f17e
JH
115 unsigned char parent[FLEX_ARRAY][20]; /* more */
116};
117
118struct commit_graft *read_graft_line(char *buf, int len);
119int register_commit_graft(struct commit_graft *, int);
120int read_graft_file(const char *graft_file);
45163382 121struct commit_graft *lookup_commit_graft(const unsigned char *sha1);
5040f17e 122
c0fa8255 123extern struct commit_list *get_merge_bases(struct commit *rev1, struct commit *rev2, int cleanup);
5240c9d7 124extern struct commit_list *get_octopus_merge_bases(struct commit_list *in);
7c6f8aaf 125
ed09aef0 126extern int register_shallow(const unsigned char *sha1);
f53514bc 127extern int unregister_shallow(const unsigned char *sha1);
ed09aef0 128extern int write_shallow_commits(int fd, int use_pack_protocol);
f43117a6 129extern int is_repository_shallow(void);
ed09aef0 130extern struct commit_list *get_shallow_commits(struct object_array *heads,
f53514bc 131 int depth, int shallow_flag, int not_shallow_flag);
ed09aef0 132
03840fc3 133int in_merge_bases(struct commit *, struct commit **, int);
58680165 134
3f061887 135extern int interactive_add(int argc, const char **argv, const char *prefix);
d8b7db0a 136extern int rerere(void);
58680165 137
53b2c823
LT
138static inline int single_parent(struct commit *commit)
139{
140 return commit->parents && !commit->parents->next;
141}
142
6eb8ae00 143#endif /* COMMIT_H */