Johan Herland | 49c2470 | 2013-06-12 02:13:00 +0200 | [diff] [blame] | 1 | #ifndef NOTES_UTILS_H |
| 2 | #define NOTES_UTILS_H |
| 3 | |
| 4 | #include "notes.h" |
| 5 | |
Johan Herland | bf9a05b | 2013-06-12 02:13:01 +0200 | [diff] [blame] | 6 | /* |
| 7 | * Create new notes commit from the given notes tree |
| 8 | * |
| 9 | * Properties of the created commit: |
| 10 | * - tree: the result of converting t to a tree object with write_notes_tree(). |
| 11 | * - parents: the given parents OR (if NULL) the commit referenced by t->ref. |
Junio C Hamano | a316b95 | 2013-09-04 15:28:45 -0700 | [diff] [blame] | 12 | * - author/committer: the default determined by commit_tree(). |
Johan Herland | bf9a05b | 2013-06-12 02:13:01 +0200 | [diff] [blame] | 13 | * - commit message: msg |
| 14 | * |
| 15 | * The resulting commit SHA1 is stored in result_sha1. |
| 16 | */ |
| 17 | void create_notes_commit(struct notes_tree *t, struct commit_list *parents, |
Jeff King | 3ffefb5 | 2014-06-10 17:36:52 -0400 | [diff] [blame] | 18 | const char *msg, size_t msg_len, unsigned char *result_sha1); |
Johan Herland | bf9a05b | 2013-06-12 02:13:01 +0200 | [diff] [blame] | 19 | |
Johan Herland | 49c2470 | 2013-06-12 02:13:00 +0200 | [diff] [blame] | 20 | void commit_notes(struct notes_tree *t, const char *msg); |
| 21 | |
Jacob Keller | 4d03dd1 | 2015-08-17 14:33:30 -0700 | [diff] [blame] | 22 | enum notes_merge_strategy { |
| 23 | NOTES_MERGE_RESOLVE_MANUAL = 0, |
| 24 | NOTES_MERGE_RESOLVE_OURS, |
| 25 | NOTES_MERGE_RESOLVE_THEIRS, |
| 26 | NOTES_MERGE_RESOLVE_UNION, |
| 27 | NOTES_MERGE_RESOLVE_CAT_SORT_UNIQ |
| 28 | }; |
| 29 | |
Johan Herland | 49c2470 | 2013-06-12 02:13:00 +0200 | [diff] [blame] | 30 | struct notes_rewrite_cfg { |
| 31 | struct notes_tree **trees; |
| 32 | const char *cmd; |
| 33 | int enabled; |
| 34 | combine_notes_fn combine; |
| 35 | struct string_list *refs; |
| 36 | int refs_from_env; |
| 37 | int mode_from_env; |
| 38 | }; |
| 39 | |
Jacob Keller | 93efcad | 2015-08-17 14:33:31 -0700 | [diff] [blame] | 40 | int parse_notes_merge_strategy(const char *v, enum notes_merge_strategy *s); |
Johan Herland | 49c2470 | 2013-06-12 02:13:00 +0200 | [diff] [blame] | 41 | struct notes_rewrite_cfg *init_copy_notes_for_rewrite(const char *cmd); |
| 42 | int copy_note_for_rewrite(struct notes_rewrite_cfg *c, |
brian m. carlson | bb7e473 | 2017-05-30 10:30:42 -0700 | [diff] [blame] | 43 | const struct object_id *from_obj, const struct object_id *to_obj); |
Johan Herland | 49c2470 | 2013-06-12 02:13:00 +0200 | [diff] [blame] | 44 | void finish_copy_notes_for_rewrite(struct notes_rewrite_cfg *c, const char *msg); |
| 45 | |
| 46 | #endif |