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