Add get_merge_bases_clean()
[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"
6
7struct commit_list {
8 struct commit *item;
9 struct commit_list *next;
10};
11
12struct commit {
13 struct object object;
d3ff6f55 14 void *util;
6eb8ae00
DB
15 unsigned long date;
16 struct commit_list *parents;
17 struct tree *tree;
bd1e17e2 18 char *buffer;
6eb8ae00
DB
19};
20
60ab26de 21extern int save_commit_buffer;
6eb8ae00
DB
22extern const char *commit_type;
23
5d6ccf5c
JM
24struct commit *lookup_commit(const unsigned char *sha1);
25struct commit *lookup_commit_reference(const unsigned char *sha1);
f76412ed
JH
26struct commit *lookup_commit_reference_gently(const unsigned char *sha1,
27 int quiet);
6eb8ae00 28
bd2c39f5
NP
29int parse_commit_buffer(struct commit *item, void *buffer, unsigned long size);
30
6eb8ae00
DB
31int parse_commit(struct commit *item);
32
ac5155ef 33struct commit_list * commit_list_insert(struct commit *item, struct commit_list **list_p);
f755494c 34struct commit_list * insert_by_date(struct commit *item, struct commit_list **list);
dd97f850 35
6eb8ae00
DB
36void free_commit_list(struct commit_list *list);
37
dd97f850
DB
38void sort_by_date(struct commit_list **list);
39
000182ea
LT
40/* Commit formats */
41enum cmit_fmt {
42 CMIT_FMT_RAW,
43 CMIT_FMT_MEDIUM,
44 CMIT_FMT_DEFAULT = CMIT_FMT_MEDIUM,
9b66ec04
LT
45 CMIT_FMT_SHORT,
46 CMIT_FMT_FULL,
ff56fe1c 47 CMIT_FMT_FULLER,
d87449c5 48 CMIT_FMT_ONELINE,
3eefc189 49 CMIT_FMT_EMAIL,
6b9c58f4
JH
50
51 CMIT_FMT_UNSPECIFIED,
000182ea
LT
52};
53
9b66ec04 54extern enum cmit_fmt get_commit_format(const char *arg);
698ce6f8 55extern unsigned long pretty_print_commit(enum cmit_fmt fmt, const struct commit *, unsigned long len, char *buf, unsigned long space, int abbrev, const char *subject, const char *after_subject);
e3bc7a3b 56
dd97f850
DB
57/** Removes the first commit from a list sorted by date, and adds all
58 * of its parents.
59 **/
58e28af6
DB
60struct commit *pop_most_recent_commit(struct commit_list **list,
61 unsigned int mark);
dd97f850 62
a3437b8c
JS
63struct commit *pop_commit(struct commit_list **stack);
64
f8f9c73c
JH
65void clear_commit_marks(struct commit *commit, unsigned int mark);
66
a3437b8c 67int count_parents(struct commit * commit);
ab580ace
JS
68
69/*
70 * Performs an in-place topological sort of list supplied.
71 *
6b6dcfc2 72 * Pre-conditions for sort_in_topological_order:
ab580ace
JS
73 * all commits in input list and all parents of those
74 * commits must have object.util == NULL
6b6dcfc2
FK
75 *
76 * Pre-conditions for sort_in_topological_order_fn:
77 * all commits in input list and all parents of those
78 * commits must have getter(commit) == NULL
79 *
80 * Post-conditions:
ab580ace
JS
81 * invariant of resulting list is:
82 * a reachable from b => ord(b) < ord(a)
4c8725f1
JH
83 * in addition, when lifo == 0, commits on parallel tracks are
84 * sorted in the dates order.
ab580ace 85 */
6b6dcfc2
FK
86
87typedef void (*topo_sort_set_fn_t)(struct commit*, void *data);
88typedef void* (*topo_sort_get_fn_t)(struct commit*);
89
90void topo_sort_default_setter(struct commit *c, void *data);
91void *topo_sort_default_getter(struct commit *c);
92
4c8725f1 93void sort_in_topological_order(struct commit_list ** list, int lifo);
6b6dcfc2
FK
94void sort_in_topological_order_fn(struct commit_list ** list, int lifo,
95 topo_sort_set_fn_t setter,
96 topo_sort_get_fn_t getter);
5040f17e
JH
97
98struct commit_graft {
99 unsigned char sha1[20];
100 int nr_parent;
101 unsigned char parent[FLEX_ARRAY][20]; /* more */
102};
103
104struct commit_graft *read_graft_line(char *buf, int len);
105int register_commit_graft(struct commit_graft *, int);
106int read_graft_file(const char *graft_file);
107
7c6f8aaf 108extern struct commit_list *get_merge_bases(struct commit *rev1, struct commit *rev2);
31609c17 109extern struct commit_list *get_merge_bases_clean(struct commit *rev1, struct commit *rev2);
7c6f8aaf 110
6eb8ae00 111#endif /* COMMIT_H */