blob: d9b3c09eaf09819f9444cfcf68ca5443aa918b78 [file] [log] [blame]
Johan Herland49c24702013-06-12 02:13:00 +02001#ifndef NOTES_UTILS_H
2#define NOTES_UTILS_H
3
4#include "notes.h"
5
Elijah Newrenef3ca952018-08-15 10:54:05 -07006struct commit_list;
7struct object_id;
Nguyễn Thái Ngọc Duy1d18d752019-01-12 09:13:23 +07008struct repository;
Elijah Newrenef3ca952018-08-15 10:54:05 -07009
Johan Herlandbf9a05b2013-06-12 02:13:01 +020010/*
11 * Create new notes commit from the given notes tree
12 *
13 * Properties of the created commit:
14 * - tree: the result of converting t to a tree object with write_notes_tree().
15 * - parents: the given parents OR (if NULL) the commit referenced by t->ref.
Junio C Hamanoa316b952013-09-04 15:28:45 -070016 * - author/committer: the default determined by commit_tree().
Johan Herlandbf9a05b2013-06-12 02:13:01 +020017 * - commit message: msg
18 *
19 * The resulting commit SHA1 is stored in result_sha1.
20 */
Nguyễn Thái Ngọc Duy1d18d752019-01-12 09:13:23 +070021void create_notes_commit(struct repository *r,
22 struct notes_tree *t,
23 struct commit_list *parents,
Patryk Obara5078f342018-01-28 01:13:16 +010024 const char *msg, size_t msg_len,
25 struct object_id *result_oid);
Johan Herlandbf9a05b2013-06-12 02:13:01 +020026
Nguyễn Thái Ngọc Duy1d18d752019-01-12 09:13:23 +070027void commit_notes(struct repository *r, struct notes_tree *t, const char *msg);
Johan Herland49c24702013-06-12 02:13:00 +020028
Jacob Keller4d03dd12015-08-17 14:33:30 -070029enum notes_merge_strategy {
30 NOTES_MERGE_RESOLVE_MANUAL = 0,
31 NOTES_MERGE_RESOLVE_OURS,
32 NOTES_MERGE_RESOLVE_THEIRS,
33 NOTES_MERGE_RESOLVE_UNION,
34 NOTES_MERGE_RESOLVE_CAT_SORT_UNIQ
35};
36
Johan Herland49c24702013-06-12 02:13:00 +020037struct notes_rewrite_cfg {
38 struct notes_tree **trees;
39 const char *cmd;
40 int enabled;
41 combine_notes_fn combine;
42 struct string_list *refs;
43 int refs_from_env;
44 int mode_from_env;
45};
46
Jacob Keller93efcad2015-08-17 14:33:31 -070047int parse_notes_merge_strategy(const char *v, enum notes_merge_strategy *s);
Johan Herland49c24702013-06-12 02:13:00 +020048struct notes_rewrite_cfg *init_copy_notes_for_rewrite(const char *cmd);
49int copy_note_for_rewrite(struct notes_rewrite_cfg *c,
brian m. carlsonbb7e4732017-05-30 10:30:42 -070050 const struct object_id *from_obj, const struct object_id *to_obj);
Nguyễn Thái Ngọc Duy1d18d752019-01-12 09:13:23 +070051void finish_copy_notes_for_rewrite(struct repository *r,
52 struct notes_rewrite_cfg *c,
53 const char *msg);
Johan Herland49c24702013-06-12 02:13:00 +020054
55#endif