notes-utils.h 1.38 KB
Newer Older
1 2 3 4 5
#ifndef NOTES_UTILS_H
#define NOTES_UTILS_H

#include "notes.h"

6 7 8 9 10 11
/*
 * Create new notes commit from the given notes tree
 *
 * Properties of the created commit:
 * - tree: the result of converting t to a tree object with write_notes_tree().
 * - parents: the given parents OR (if NULL) the commit referenced by t->ref.
12
 * - author/committer: the default determined by commit_tree().
13 14 15 16 17
 * - commit message: msg
 *
 * The resulting commit SHA1 is stored in result_sha1.
 */
void create_notes_commit(struct notes_tree *t, struct commit_list *parents,
18 19
			 const char *msg, size_t msg_len,
			 struct object_id *result_oid);
20

21 22
void commit_notes(struct notes_tree *t, const char *msg);

23 24 25 26 27 28 29 30
enum notes_merge_strategy {
		NOTES_MERGE_RESOLVE_MANUAL = 0,
		NOTES_MERGE_RESOLVE_OURS,
		NOTES_MERGE_RESOLVE_THEIRS,
		NOTES_MERGE_RESOLVE_UNION,
		NOTES_MERGE_RESOLVE_CAT_SORT_UNIQ
};

31 32 33 34 35 36 37 38 39 40
struct notes_rewrite_cfg {
	struct notes_tree **trees;
	const char *cmd;
	int enabled;
	combine_notes_fn combine;
	struct string_list *refs;
	int refs_from_env;
	int mode_from_env;
};

41
int parse_notes_merge_strategy(const char *v, enum notes_merge_strategy *s);
42 43
struct notes_rewrite_cfg *init_copy_notes_for_rewrite(const char *cmd);
int copy_note_for_rewrite(struct notes_rewrite_cfg *c,
44
			  const struct object_id *from_obj, const struct object_id *to_obj);
45 46 47
void finish_copy_notes_for_rewrite(struct notes_rewrite_cfg *c, const char *msg);

#endif