blob: d7d18e30f5a281278aa87fd64a4e47da8410a5eb [file] [log] [blame]
Johan Herland49c24702013-06-12 02:13:00 +02001#include "cache.h"
Brandon Williamsb2141fc2017-06-14 11:07:36 -07002#include "config.h"
Johan Herland49c24702013-06-12 02:13:00 +02003#include "commit.h"
4#include "refs.h"
5#include "notes-utils.h"
Stefan Bellerc1f5eb42018-06-28 18:21:59 -07006#include "repository.h"
Johan Herlandbf9a05b2013-06-12 02:13:01 +02007
Nguyễn Thái Ngọc Duy1d18d752019-01-12 09:13:23 +07008void create_notes_commit(struct repository *r,
9 struct notes_tree *t,
10 struct commit_list *parents,
Jeff King3ffefb52014-06-10 17:36:52 -040011 const char *msg, size_t msg_len,
Patryk Obara5078f342018-01-28 01:13:16 +010012 struct object_id *result_oid)
Johan Herlandbf9a05b2013-06-12 02:13:01 +020013{
brian m. carlson18b74e52017-05-06 22:10:04 +000014 struct object_id tree_oid;
Johan Herlandbf9a05b2013-06-12 02:13:01 +020015
16 assert(t->initialized);
17
Patryk Obarabbca96d2018-01-28 01:13:18 +010018 if (write_notes_tree(t, &tree_oid))
Johan Herlandbf9a05b2013-06-12 02:13:01 +020019 die("Failed to write notes tree to database");
20
21 if (!parents) {
22 /* Deduce parent commit from t->ref */
brian m. carlson18b74e52017-05-06 22:10:04 +000023 struct object_id parent_oid;
brian m. carlson34c290a2017-10-15 22:06:56 +000024 if (!read_ref(t->ref, &parent_oid)) {
Nguyễn Thái Ngọc Duy1d18d752019-01-12 09:13:23 +070025 struct commit *parent = lookup_commit(r, &parent_oid);
Jeff King5e7d4d32013-10-24 04:53:19 -040026 if (parse_commit(parent))
Johan Herlandbf9a05b2013-06-12 02:13:01 +020027 die("Failed to find/parse commit %s", t->ref);
28 commit_list_insert(parent, &parents);
29 }
30 /* else: t->ref points to nothing, assume root/orphan commit */
31 }
32
Patryk Obara5078f342018-01-28 01:13:16 +010033 if (commit_tree(msg, msg_len, &tree_oid, parents, result_oid, NULL,
34 NULL))
Johan Herlandbf9a05b2013-06-12 02:13:01 +020035 die("Failed to commit notes tree to database");
36}
Johan Herland49c24702013-06-12 02:13:00 +020037
Nguyễn Thái Ngọc Duy1d18d752019-01-12 09:13:23 +070038void commit_notes(struct repository *r, struct notes_tree *t, const char *msg)
Johan Herland49c24702013-06-12 02:13:00 +020039{
40 struct strbuf buf = STRBUF_INIT;
brian m. carlson18b74e52017-05-06 22:10:04 +000041 struct object_id commit_oid;
Johan Herland49c24702013-06-12 02:13:00 +020042
43 if (!t)
44 t = &default_notes_tree;
Mike Hommeyee76f922015-10-08 11:54:43 +090045 if (!t->initialized || !t->update_ref || !*t->update_ref)
Johan Herland49c24702013-06-12 02:13:00 +020046 die(_("Cannot commit uninitialized/unreferenced notes tree"));
47 if (!t->dirty)
48 return; /* don't have to commit an unchanged tree */
49
50 /* Prepare commit message and reflog message */
51 strbuf_addstr(&buf, msg);
René Scharfea0d49232014-12-12 20:16:38 +010052 strbuf_complete_line(&buf);
Johan Herland49c24702013-06-12 02:13:00 +020053
Nguyễn Thái Ngọc Duy1d18d752019-01-12 09:13:23 +070054 create_notes_commit(r, t, NULL, buf.buf, buf.len, &commit_oid);
René Scharfea91cc7f2020-02-09 14:44:23 +010055 strbuf_insertstr(&buf, 0, "notes: ");
brian m. carlsonae077772017-10-15 22:06:51 +000056 update_ref(buf.buf, t->update_ref, &commit_oid, NULL, 0,
Michael Haggertyf4124112014-04-07 15:47:56 +020057 UPDATE_REFS_DIE_ON_ERR);
Johan Herland49c24702013-06-12 02:13:00 +020058
59 strbuf_release(&buf);
60}
61
Jacob Keller93efcad2015-08-17 14:33:31 -070062int parse_notes_merge_strategy(const char *v, enum notes_merge_strategy *s)
63{
64 if (!strcmp(v, "manual"))
65 *s = NOTES_MERGE_RESOLVE_MANUAL;
66 else if (!strcmp(v, "ours"))
67 *s = NOTES_MERGE_RESOLVE_OURS;
68 else if (!strcmp(v, "theirs"))
69 *s = NOTES_MERGE_RESOLVE_THEIRS;
70 else if (!strcmp(v, "union"))
71 *s = NOTES_MERGE_RESOLVE_UNION;
72 else if (!strcmp(v, "cat_sort_uniq"))
73 *s = NOTES_MERGE_RESOLVE_CAT_SORT_UNIQ;
74 else
75 return -1;
76
77 return 0;
78}
79
Johan Herland49c24702013-06-12 02:13:00 +020080static combine_notes_fn parse_combine_notes_fn(const char *v)
81{
82 if (!strcasecmp(v, "overwrite"))
83 return combine_notes_overwrite;
84 else if (!strcasecmp(v, "ignore"))
85 return combine_notes_ignore;
86 else if (!strcasecmp(v, "concatenate"))
87 return combine_notes_concatenate;
88 else if (!strcasecmp(v, "cat_sort_uniq"))
89 return combine_notes_cat_sort_uniq;
90 else
91 return NULL;
92}
93
94static int notes_rewrite_config(const char *k, const char *v, void *cb)
95{
96 struct notes_rewrite_cfg *c = cb;
Christian Couder59556542013-11-30 21:55:40 +010097 if (starts_with(k, "notes.rewrite.") && !strcmp(k+14, c->cmd)) {
Johan Herland49c24702013-06-12 02:13:00 +020098 c->enabled = git_config_bool(k, v);
99 return 0;
100 } else if (!c->mode_from_env && !strcmp(k, "notes.rewritemode")) {
101 if (!v)
John Keepingaa012e92014-02-16 16:06:02 +0000102 return config_error_nonbool(k);
Johan Herland49c24702013-06-12 02:13:00 +0200103 c->combine = parse_combine_notes_fn(v);
104 if (!c->combine) {
105 error(_("Bad notes.rewriteMode value: '%s'"), v);
106 return 1;
107 }
108 return 0;
109 } else if (!c->refs_from_env && !strcmp(k, "notes.rewriteref")) {
110 /* note that a refs/ prefix is implied in the
111 * underlying for_each_glob_ref */
Christian Couder59556542013-11-30 21:55:40 +0100112 if (starts_with(v, "refs/notes/"))
Johan Herland49c24702013-06-12 02:13:00 +0200113 string_list_add_refs_by_glob(c->refs, v);
114 else
115 warning(_("Refusing to rewrite notes in %s"
116 " (outside of refs/notes/)"), v);
117 return 0;
118 }
119
120 return 0;
121}
122
123
124struct notes_rewrite_cfg *init_copy_notes_for_rewrite(const char *cmd)
125{
126 struct notes_rewrite_cfg *c = xmalloc(sizeof(struct notes_rewrite_cfg));
127 const char *rewrite_mode_env = getenv(GIT_NOTES_REWRITE_MODE_ENVIRONMENT);
128 const char *rewrite_refs_env = getenv(GIT_NOTES_REWRITE_REF_ENVIRONMENT);
129 c->cmd = cmd;
130 c->enabled = 1;
131 c->combine = combine_notes_concatenate;
René Scharfeca56dad2021-03-13 17:17:22 +0100132 CALLOC_ARRAY(c->refs, 1);
Johan Herland49c24702013-06-12 02:13:00 +0200133 c->refs->strdup_strings = 1;
134 c->refs_from_env = 0;
135 c->mode_from_env = 0;
136 if (rewrite_mode_env) {
137 c->mode_from_env = 1;
138 c->combine = parse_combine_notes_fn(rewrite_mode_env);
139 if (!c->combine)
Ævar Arnfjörð Bjarmason66f5f6d2017-05-11 21:20:12 +0000140 /*
141 * TRANSLATORS: The first %s is the name of
142 * the environment variable, the second %s is
143 * its value.
144 */
Johan Herland49c24702013-06-12 02:13:00 +0200145 error(_("Bad %s value: '%s'"), GIT_NOTES_REWRITE_MODE_ENVIRONMENT,
146 rewrite_mode_env);
147 }
148 if (rewrite_refs_env) {
149 c->refs_from_env = 1;
150 string_list_add_refs_from_colon_sep(c->refs, rewrite_refs_env);
151 }
152 git_config(notes_rewrite_config, c);
153 if (!c->enabled || !c->refs->nr) {
154 string_list_clear(c->refs, 0);
155 free(c->refs);
156 free(c);
157 return NULL;
158 }
Mike Hommeyee76f922015-10-08 11:54:43 +0900159 c->trees = load_notes_trees(c->refs, NOTES_INIT_WRITABLE);
Johan Herland49c24702013-06-12 02:13:00 +0200160 string_list_clear(c->refs, 0);
161 free(c->refs);
162 return c;
163}
164
165int copy_note_for_rewrite(struct notes_rewrite_cfg *c,
brian m. carlsonbb7e4732017-05-30 10:30:42 -0700166 const struct object_id *from_obj, const struct object_id *to_obj)
Johan Herland49c24702013-06-12 02:13:00 +0200167{
168 int ret = 0;
169 int i;
170 for (i = 0; c->trees[i]; i++)
171 ret = copy_note(c->trees[i], from_obj, to_obj, 1, c->combine) || ret;
172 return ret;
173}
174
Nguyễn Thái Ngọc Duy1d18d752019-01-12 09:13:23 +0700175void finish_copy_notes_for_rewrite(struct repository *r,
176 struct notes_rewrite_cfg *c,
177 const char *msg)
Johan Herland49c24702013-06-12 02:13:00 +0200178{
179 int i;
180 for (i = 0; c->trees[i]; i++) {
Nguyễn Thái Ngọc Duy1d18d752019-01-12 09:13:23 +0700181 commit_notes(r, c->trees[i], msg);
Johan Herland49c24702013-06-12 02:13:00 +0200182 free_notes(c->trees[i]);
183 }
184 free(c->trees);
185 free(c);
186}