Merge branch 'en/d-f-conflict-fix'
[git/git.git] / commit.h
1 #ifndef COMMIT_H
2 #define COMMIT_H
3
4 #include "object.h"
5 #include "tree.h"
6 #include "strbuf.h"
7 #include "decorate.h"
8
9 struct commit_list {
10 struct commit *item;
11 struct commit_list *next;
12 };
13
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;
22 };
23
24 extern int save_commit_buffer;
25 extern const char *commit_type;
26
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];
33 };
34
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
40 int parse_commit_buffer(struct commit *item, void *buffer, unsigned long size);
41
42 int parse_commit(struct commit *item);
43
44 /* Find beginning and length of commit subject. */
45 int find_commit_subject(const char *commit_buffer, const char **subject);
46
47 struct commit_list * commit_list_insert(struct commit *item, struct commit_list **list_p);
48 unsigned commit_list_count(const struct commit_list *l);
49 struct commit_list * insert_by_date(struct commit *item, struct commit_list **list);
50
51 void free_commit_list(struct commit_list *list);
52
53 void sort_by_date(struct commit_list **list);
54
55 /* Commit formats */
56 enum cmit_fmt {
57 CMIT_FMT_RAW,
58 CMIT_FMT_MEDIUM,
59 CMIT_FMT_DEFAULT = CMIT_FMT_MEDIUM,
60 CMIT_FMT_SHORT,
61 CMIT_FMT_FULL,
62 CMIT_FMT_FULLER,
63 CMIT_FMT_ONELINE,
64 CMIT_FMT_EMAIL,
65 CMIT_FMT_USERFORMAT,
66
67 CMIT_FMT_UNSPECIFIED
68 };
69
70 struct pretty_print_context
71 {
72 int abbrev;
73 const char *subject;
74 const char *after_subject;
75 enum date_mode date_mode;
76 int need_8bit_cte;
77 int show_notes;
78 struct reflog_walk_info *reflog_info;
79 };
80
81 struct userformat_want {
82 unsigned notes:1;
83 };
84
85 extern int has_non_ascii(const char *text);
86 struct rev_info; /* in revision.h, it circularly uses enum cmit_fmt */
87 extern char *reencode_commit_message(const struct commit *commit,
88 const char **encoding_p);
89 extern void get_commit_format(const char *arg, struct rev_info *);
90 extern void userformat_find_requirements(const char *fmt, struct userformat_want *w);
91 extern void format_commit_message(const struct commit *commit,
92 const char *format, struct strbuf *sb,
93 const struct pretty_print_context *context);
94 extern void pretty_print_commit(enum cmit_fmt fmt, const struct commit *commit,
95 struct strbuf *sb,
96 const struct pretty_print_context *context);
97 void pp_user_info(const char *what, enum cmit_fmt fmt, struct strbuf *sb,
98 const char *line, enum date_mode dmode,
99 const char *encoding);
100 void pp_title_line(enum cmit_fmt fmt,
101 const char **msg_p,
102 struct strbuf *sb,
103 const char *subject,
104 const char *after_subject,
105 const char *encoding,
106 int need_8bit_cte);
107 void pp_remainder(enum cmit_fmt fmt,
108 const char **msg_p,
109 struct strbuf *sb,
110 int indent);
111
112
113 /** Removes the first commit from a list sorted by date, and adds all
114 * of its parents.
115 **/
116 struct commit *pop_most_recent_commit(struct commit_list **list,
117 unsigned int mark);
118
119 struct commit *pop_commit(struct commit_list **stack);
120
121 void clear_commit_marks(struct commit *commit, unsigned int mark);
122
123 /*
124 * Performs an in-place topological sort of list supplied.
125 *
126 * invariant of resulting list is:
127 * a reachable from b => ord(b) < ord(a)
128 * in addition, when lifo == 0, commits on parallel tracks are
129 * sorted in the dates order.
130 */
131 void sort_in_topological_order(struct commit_list ** list, int lifo);
132
133 struct commit_graft {
134 unsigned char sha1[20];
135 int nr_parent; /* < 0 if shallow commit */
136 unsigned char parent[FLEX_ARRAY][20]; /* more */
137 };
138
139 struct commit_graft *read_graft_line(char *buf, int len);
140 int register_commit_graft(struct commit_graft *, int);
141 struct commit_graft *lookup_commit_graft(const unsigned char *sha1);
142
143 const unsigned char *lookup_replace_object(const unsigned char *sha1);
144
145 extern struct commit_list *get_merge_bases(struct commit *rev1, struct commit *rev2, int cleanup);
146 extern struct commit_list *get_merge_bases_many(struct commit *one, int n, struct commit **twos, int cleanup);
147 extern struct commit_list *get_octopus_merge_bases(struct commit_list *in);
148
149 extern int register_shallow(const unsigned char *sha1);
150 extern int unregister_shallow(const unsigned char *sha1);
151 extern int write_shallow_commits(struct strbuf *out, int use_pack_protocol);
152 extern int is_repository_shallow(void);
153 extern struct commit_list *get_shallow_commits(struct object_array *heads,
154 int depth, int shallow_flag, int not_shallow_flag);
155
156 int is_descendant_of(struct commit *, struct commit_list *);
157 int in_merge_bases(struct commit *, struct commit **, int);
158
159 extern int interactive_add(int argc, const char **argv, const char *prefix);
160 extern int run_add_interactive(const char *revision, const char *patch_mode,
161 const char **pathspec);
162
163 static inline int single_parent(struct commit *commit)
164 {
165 return commit->parents && !commit->parents->next;
166 }
167
168 struct commit_list *reduce_heads(struct commit_list *heads);
169
170 extern int commit_tree(const char *msg, unsigned char *tree,
171 struct commit_list *parents, unsigned char *ret,
172 const char *author);
173
174 #endif /* COMMIT_H */