commit.h 13.9 KB
Newer Older
1 2 3 4 5
#ifndef COMMIT_H
#define COMMIT_H

#include "object.h"
#include "tree.h"
6
#include "strbuf.h"
7
#include "decorate.h"
8
#include "gpg-interface.h"
9
#include "string-list.h"
10 11 12 13 14 15 16 17

struct commit_list {
	struct commit *item;
	struct commit_list *next;
};

struct commit {
	struct object object;
18
	void *util;
19
	unsigned int index;
20
	timestamp_t date;
21 22 23 24
	struct commit_list *parents;
	struct tree *tree;
};

25
extern int save_commit_buffer;
26 27
extern const char *commit_type;

28 29 30
/* While we can decorate any object with a name, it's only used for commits.. */
struct name_decoration {
	struct name_decoration *next;
31
	int type;
32
	char name[FLEX_ARRAY];
33 34
};

35 36 37 38 39 40 41 42 43 44 45
enum decoration_type {
	DECORATION_NONE = 0,
	DECORATION_REF_LOCAL,
	DECORATION_REF_REMOTE,
	DECORATION_REF_TAG,
	DECORATION_REF_STASH,
	DECORATION_REF_HEAD,
	DECORATION_GRAFTED,
};

void add_name_decoration(enum decoration_type type, const char *name, struct object *obj);
46
const struct name_decoration *get_name_decoration(const struct object *obj);
47

48 49 50
struct commit *lookup_commit(const struct object_id *oid);
struct commit *lookup_commit_reference(const struct object_id *oid);
struct commit *lookup_commit_reference_gently(const struct object_id *oid,
J
Junio C Hamano 已提交
51
					      int quiet);
52
struct commit *lookup_commit_reference_by_name(const char *name);
53

54
/*
55 56
 * Look up object named by "oid", dereference tag as necessary,
 * get a commit and return it. If "oid" does not dereference to
57 58
 * a commit, use ref_name to report an error and die.
 */
59
struct commit *lookup_commit_or_die(const struct object_id *oid, const char *ref_name);
60

61
int parse_commit_buffer(struct commit *item, const void *buffer, unsigned long size);
62 63 64 65 66
int parse_commit_gently(struct commit *item, int quiet_on_missing);
static inline int parse_commit(struct commit *item)
{
	return parse_commit_gently(item, 0);
}
67
void parse_commit_or_die(struct commit *item);
68

69 70 71 72
/*
 * Associate an object buffer with the commit. The ownership of the
 * memory is handed over to the commit, and must be free()-able.
 */
73
void set_commit_buffer(struct commit *, void *buffer, unsigned long size);
74

75 76 77 78
/*
 * Get any cached object buffer associated with the commit. Returns NULL
 * if none. The resulting memory should not be freed.
 */
79
const void *get_cached_commit_buffer(const struct commit *, unsigned long *size);
80 81 82 83 84 85

/*
 * Get the commit's object contents, either from cache or by reading the object
 * from disk. The resulting memory should not be modified, and must be given
 * to unuse_commit_buffer when the caller is done.
 */
86
const void *get_commit_buffer(const struct commit *, unsigned long *size);
87 88 89 90 91 92 93 94 95

/*
 * Tell the commit subsytem that we are done with a particular commit buffer.
 * The commit and buffer should be the input and return value, respectively,
 * from an earlier call to get_commit_buffer.  The buffer may or may not be
 * freed by this call; callers should not access the memory afterwards.
 */
void unuse_commit_buffer(const struct commit *, const void *buffer);

96 97 98 99 100 101 102 103 104
/*
 * Free any cached object buffer associated with the commit.
 */
void free_commit_buffer(struct commit *);

/*
 * Disassociate any cached object buffer from the commit, but do not free it.
 * The buffer (or NULL, if none) is returned.
 */
105
const void *detach_commit_buffer(struct commit *, unsigned long *sizep);
106

107 108 109
/* Find beginning and length of commit subject. */
int find_commit_subject(const char *commit_buffer, const char **subject);

110 111
struct commit_list *commit_list_insert(struct commit *item,
					struct commit_list **list);
112 113
struct commit_list **commit_list_append(struct commit *commit,
					struct commit_list **next);
114
unsigned commit_list_count(const struct commit_list *l);
115 116 117
struct commit_list *commit_list_insert_by_date(struct commit *item,
				    struct commit_list **list);
void commit_list_sort_by_date(struct commit_list **list);
118

119 120 121
/* Shallow copy of the input list */
struct commit_list *copy_commit_list(struct commit_list *list);

122 123
void free_commit_list(struct commit_list *list);

124 125 126 127 128
/* Commit formats */
enum cmit_fmt {
	CMIT_FMT_RAW,
	CMIT_FMT_MEDIUM,
	CMIT_FMT_DEFAULT = CMIT_FMT_MEDIUM,
129 130
	CMIT_FMT_SHORT,
	CMIT_FMT_FULL,
J
Junio C Hamano 已提交
131
	CMIT_FMT_FULLER,
132
	CMIT_FMT_ONELINE,
133
	CMIT_FMT_EMAIL,
134
	CMIT_FMT_MBOXRD,
135
	CMIT_FMT_USERFORMAT,
136

137
	CMIT_FMT_UNSPECIFIED
138 139
};

140 141 142 143 144
static inline int cmit_fmt_is_mail(enum cmit_fmt fmt)
{
	return (fmt == CMIT_FMT_EMAIL || fmt == CMIT_FMT_MBOXRD);
}

145 146
struct rev_info; /* in revision.h, it circularly uses enum cmit_fmt */

147
struct pretty_print_context {
148 149 150
	/*
	 * Callers should tweak these to change the behavior of pp_* functions.
	 */
151
	enum cmit_fmt fmt;
152 153
	int abbrev;
	const char *after_subject;
154
	int preserve_subject;
155
	struct date_mode date_mode;
156
	unsigned date_mode_explicit:1;
157
	int print_email_subject;
158
	int expand_tabs_in_log;
159
	int need_8bit_cte;
160
	char *notes_message;
161
	struct reflog_walk_info *reflog_info;
162
	struct rev_info *rev;
163
	const char *output_encoding;
164
	struct string_list *mailmap;
165
	int color;
166
	struct ident_split *from_ident;
167 168 169 170 171

	/*
	 * Fields below here are manipulated internally by pp_* functions and
	 * should not be counted on by callers.
	 */
172
	struct string_list in_body_headers;
173
	int graph_width;
174 175
};

176 177 178 179
struct userformat_want {
	unsigned notes:1;
};

180
extern int has_non_ascii(const char *text);
J
Jeff King 已提交
181 182 183
extern const char *logmsg_reencode(const struct commit *commit,
				   char **commit_encoding,
				   const char *output_encoding);
184
extern void get_commit_format(const char *arg, struct rev_info *);
185 186
extern const char *format_subject(struct strbuf *sb, const char *msg,
				  const char *line_separator);
187
extern void userformat_find_requirements(const char *fmt, struct userformat_want *w);
188
extern int commit_format_is_empty(enum cmit_fmt);
189
extern const char *skip_blank_lines(const char *msg);
190
extern void format_commit_message(const struct commit *commit,
191
				  const char *format, struct strbuf *sb,
192
				  const struct pretty_print_context *context);
193
extern void pretty_print_commit(struct pretty_print_context *pp,
194 195
				const struct commit *commit,
				struct strbuf *sb);
196 197
extern void pp_commit_easy(enum cmit_fmt fmt, const struct commit *commit,
			   struct strbuf *sb);
198
void pp_user_info(struct pretty_print_context *pp,
199 200
		  const char *what, struct strbuf *sb,
		  const char *line, const char *encoding);
201
void pp_title_line(struct pretty_print_context *pp,
202 203 204
		   const char **msg_p,
		   struct strbuf *sb,
		   const char *encoding,
J
Junio C Hamano 已提交
205
		   int need_8bit_cte);
206
void pp_remainder(struct pretty_print_context *pp,
207 208 209 210
		  const char **msg_p,
		  struct strbuf *sb,
		  int indent);

211

212 213 214
/** Removes the first commit from a list sorted by date, and adds all
 * of its parents.
 **/
J
Junio C Hamano 已提交
215
struct commit *pop_most_recent_commit(struct commit_list **list,
216
				      unsigned int mark);
217

218 219
struct commit *pop_commit(struct commit_list **stack);

220
void clear_commit_marks(struct commit *commit, unsigned int mark);
221
void clear_commit_marks_many(int nr, struct commit **commit, unsigned int mark);
222
void clear_commit_marks_for_object_array(struct object_array *a, unsigned mark);
223

J
Junio C Hamano 已提交
224 225 226

enum rev_sort_order {
	REV_SORT_IN_GRAPH_ORDER = 0,
J
Junio C Hamano 已提交
227 228
	REV_SORT_BY_COMMIT_DATE,
	REV_SORT_BY_AUTHOR_DATE
J
Junio C Hamano 已提交
229 230
};

231 232 233 234 235
/*
 * Performs an in-place topological sort of list supplied.
 *
 *   invariant of resulting list is:
 *      a reachable from b => ord(b) < ord(a)
J
Junio C Hamano 已提交
236 237 238 239
 *   sort_order further specifies:
 *   REV_SORT_IN_GRAPH_ORDER: try to show a commit on a single-parent
 *                            chain together.
 *   REV_SORT_BY_COMMIT_DATE: show eligible commits in committer-date order.
240
 */
J
Junio C Hamano 已提交
241
void sort_in_topological_order(struct commit_list **, enum rev_sort_order);
J
Junio C Hamano 已提交
242 243

struct commit_graft {
244
	struct object_id oid;
245
	int nr_parent; /* < 0 if shallow commit */
246
	struct object_id parent[FLEX_ARRAY]; /* more */
J
Junio C Hamano 已提交
247
};
248
typedef int (*each_commit_graft_fn)(const struct commit_graft *, void *);
J
Junio C Hamano 已提交
249

250
struct commit_graft *read_graft_line(struct strbuf *line);
J
Junio C Hamano 已提交
251
int register_commit_graft(struct commit_graft *, int);
252
struct commit_graft *lookup_commit_graft(const struct object_id *oid);
J
Junio C Hamano 已提交
253

254 255
extern struct commit_list *get_merge_bases(struct commit *rev1, struct commit *rev2);
extern struct commit_list *get_merge_bases_many(struct commit *one, int n, struct commit **twos);
256
extern struct commit_list *get_octopus_merge_bases(struct commit_list *in);
257

258 259 260
/* To be used only when object flags after this call no longer matter */
extern struct commit_list *get_merge_bases_many_dirty(struct commit *one, int n, struct commit **twos);

261
/* largest positive number a signed 32-bit integer can contain */
262 263
#define INFINITE_DEPTH 0x7fffffff

264
struct oid_array;
265
struct ref;
266 267
extern int register_shallow(const struct object_id *oid);
extern int unregister_shallow(const struct object_id *oid);
268
extern int for_each_commit_graft(each_commit_graft_fn, void *);
269
extern int is_repository_shallow(void);
270
extern struct commit_list *get_shallow_commits(struct object_array *heads,
271
		int depth, int shallow_flag, int not_shallow_flag);
272 273
extern struct commit_list *get_shallow_commits_by_rev_list(
		int ac, const char **av, int shallow_flag, int not_shallow_flag);
274
extern void set_alternate_shallow_file(const char *path, int override);
275
extern int write_shallow_commits(struct strbuf *out, int use_pack_protocol,
276
				 const struct oid_array *extra);
277
extern void setup_alternate_shallow(struct lock_file *shallow_lock,
278
				    const char **alternate_shallow_file,
279 280
				    const struct oid_array *extra);
extern const char *setup_temporary_shallow(const struct oid_array *extra);
281
extern void advertise_shallow_grafts(int);
282

283
struct shallow_info {
284
	struct oid_array *shallow;
285 286
	int *ours, nr_ours;
	int *theirs, nr_theirs;
287
	struct oid_array *ref;
288 289 290 291 292 293 294 295

	/* for receive-pack */
	uint32_t **used_shallow;
	int *need_reachability_test;
	int *reachable;
	int *shallow_ref;
	struct commit **commits;
	int nr_commits;
296 297
};

298
extern void prepare_shallow_info(struct shallow_info *, struct oid_array *);
299 300
extern void clear_shallow_info(struct shallow_info *);
extern void remove_nonexistent_theirs_shallow(struct shallow_info *);
301 302 303
extern void assign_shallow_commits_to_refs(struct shallow_info *info,
					   uint32_t **used,
					   int *ref_status);
304
extern int delayed_reachability_test(struct shallow_info *si, int c);
305
extern void prune_shallow(int show_only);
K
Karsten Blees 已提交
306
extern struct trace_key trace_shallow;
307

J
Jake Goulding 已提交
308
int is_descendant_of(struct commit *, struct commit_list *);
309
int in_merge_bases(struct commit *, struct commit *);
310
int in_merge_bases_many(struct commit *, int, struct commit **);
311

312
extern int interactive_add(int argc, const char **argv, const char *prefix, int patch);
313
extern int run_add_interactive(const char *revision, const char *patch_mode,
314
			       const struct pathspec *pathspec);
315

M
Martin Ågren 已提交
316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332
/*
 * Takes a list of commits and returns a new list where those
 * have been removed that can be reached from other commits in
 * the list. It is useful for, e.g., reducing the commits
 * randomly thrown at the git-merge command and removing
 * redundant commits that the user shouldn't have given to it.
 *
 * This function destroys the STALE bit of the commit objects'
 * flags.
 */
extern struct commit_list *reduce_heads(struct commit_list *heads);

/*
 * Like `reduce_heads()`, except it replaces the list. Use this
 * instead of `foo = reduce_heads(foo);` to avoid memory leaks.
 */
extern void reduce_heads_replace(struct commit_list **heads);
J
Junio C Hamano 已提交
333

334 335 336 337 338 339 340 341 342 343
struct commit_extra_header {
	struct commit_extra_header *next;
	char *key;
	char *value;
	size_t len;
};

extern void append_merge_tag_headers(struct commit_list *parents,
				     struct commit_extra_header ***tail);

344 345
extern int commit_tree(const char *msg, size_t msg_len,
		       const unsigned char *tree,
346
		       struct commit_list *parents, unsigned char *ret,
J
Junio C Hamano 已提交
347
		       const char *author, const char *sign_commit);
348

349 350
extern int commit_tree_extended(const char *msg, size_t msg_len,
				const unsigned char *tree,
351
				struct commit_list *parents, unsigned char *ret,
J
Junio C Hamano 已提交
352
				const char *author, const char *sign_commit,
353 354
				struct commit_extra_header *);

355
extern struct commit_extra_header *read_commit_extra_headers(struct commit *, const char **);
356

357
extern void free_commit_extra_headers(struct commit_extra_header *extra);
J
Jeff King 已提交
358

359 360 361 362 363 364 365 366 367 368 369
/*
 * Search the commit object contents given by "msg" for the header "key".
 * Returns a pointer to the start of the header contents, or NULL. The length
 * of the header, up to the first newline, is returned via out_len.
 *
 * Note that some headers (like mergetag) may be multi-line. It is the caller's
 * responsibility to parse further in this case!
 */
extern const char *find_commit_header(const char *msg, const char *key,
				      size_t *out_len);

370
/* Find the end of the log message, the right place for a new trailer. */
371
extern int ignore_non_trailer(const char *buf, size_t len);
372

373 374 375 376 377
typedef void (*each_mergetag_fn)(struct commit *commit, struct commit_extra_header *extra,
				 void *cb_data);

extern void for_each_mergetag(each_mergetag_fn fn, struct commit *commit, void *data);

378 379
struct merge_remote_desc {
	struct object *obj; /* the named object, could be a tag */
380
	char name[FLEX_ARRAY];
381 382
};
#define merge_remote_util(commit) ((struct merge_remote_desc *)((commit)->util))
383 384
extern void set_merge_remote_desc(struct commit *commit,
				  const char *name, struct object *obj);
385 386 387 388 389 390 391 392

/*
 * Given "name" from the command line to merge, find the commit object
 * and return it, while storing merge_remote_desc in its ->util field,
 * to allow callers to tell if we are told to merge a tag.
 */
struct commit *get_merge_parent(const char *name);

393
extern int parse_signed_commit(const struct commit *commit,
J
Junio C Hamano 已提交
394
			       struct strbuf *message, struct strbuf *signature);
395 396
extern int remove_signature(struct strbuf *buf);

397
/*
398 399 400 401 402
 * Check the signature of the given commit. The result of the check is stored
 * in sig->check_result, 'G' for a good signature, 'U' for a good signature
 * from an untrusted signer, 'B' for a bad signature and 'N' for no signature
 * at all.  This may allocate memory for sig->gpg_output, sig->gpg_status,
 * sig->signer and sig->key.
403
 */
404
extern int check_commit_signature(const struct commit *commit, struct signature_check *sigc);
405

406 407
int compare_commits_by_commit_date(const void *a_, const void *b_, void *unused);

408 409 410
LAST_ARG_MUST_BE_NULL
extern int run_commit_hook(int editor_is_used, const char *index_file, const char *name, ...);

411
#endif /* COMMIT_H */