blob: 41985130d1473573af2cfd4ca97a579e999b0c0b [file] [log] [blame]
Daniel Barkalow6eb8ae02005-04-18 11:39:48 -07001#ifndef COMMIT_H
2#define COMMIT_H
3
4#include "object.h"
5#include "tree.h"
Pierre Habouzit674d1722007-09-10 12:35:06 +02006#include "strbuf.h"
Linus Torvaldsca135e72007-04-16 16:05:10 -07007#include "decorate.h"
Daniel Barkalow6eb8ae02005-04-18 11:39:48 -07008
9struct commit_list {
10 struct commit *item;
11 struct commit_list *next;
12};
13
14struct commit {
15 struct object object;
Linus Torvaldsd3ff6f52006-06-17 18:26:18 -070016 void *util;
Linus Torvalds23c17d42007-11-02 13:32:58 -070017 unsigned int indegree;
Daniel Barkalow6eb8ae02005-04-18 11:39:48 -070018 unsigned long date;
19 struct commit_list *parents;
20 struct tree *tree;
Linus Torvaldsbd1e17e2005-05-25 19:26:28 -070021 char *buffer;
Daniel Barkalow6eb8ae02005-04-18 11:39:48 -070022};
23
Linus Torvalds60ab26d2005-09-15 14:43:17 -070024extern int save_commit_buffer;
Daniel Barkalow6eb8ae02005-04-18 11:39:48 -070025extern const char *commit_type;
26
Linus Torvaldsca135e72007-04-16 16:05:10 -070027/* 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;
Nazri Ramliyeb3005e2010-06-19 09:37:33 +080031 int type;
Linus Torvaldsca135e72007-04-16 16:05:10 -070032 char name[1];
33};
34
Jason McMullan5d6ccf52005-06-03 11:05:39 -040035struct commit *lookup_commit(const unsigned char *sha1);
36struct commit *lookup_commit_reference(const unsigned char *sha1);
Junio C Hamanof76412e2005-08-21 02:51:10 -070037struct commit *lookup_commit_reference_gently(const unsigned char *sha1,
38 int quiet);
Pat Notza6fa5992010-11-02 13:59:07 -060039struct commit *lookup_commit_reference_by_name(const char *name);
Daniel Barkalow6eb8ae02005-04-18 11:39:48 -070040
Nguyễn Thái Ngọc Duycf7b1ca2011-02-05 17:52:20 +070041int parse_commit_buffer(struct commit *item, const void *buffer, unsigned long size);
Daniel Barkalow6eb8ae02005-04-18 11:39:48 -070042int parse_commit(struct commit *item);
43
Christian Couder11af2aa2010-07-22 15:18:30 +020044/* Find beginning and length of commit subject. */
45int find_commit_subject(const char *commit_buffer, const char **subject);
46
Thiago Farina47e44ed2010-11-26 23:58:14 -020047struct commit_list *commit_list_insert(struct commit *item,
48 struct commit_list **list);
Miklos Vajna65319472008-06-27 18:21:55 +020049unsigned commit_list_count(const struct commit_list *l);
Thiago Farina47e44ed2010-11-26 23:58:14 -020050struct commit_list *commit_list_insert_by_date(struct commit *item,
51 struct commit_list **list);
52void commit_list_sort_by_date(struct commit_list **list);
Daniel Barkalowdd97f852005-04-23 18:47:23 -070053
Daniel Barkalow6eb8ae02005-04-18 11:39:48 -070054void free_commit_list(struct commit_list *list);
55
Linus Torvalds000182e2005-06-05 09:02:03 -070056/* Commit formats */
57enum cmit_fmt {
58 CMIT_FMT_RAW,
59 CMIT_FMT_MEDIUM,
60 CMIT_FMT_DEFAULT = CMIT_FMT_MEDIUM,
Linus Torvalds9b66ec02005-06-26 17:50:46 -070061 CMIT_FMT_SHORT,
62 CMIT_FMT_FULL,
Junio C Hamanoff56fe12005-11-09 22:15:27 -080063 CMIT_FMT_FULLER,
Junio C Hamanod87449c2005-08-08 22:15:40 -070064 CMIT_FMT_ONELINE,
Junio C Hamano3eefc182006-04-18 16:45:27 -070065 CMIT_FMT_EMAIL,
Johannes Schindeline52a5de2007-02-23 01:35:03 +010066 CMIT_FMT_USERFORMAT,
Junio C Hamano6b9c58f2006-04-15 23:46:36 -070067
Gary V. Vaughan4b055482010-05-14 09:31:35 +000068 CMIT_FMT_UNSPECIFIED
Linus Torvalds000182e2005-06-05 09:02:03 -070069};
70
Jonathan Nieder9cba13c2011-03-16 02:08:34 -050071struct pretty_print_context {
Thomas Rastdd2e7942009-10-19 17:48:08 +020072 int abbrev;
73 const char *subject;
74 const char *after_subject;
75 enum date_mode date_mode;
76 int need_8bit_cte;
Junio C Hamano66b2ed02010-01-20 13:59:36 -080077 int show_notes;
Thomas Rast8f8f5472009-10-19 17:48:10 +020078 struct reflog_walk_info *reflog_info;
Pat Notz177b29d2010-11-02 13:59:08 -060079 const char *output_encoding;
Thomas Rastdd2e7942009-10-19 17:48:08 +020080};
81
Johannes Gilger5b163602010-04-13 22:31:12 +020082struct userformat_want {
83 unsigned notes:1;
84};
85
Johannes Schindelin28e9cf62009-08-10 18:22:18 +020086extern int has_non_ascii(const char *text);
Junio C Hamano4da45be2008-04-07 17:11:34 -070087struct rev_info; /* in revision.h, it circularly uses enum cmit_fmt */
Pat Notz177b29d2010-11-02 13:59:08 -060088extern char *logmsg_reencode(const struct commit *commit,
89 const char *output_encoding);
Alexander Gavrilov69cd8f62008-10-22 00:55:57 +040090extern char *reencode_commit_message(const struct commit *commit,
91 const char **encoding_p);
Junio C Hamano4da45be2008-04-07 17:11:34 -070092extern void get_commit_format(const char *arg, struct rev_info *);
Johannes Gilger5b163602010-04-13 22:31:12 +020093extern void userformat_find_requirements(const char *fmt, struct userformat_want *w);
Pierre Habouzit674d1722007-09-10 12:35:06 +020094extern void format_commit_message(const struct commit *commit,
Junio C Hamano7f98ebc2009-10-15 22:59:41 -070095 const char *format, struct strbuf *sb,
Thomas Rastdd2e7942009-10-19 17:48:08 +020096 const struct pretty_print_context *context);
97extern void pretty_print_commit(enum cmit_fmt fmt, const struct commit *commit,
98 struct strbuf *sb,
99 const struct pretty_print_context *context);
Daniel Barkalowb02bd652008-02-18 22:56:08 -0500100void pp_user_info(const char *what, enum cmit_fmt fmt, struct strbuf *sb,
101 const char *line, enum date_mode dmode,
102 const char *encoding);
103void pp_title_line(enum cmit_fmt fmt,
104 const char **msg_p,
105 struct strbuf *sb,
106 const char *subject,
107 const char *after_subject,
108 const char *encoding,
Junio C Hamano267123b2008-03-15 00:09:20 -0700109 int need_8bit_cte);
Daniel Barkalowb02bd652008-02-18 22:56:08 -0500110void pp_remainder(enum cmit_fmt fmt,
111 const char **msg_p,
112 struct strbuf *sb,
113 int indent);
114
Linus Torvaldse3bc7a32005-06-01 08:34:23 -0700115
Daniel Barkalowdd97f852005-04-23 18:47:23 -0700116/** Removes the first commit from a list sorted by date, and adds all
117 * of its parents.
118 **/
Junio C Hamanoa6080a02007-06-07 00:04:01 -0700119struct commit *pop_most_recent_commit(struct commit_list **list,
Daniel Barkalow58e28af2005-04-23 20:29:22 -0700120 unsigned int mark);
Daniel Barkalowdd97f852005-04-23 18:47:23 -0700121
jon@blackcubes.dyndns.orga3437b82005-06-06 15:39:40 +0000122struct commit *pop_commit(struct commit_list **stack);
123
Junio C Hamanof8f9c732006-01-07 18:52:42 -0800124void clear_commit_marks(struct commit *commit, unsigned int mark);
125
Jon Seymourab580ac2005-07-07 02:39:34 +1000126/*
127 * Performs an in-place topological sort of list supplied.
128 *
Jon Seymourab580ac2005-07-07 02:39:34 +1000129 * invariant of resulting list is:
130 * a reachable from b => ord(b) < ord(a)
Junio C Hamano4c8725f2006-02-15 22:05:33 -0800131 * in addition, when lifo == 0, commits on parallel tracks are
132 * sorted in the dates order.
Jon Seymourab580ac2005-07-07 02:39:34 +1000133 */
Junio C Hamano4c8725f2006-02-15 22:05:33 -0800134void sort_in_topological_order(struct commit_list ** list, int lifo);
Junio C Hamano5040f172006-04-06 23:58:51 -0700135
136struct commit_graft {
137 unsigned char sha1[20];
Johannes Schindelined09aef2006-10-30 20:09:06 +0100138 int nr_parent; /* < 0 if shallow commit */
Junio C Hamano5040f172006-04-06 23:58:51 -0700139 unsigned char parent[FLEX_ARRAY][20]; /* more */
140};
141
142struct commit_graft *read_graft_line(char *buf, int len);
143int register_commit_graft(struct commit_graft *, int);
Martin Koegler45163382008-02-25 22:46:07 +0100144struct commit_graft *lookup_commit_graft(const unsigned char *sha1);
Junio C Hamano5040f172006-04-06 23:58:51 -0700145
Christian Couder68095572009-01-23 10:06:53 +0100146const unsigned char *lookup_replace_object(const unsigned char *sha1);
147
Rene Scharfec0fa8252006-07-02 11:49:38 +0200148extern struct commit_list *get_merge_bases(struct commit *rev1, struct commit *rev2, int cleanup);
Christian Couder53eda892008-07-30 07:04:14 +0200149extern struct commit_list *get_merge_bases_many(struct commit *one, int n, struct commit **twos, int cleanup);
Miklos Vajna5240c9d2008-06-27 18:22:00 +0200150extern struct commit_list *get_octopus_merge_bases(struct commit_list *in);
Johannes Schindelin7c6f8aa2006-06-29 15:17:32 +0200151
Johannes Schindelined09aef2006-10-30 20:09:06 +0100152extern int register_shallow(const unsigned char *sha1);
Johannes Schindelinf53514b2006-10-30 20:09:53 +0100153extern int unregister_shallow(const unsigned char *sha1);
Shawn O. Pearceedace6f2009-10-30 17:47:23 -0700154extern int write_shallow_commits(struct strbuf *out, int use_pack_protocol);
Junio C Hamanof43117a2007-01-21 22:22:23 -0800155extern int is_repository_shallow(void);
Johannes Schindelined09aef2006-10-30 20:09:06 +0100156extern struct commit_list *get_shallow_commits(struct object_array *heads,
Johannes Schindelinf53514b2006-10-30 20:09:53 +0100157 int depth, int shallow_flag, int not_shallow_flag);
Johannes Schindelined09aef2006-10-30 20:09:06 +0100158
Jake Goulding7fcdb362009-01-26 09:13:24 -0500159int is_descendant_of(struct commit *, struct commit_list *);
Junio C Hamano03840fc2007-01-08 23:22:31 -0800160int in_merge_bases(struct commit *, struct commit **, int);
Kristian Høgsberg58680162007-09-17 20:06:44 -0400161
Junio C Hamano3f061882007-11-25 10:10:10 -0800162extern int interactive_add(int argc, const char **argv, const char *prefix);
Thomas Rast46b51392009-08-13 14:29:41 +0200163extern int run_add_interactive(const char *revision, const char *patch_mode,
164 const char **pathspec);
Kristian Høgsberg58680162007-09-17 20:06:44 -0400165
Linus Torvalds53b2c822007-11-05 13:22:34 -0800166static inline int single_parent(struct commit *commit)
167{
168 return commit->parents && !commit->parents->next;
169}
170
Junio C Hamano98cf9c32008-06-27 18:22:03 +0200171struct commit_list *reduce_heads(struct commit_list *heads);
172
Jeff King40d52ff2010-04-01 20:05:23 -0400173extern int commit_tree(const char *msg, unsigned char *tree,
174 struct commit_list *parents, unsigned char *ret,
175 const char *author);
176
Daniel Barkalow6eb8ae02005-04-18 11:39:48 -0700177#endif /* COMMIT_H */