blob: 5e32548cdd89fa6a45f731dc9cae1bfca4955a0e [file] [log] [blame]
Johan Herlandcd067d32010-02-13 22:28:20 +01001/*
2 * Builtin "git notes"
3 *
4 * Copyright (c) 2010 Johan Herland <johan@herland.net>
5 *
6 * Based on git-notes.sh by Johannes Schindelin,
7 * and builtin-tag.c by Kristian Høgsberg and Carlos Rica.
8 */
9
10#include "cache.h"
11#include "builtin.h"
12#include "notes.h"
13#include "blob.h"
14#include "commit.h"
15#include "refs.h"
16#include "exec_cmd.h"
17#include "run-command.h"
18#include "parse-options.h"
Thomas Rast6956f852010-03-12 18:04:32 +010019#include "string-list.h"
Johan Herland75ef3f42010-11-09 22:49:46 +010020#include "notes-merge.h"
Johan Herlandcd067d32010-02-13 22:28:20 +010021
22static const char * const git_notes_usage[] = {
Stephen Boyd74884b52010-02-27 00:59:22 -080023 "git notes [--ref <notes_ref>] [list [<object>]]",
24 "git notes [--ref <notes_ref>] add [-f] [-m <msg> | -F <file> | (-c | -C) <object>] [<object>]",
25 "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>",
26 "git notes [--ref <notes_ref>] append [-m <msg> | -F <file> | (-c | -C) <object>] [<object>]",
27 "git notes [--ref <notes_ref>] edit [<object>]",
28 "git notes [--ref <notes_ref>] show [<object>]",
Johan Herland3228e672010-11-15 00:55:12 +010029 "git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>",
Johan Herland6abb3652010-11-09 22:49:52 +010030 "git notes merge --commit [-v | -q]",
31 "git notes merge --abort [-v | -q]",
Junio C Hamanoc3ab1a82011-05-18 15:44:37 -070032 "git notes [--ref <notes_ref>] remove [<object>...]",
Michael J Grubera9f2adf2010-05-14 23:42:07 +020033 "git notes [--ref <notes_ref>] prune [-n | -v]",
Johan Herland618cd752010-11-09 22:49:57 +010034 "git notes [--ref <notes_ref>] get-ref",
Stephen Boyd74884b52010-02-27 00:59:22 -080035 NULL
36};
37
38static const char * const git_notes_list_usage[] = {
Johan Herlande3974212010-02-13 22:28:30 +010039 "git notes [list [<object>]]",
Stephen Boyd74884b52010-02-27 00:59:22 -080040 NULL
41};
42
43static const char * const git_notes_add_usage[] = {
44 "git notes add [<options>] [<object>]",
45 NULL
46};
47
48static const char * const git_notes_copy_usage[] = {
49 "git notes copy [<options>] <from-object> <to-object>",
50 "git notes copy --stdin [<from-object> <to-object>]...",
51 NULL
52};
53
54static const char * const git_notes_append_usage[] = {
55 "git notes append [<options>] [<object>]",
56 NULL
57};
58
59static const char * const git_notes_edit_usage[] = {
Johan Herlandaaec9bc2010-02-13 22:28:34 +010060 "git notes edit [<object>]",
Stephen Boyd74884b52010-02-27 00:59:22 -080061 NULL
62};
63
64static const char * const git_notes_show_usage[] = {
Johan Herlandcd067d32010-02-13 22:28:20 +010065 "git notes show [<object>]",
Stephen Boyd74884b52010-02-27 00:59:22 -080066 NULL
67};
68
Johan Herland75ef3f42010-11-09 22:49:46 +010069static const char * const git_notes_merge_usage[] = {
70 "git notes merge [<options>] <notes_ref>",
Johan Herland6abb3652010-11-09 22:49:52 +010071 "git notes merge --commit [<options>]",
72 "git notes merge --abort [<options>]",
Johan Herland75ef3f42010-11-09 22:49:46 +010073 NULL
74};
75
Stephen Boyd74884b52010-02-27 00:59:22 -080076static const char * const git_notes_remove_usage[] = {
Johan Herland92b33852010-02-13 22:28:25 +010077 "git notes remove [<object>]",
Stephen Boyd74884b52010-02-27 00:59:22 -080078 NULL
79};
80
81static const char * const git_notes_prune_usage[] = {
Michael J Grubera9f2adf2010-05-14 23:42:07 +020082 "git notes prune [<options>]",
Johan Herlandcd067d32010-02-13 22:28:20 +010083 NULL
84};
85
Johan Herland618cd752010-11-09 22:49:57 +010086static const char * const git_notes_get_ref_usage[] = {
87 "git notes get-ref",
88 NULL
89};
90
Johan Herlandcd067d32010-02-13 22:28:20 +010091static const char note_template[] =
92 "\n"
93 "#\n"
94 "# Write/edit the notes for the following object:\n"
95 "#\n";
96
Johan Herland348f1992010-02-13 22:28:35 +010097struct msg_arg {
98 int given;
Johan Herland0691cff2010-02-13 22:28:36 +010099 int use_editor;
Johan Herland348f1992010-02-13 22:28:35 +0100100 struct strbuf buf;
101};
102
Johan Herlande3974212010-02-13 22:28:30 +0100103static int list_each_note(const unsigned char *object_sha1,
104 const unsigned char *note_sha1, char *note_path,
105 void *cb_data)
106{
107 printf("%s %s\n", sha1_to_hex(note_sha1), sha1_to_hex(object_sha1));
108 return 0;
109}
110
Johan Herlandcd067d32010-02-13 22:28:20 +0100111static void write_note_data(int fd, const unsigned char *sha1)
112{
113 unsigned long size;
114 enum object_type type;
115 char *buf = read_sha1_file(sha1, &type, &size);
116 if (buf) {
117 if (size)
118 write_or_die(fd, buf, size);
119 free(buf);
120 }
121}
122
123static void write_commented_object(int fd, const unsigned char *object)
124{
125 const char *show_args[5] =
126 {"show", "--stat", "--no-notes", sha1_to_hex(object), NULL};
127 struct child_process show;
128 struct strbuf buf = STRBUF_INIT;
129 FILE *show_out;
130
131 /* Invoke "git show --stat --no-notes $object" */
132 memset(&show, 0, sizeof(show));
133 show.argv = show_args;
134 show.no_stdin = 1;
135 show.out = -1;
136 show.err = 0;
137 show.git_cmd = 1;
138 if (start_command(&show))
Ævar Arnfjörð Bjarmasoncaeba0e2011-02-22 23:42:26 +0000139 die(_("unable to start 'show' for object '%s'"),
Johan Herlandcd067d32010-02-13 22:28:20 +0100140 sha1_to_hex(object));
141
142 /* Open the output as FILE* so strbuf_getline() can be used. */
143 show_out = xfdopen(show.out, "r");
144 if (show_out == NULL)
Ævar Arnfjörð Bjarmasoncaeba0e2011-02-22 23:42:26 +0000145 die_errno(_("can't fdopen 'show' output fd"));
Johan Herlandcd067d32010-02-13 22:28:20 +0100146
147 /* Prepend "# " to each output line and write result to 'fd' */
148 while (strbuf_getline(&buf, show_out, '\n') != EOF) {
149 write_or_die(fd, "# ", 2);
150 write_or_die(fd, buf.buf, buf.len);
151 write_or_die(fd, "\n", 1);
152 }
153 strbuf_release(&buf);
154 if (fclose(show_out))
Ævar Arnfjörð Bjarmasoncaeba0e2011-02-22 23:42:26 +0000155 die_errno(_("failed to close pipe to 'show' for object '%s'"),
Johan Herlandcd067d32010-02-13 22:28:20 +0100156 sha1_to_hex(object));
157 if (finish_command(&show))
Ævar Arnfjörð Bjarmasoncaeba0e2011-02-22 23:42:26 +0000158 die(_("failed to finish 'show' for object '%s'"),
Johan Herlandcd067d32010-02-13 22:28:20 +0100159 sha1_to_hex(object));
160}
161
Johan Herland348f1992010-02-13 22:28:35 +0100162static void create_note(const unsigned char *object, struct msg_arg *msg,
163 int append_only, const unsigned char *prev,
Johan Herlandcd067d32010-02-13 22:28:20 +0100164 unsigned char *result)
165{
166 char *path = NULL;
167
Johan Herland0691cff2010-02-13 22:28:36 +0100168 if (msg->use_editor || !msg->given) {
Johan Herlandcd067d32010-02-13 22:28:20 +0100169 int fd;
170
171 /* write the template message before editing: */
172 path = git_pathdup("NOTES_EDITMSG");
173 fd = open(path, O_CREAT | O_TRUNC | O_WRONLY, 0600);
174 if (fd < 0)
Ævar Arnfjörð Bjarmasoncaeba0e2011-02-22 23:42:26 +0000175 die_errno(_("could not create file '%s'"), path);
Johan Herlandcd067d32010-02-13 22:28:20 +0100176
Johan Herland0691cff2010-02-13 22:28:36 +0100177 if (msg->given)
178 write_or_die(fd, msg->buf.buf, msg->buf.len);
179 else if (prev && !append_only)
Johan Herlandcd067d32010-02-13 22:28:20 +0100180 write_note_data(fd, prev);
181 write_or_die(fd, note_template, strlen(note_template));
182
183 write_commented_object(fd, object);
184
185 close(fd);
Johan Herland0691cff2010-02-13 22:28:36 +0100186 strbuf_reset(&(msg->buf));
Johan Herlandcd067d32010-02-13 22:28:20 +0100187
Johan Herland348f1992010-02-13 22:28:35 +0100188 if (launch_editor(path, &(msg->buf), NULL)) {
Ævar Arnfjörð Bjarmasoncaeba0e2011-02-22 23:42:26 +0000189 die(_("Please supply the note contents using either -m" \
190 " or -F option"));
Johan Herlandcd067d32010-02-13 22:28:20 +0100191 }
Johan Herland348f1992010-02-13 22:28:35 +0100192 stripspace(&(msg->buf), 1);
Johan Herlandcd067d32010-02-13 22:28:20 +0100193 }
194
Johan Herland2347fae2010-02-13 22:28:33 +0100195 if (prev && append_only) {
196 /* Append buf to previous note contents */
197 unsigned long size;
198 enum object_type type;
199 char *prev_buf = read_sha1_file(prev, &type, &size);
200
Johan Herland348f1992010-02-13 22:28:35 +0100201 strbuf_grow(&(msg->buf), size + 1);
202 if (msg->buf.len && prev_buf && size)
203 strbuf_insert(&(msg->buf), 0, "\n", 1);
Johan Herland2347fae2010-02-13 22:28:33 +0100204 if (prev_buf && size)
Johan Herland348f1992010-02-13 22:28:35 +0100205 strbuf_insert(&(msg->buf), 0, prev_buf, size);
Johan Herland2347fae2010-02-13 22:28:33 +0100206 free(prev_buf);
207 }
208
Johan Herland348f1992010-02-13 22:28:35 +0100209 if (!msg->buf.len) {
Ævar Arnfjörð Bjarmasoncaeba0e2011-02-22 23:42:26 +0000210 fprintf(stderr, _("Removing note for object %s\n"),
Johan Herlandcd067d32010-02-13 22:28:20 +0100211 sha1_to_hex(object));
212 hashclr(result);
213 } else {
Johan Herland348f1992010-02-13 22:28:35 +0100214 if (write_sha1_file(msg->buf.buf, msg->buf.len, blob_type, result)) {
Ævar Arnfjörð Bjarmasoncaeba0e2011-02-22 23:42:26 +0000215 error(_("unable to write note object"));
Johan Herlandcd067d32010-02-13 22:28:20 +0100216 if (path)
Ævar Arnfjörð Bjarmasoncaeba0e2011-02-22 23:42:26 +0000217 error(_("The note contents has been left in %s"),
Johan Herlandcd067d32010-02-13 22:28:20 +0100218 path);
219 exit(128);
220 }
221 }
222
223 if (path) {
224 unlink_or_warn(path);
225 free(path);
226 }
227}
228
Johan Herlandcd067d32010-02-13 22:28:20 +0100229static int parse_msg_arg(const struct option *opt, const char *arg, int unset)
230{
231 struct msg_arg *msg = opt->value;
232
Johan Herland348f1992010-02-13 22:28:35 +0100233 strbuf_grow(&(msg->buf), strlen(arg) + 2);
Johan Herlandcd067d32010-02-13 22:28:20 +0100234 if (msg->buf.len)
Johan Herland43a61b82010-02-25 01:48:11 +0100235 strbuf_addch(&(msg->buf), '\n');
Johan Herlandcd067d32010-02-13 22:28:20 +0100236 strbuf_addstr(&(msg->buf), arg);
Johan Herland348f1992010-02-13 22:28:35 +0100237 stripspace(&(msg->buf), 0);
238
239 msg->given = 1;
240 return 0;
241}
242
243static int parse_file_arg(const struct option *opt, const char *arg, int unset)
244{
245 struct msg_arg *msg = opt->value;
246
Johan Herland348f1992010-02-13 22:28:35 +0100247 if (msg->buf.len)
Johan Herland43a61b82010-02-25 01:48:11 +0100248 strbuf_addch(&(msg->buf), '\n');
Johan Herland348f1992010-02-13 22:28:35 +0100249 if (!strcmp(arg, "-")) {
250 if (strbuf_read(&(msg->buf), 0, 1024) < 0)
Ævar Arnfjörð Bjarmasoncaeba0e2011-02-22 23:42:26 +0000251 die_errno(_("cannot read '%s'"), arg);
Johan Herland348f1992010-02-13 22:28:35 +0100252 } else if (strbuf_read_file(&(msg->buf), arg, 1024) < 0)
Ævar Arnfjörð Bjarmasoncaeba0e2011-02-22 23:42:26 +0000253 die_errno(_("could not open or read '%s'"), arg);
Johan Herland348f1992010-02-13 22:28:35 +0100254 stripspace(&(msg->buf), 0);
255
Johan Herlandcd067d32010-02-13 22:28:20 +0100256 msg->given = 1;
257 return 0;
258}
259
Johan Herland0691cff2010-02-13 22:28:36 +0100260static int parse_reuse_arg(const struct option *opt, const char *arg, int unset)
261{
262 struct msg_arg *msg = opt->value;
263 char *buf;
264 unsigned char object[20];
265 enum object_type type;
266 unsigned long len;
267
Johan Herland0691cff2010-02-13 22:28:36 +0100268 if (msg->buf.len)
Johan Herland43a61b82010-02-25 01:48:11 +0100269 strbuf_addch(&(msg->buf), '\n');
Johan Herland0691cff2010-02-13 22:28:36 +0100270
271 if (get_sha1(arg, object))
Ævar Arnfjörð Bjarmasoncaeba0e2011-02-22 23:42:26 +0000272 die(_("Failed to resolve '%s' as a valid ref."), arg);
Johan Herland0691cff2010-02-13 22:28:36 +0100273 if (!(buf = read_sha1_file(object, &type, &len)) || !len) {
274 free(buf);
Ævar Arnfjörð Bjarmasoncaeba0e2011-02-22 23:42:26 +0000275 die(_("Failed to read object '%s'."), arg);;
Johan Herland0691cff2010-02-13 22:28:36 +0100276 }
277 strbuf_add(&(msg->buf), buf, len);
278 free(buf);
279
280 msg->given = 1;
281 return 0;
282}
283
284static int parse_reedit_arg(const struct option *opt, const char *arg, int unset)
285{
286 struct msg_arg *msg = opt->value;
287 msg->use_editor = 1;
288 return parse_reuse_arg(opt, arg, unset);
289}
290
Johan Herland56881842010-11-09 22:49:47 +0100291void commit_notes(struct notes_tree *t, const char *msg)
Johan Herlandcd067d32010-02-13 22:28:20 +0100292{
Johan Herlandcd067d32010-02-13 22:28:20 +0100293 struct strbuf buf = STRBUF_INIT;
Johan Herland56881842010-11-09 22:49:47 +0100294 unsigned char commit_sha1[20];
Johan Herlandcd067d32010-02-13 22:28:20 +0100295
296 if (!t)
297 t = &default_notes_tree;
298 if (!t->initialized || !t->ref || !*t->ref)
Ævar Arnfjörð Bjarmasoncaeba0e2011-02-22 23:42:26 +0000299 die(_("Cannot commit uninitialized/unreferenced notes tree"));
Thomas Rast7f710ea2010-03-12 18:04:36 +0100300 if (!t->dirty)
Johan Herland56881842010-11-09 22:49:47 +0100301 return; /* don't have to commit an unchanged tree */
Johan Herlandcd067d32010-02-13 22:28:20 +0100302
303 /* Prepare commit message and reflog message */
Johan Herlandcd067d32010-02-13 22:28:20 +0100304 strbuf_addstr(&buf, msg);
305 if (buf.buf[buf.len - 1] != '\n')
306 strbuf_addch(&buf, '\n'); /* Make sure msg ends with newline */
307
Nguyễn Thái Ngọc Duy13f8b722011-12-15 20:47:22 +0700308 create_notes_commit(t, NULL, &buf, commit_sha1);
309 strbuf_insert(&buf, 0, "notes: ", 7); /* commit message starts at index 7 */
Johan Herland56881842010-11-09 22:49:47 +0100310 update_ref(buf.buf, t->ref, commit_sha1, NULL, 0, DIE_ON_ERR);
Johan Herlandcd067d32010-02-13 22:28:20 +0100311
312 strbuf_release(&buf);
Johan Herlandcd067d32010-02-13 22:28:20 +0100313}
314
Ramsay Jones4e0d7a82010-06-23 20:40:19 +0100315combine_notes_fn parse_combine_notes_fn(const char *v)
Thomas Rast6956f852010-03-12 18:04:32 +0100316{
317 if (!strcasecmp(v, "overwrite"))
318 return combine_notes_overwrite;
319 else if (!strcasecmp(v, "ignore"))
320 return combine_notes_ignore;
321 else if (!strcasecmp(v, "concatenate"))
322 return combine_notes_concatenate;
Johan Herlanda6a09092010-11-15 00:57:17 +0100323 else if (!strcasecmp(v, "cat_sort_uniq"))
324 return combine_notes_cat_sort_uniq;
Thomas Rast6956f852010-03-12 18:04:32 +0100325 else
326 return NULL;
327}
328
329static int notes_rewrite_config(const char *k, const char *v, void *cb)
330{
331 struct notes_rewrite_cfg *c = cb;
332 if (!prefixcmp(k, "notes.rewrite.") && !strcmp(k+14, c->cmd)) {
333 c->enabled = git_config_bool(k, v);
334 return 0;
335 } else if (!c->mode_from_env && !strcmp(k, "notes.rewritemode")) {
336 if (!v)
337 config_error_nonbool(k);
338 c->combine = parse_combine_notes_fn(v);
339 if (!c->combine) {
Ævar Arnfjörð Bjarmasoncaeba0e2011-02-22 23:42:26 +0000340 error(_("Bad notes.rewriteMode value: '%s'"), v);
Thomas Rast6956f852010-03-12 18:04:32 +0100341 return 1;
342 }
343 return 0;
344 } else if (!c->refs_from_env && !strcmp(k, "notes.rewriteref")) {
345 /* note that a refs/ prefix is implied in the
346 * underlying for_each_glob_ref */
347 if (!prefixcmp(v, "refs/notes/"))
348 string_list_add_refs_by_glob(c->refs, v);
349 else
Ævar Arnfjörð Bjarmasoncaeba0e2011-02-22 23:42:26 +0000350 warning(_("Refusing to rewrite notes in %s"
351 " (outside of refs/notes/)"), v);
Thomas Rast6956f852010-03-12 18:04:32 +0100352 return 0;
353 }
354
355 return 0;
356}
357
358
359struct notes_rewrite_cfg *init_copy_notes_for_rewrite(const char *cmd)
360{
361 struct notes_rewrite_cfg *c = xmalloc(sizeof(struct notes_rewrite_cfg));
362 const char *rewrite_mode_env = getenv(GIT_NOTES_REWRITE_MODE_ENVIRONMENT);
363 const char *rewrite_refs_env = getenv(GIT_NOTES_REWRITE_REF_ENVIRONMENT);
364 c->cmd = cmd;
365 c->enabled = 1;
366 c->combine = combine_notes_concatenate;
367 c->refs = xcalloc(1, sizeof(struct string_list));
368 c->refs->strdup_strings = 1;
369 c->refs_from_env = 0;
370 c->mode_from_env = 0;
371 if (rewrite_mode_env) {
372 c->mode_from_env = 1;
373 c->combine = parse_combine_notes_fn(rewrite_mode_env);
374 if (!c->combine)
Ævar Arnfjörð Bjarmasone3bd7582011-02-22 23:42:27 +0000375 /* TRANSLATORS: The first %s is the name of the
376 environment variable, the second %s is its value */
377 error(_("Bad %s value: '%s'"), GIT_NOTES_REWRITE_MODE_ENVIRONMENT,
378 rewrite_mode_env);
Thomas Rast6956f852010-03-12 18:04:32 +0100379 }
380 if (rewrite_refs_env) {
381 c->refs_from_env = 1;
382 string_list_add_refs_from_colon_sep(c->refs, rewrite_refs_env);
383 }
384 git_config(notes_rewrite_config, c);
385 if (!c->enabled || !c->refs->nr) {
386 string_list_clear(c->refs, 0);
387 free(c->refs);
388 free(c);
389 return NULL;
390 }
391 c->trees = load_notes_trees(c->refs);
392 string_list_clear(c->refs, 0);
393 free(c->refs);
394 return c;
395}
396
397int copy_note_for_rewrite(struct notes_rewrite_cfg *c,
398 const unsigned char *from_obj, const unsigned char *to_obj)
399{
400 int ret = 0;
401 int i;
402 for (i = 0; c->trees[i]; i++)
403 ret = copy_note(c->trees[i], from_obj, to_obj, 1, c->combine) || ret;
404 return ret;
405}
406
407void finish_copy_notes_for_rewrite(struct notes_rewrite_cfg *c)
408{
409 int i;
410 for (i = 0; c->trees[i]; i++) {
411 commit_notes(c->trees[i], "Notes added by 'git notes copy'");
412 free_notes(c->trees[i]);
413 }
414 free(c->trees);
415 free(c);
416}
417
Stephen Boydc2e86ad2011-03-22 00:51:05 -0700418static int notes_copy_from_stdin(int force, const char *rewrite_cmd)
Thomas Rast160baa02010-03-12 18:04:31 +0100419{
420 struct strbuf buf = STRBUF_INIT;
Thomas Rast6956f852010-03-12 18:04:32 +0100421 struct notes_rewrite_cfg *c = NULL;
Ævar Arnfjörð Bjarmasonef7a8e32010-06-14 23:40:05 +0000422 struct notes_tree *t = NULL;
Thomas Rast160baa02010-03-12 18:04:31 +0100423 int ret = 0;
424
Thomas Rast6956f852010-03-12 18:04:32 +0100425 if (rewrite_cmd) {
426 c = init_copy_notes_for_rewrite(rewrite_cmd);
427 if (!c)
428 return 0;
429 } else {
430 init_notes(NULL, NULL, NULL, 0);
431 t = &default_notes_tree;
432 }
Thomas Rast160baa02010-03-12 18:04:31 +0100433
434 while (strbuf_getline(&buf, stdin, '\n') != EOF) {
435 unsigned char from_obj[20], to_obj[20];
436 struct strbuf **split;
437 int err;
438
439 split = strbuf_split(&buf, ' ');
440 if (!split[0] || !split[1])
Ævar Arnfjörð Bjarmasoncaeba0e2011-02-22 23:42:26 +0000441 die(_("Malformed input line: '%s'."), buf.buf);
Thomas Rast160baa02010-03-12 18:04:31 +0100442 strbuf_rtrim(split[0]);
443 strbuf_rtrim(split[1]);
444 if (get_sha1(split[0]->buf, from_obj))
Ævar Arnfjörð Bjarmasoncaeba0e2011-02-22 23:42:26 +0000445 die(_("Failed to resolve '%s' as a valid ref."), split[0]->buf);
Thomas Rast160baa02010-03-12 18:04:31 +0100446 if (get_sha1(split[1]->buf, to_obj))
Ævar Arnfjörð Bjarmasoncaeba0e2011-02-22 23:42:26 +0000447 die(_("Failed to resolve '%s' as a valid ref."), split[1]->buf);
Thomas Rast160baa02010-03-12 18:04:31 +0100448
Thomas Rast6956f852010-03-12 18:04:32 +0100449 if (rewrite_cmd)
450 err = copy_note_for_rewrite(c, from_obj, to_obj);
451 else
452 err = copy_note(t, from_obj, to_obj, force,
453 combine_notes_overwrite);
Thomas Rast160baa02010-03-12 18:04:31 +0100454
455 if (err) {
Ævar Arnfjörð Bjarmasoncaeba0e2011-02-22 23:42:26 +0000456 error(_("Failed to copy notes from '%s' to '%s'"),
Thomas Rast160baa02010-03-12 18:04:31 +0100457 split[0]->buf, split[1]->buf);
458 ret = 1;
459 }
460
461 strbuf_list_free(split);
462 }
463
Thomas Rast6956f852010-03-12 18:04:32 +0100464 if (!rewrite_cmd) {
465 commit_notes(t, "Notes added by 'git notes copy'");
466 free_notes(t);
467 } else {
468 finish_copy_notes_for_rewrite(c);
469 }
Thomas Rast160baa02010-03-12 18:04:31 +0100470 return ret;
471}
472
Stephen Boyd74884b52010-02-27 00:59:22 -0800473static struct notes_tree *init_notes_check(const char *subcommand)
Johan Herlandcd067d32010-02-13 22:28:20 +0100474{
Johan Herlandcd067d32010-02-13 22:28:20 +0100475 struct notes_tree *t;
Stephen Boyd74884b52010-02-27 00:59:22 -0800476 init_notes(NULL, NULL, NULL, 0);
477 t = &default_notes_tree;
Johan Herlanda0b4dfa2010-02-13 22:28:24 +0100478
Stephen Boyd74884b52010-02-27 00:59:22 -0800479 if (prefixcmp(t->ref, "refs/notes/"))
480 die("Refusing to %s notes in %s (outside of refs/notes/)",
481 subcommand, t->ref);
482 return t;
483}
484
485static int list(int argc, const char **argv, const char *prefix)
486{
487 struct notes_tree *t;
488 unsigned char object[20];
489 const unsigned char *note;
490 int retval = -1;
Johan Herlandcd067d32010-02-13 22:28:20 +0100491 struct option options[] = {
Stephen Boyd74884b52010-02-27 00:59:22 -0800492 OPT_END()
493 };
494
495 if (argc)
496 argc = parse_options(argc, argv, prefix, options,
497 git_notes_list_usage, 0);
498
499 if (1 < argc) {
Ævar Arnfjörð Bjarmasoncaeba0e2011-02-22 23:42:26 +0000500 error(_("too many parameters"));
Stephen Boyd74884b52010-02-27 00:59:22 -0800501 usage_with_options(git_notes_list_usage, options);
502 }
503
504 t = init_notes_check("list");
505 if (argc) {
506 if (get_sha1(argv[0], object))
Ævar Arnfjörð Bjarmasoncaeba0e2011-02-22 23:42:26 +0000507 die(_("Failed to resolve '%s' as a valid ref."), argv[0]);
Stephen Boyd74884b52010-02-27 00:59:22 -0800508 note = get_note(t, object);
509 if (note) {
510 puts(sha1_to_hex(note));
511 retval = 0;
512 } else
Ævar Arnfjörð Bjarmasoncaeba0e2011-02-22 23:42:26 +0000513 retval = error(_("No note found for object %s."),
Stephen Boyd74884b52010-02-27 00:59:22 -0800514 sha1_to_hex(object));
515 } else
516 retval = for_each_note(t, 0, list_each_note, NULL);
517
518 free_notes(t);
519 return retval;
520}
521
Johan Herland84a7e352011-03-30 02:02:55 +0200522static int append_edit(int argc, const char **argv, const char *prefix);
523
Stephen Boyd74884b52010-02-27 00:59:22 -0800524static int add(int argc, const char **argv, const char *prefix)
525{
526 int retval = 0, force = 0;
527 const char *object_ref;
528 struct notes_tree *t;
529 unsigned char object[20], new_note[20];
530 char logmsg[100];
531 const unsigned char *note;
532 struct msg_arg msg = { 0, 0, STRBUF_INIT };
533 struct option options[] = {
Michael J Gruber23c6a802011-02-15 14:09:12 +0100534 { OPTION_CALLBACK, 'm', "message", &msg, "msg",
Johan Herland43a61b82010-02-25 01:48:11 +0100535 "note contents as a string", PARSE_OPT_NONEG,
536 parse_msg_arg},
Michael J Gruber23c6a802011-02-15 14:09:12 +0100537 { OPTION_CALLBACK, 'F', "file", &msg, "file",
Johan Herland43a61b82010-02-25 01:48:11 +0100538 "note contents in a file", PARSE_OPT_NONEG,
539 parse_file_arg},
Michael J Gruber23c6a802011-02-15 14:09:12 +0100540 { OPTION_CALLBACK, 'c', "reedit-message", &msg, "object",
Johan Herland43a61b82010-02-25 01:48:11 +0100541 "reuse and edit specified note object", PARSE_OPT_NONEG,
542 parse_reedit_arg},
Michael J Gruber23c6a802011-02-15 14:09:12 +0100543 { OPTION_CALLBACK, 'C', "reuse-message", &msg, "object",
Johan Herland43a61b82010-02-25 01:48:11 +0100544 "reuse specified note object", PARSE_OPT_NONEG,
545 parse_reuse_arg},
René Scharfe76946b72010-11-08 19:01:54 +0100546 OPT__FORCE(&force, "replace existing notes"),
Stephen Boyd74884b52010-02-27 00:59:22 -0800547 OPT_END()
548 };
549
550 argc = parse_options(argc, argv, prefix, options, git_notes_add_usage,
Johan Herland84a7e352011-03-30 02:02:55 +0200551 PARSE_OPT_KEEP_ARGV0);
Stephen Boyd74884b52010-02-27 00:59:22 -0800552
Johan Herland84a7e352011-03-30 02:02:55 +0200553 if (2 < argc) {
Ævar Arnfjörð Bjarmasoncaeba0e2011-02-22 23:42:26 +0000554 error(_("too many parameters"));
Stephen Boyd74884b52010-02-27 00:59:22 -0800555 usage_with_options(git_notes_add_usage, options);
556 }
557
Johan Herland84a7e352011-03-30 02:02:55 +0200558 object_ref = argc > 1 ? argv[1] : "HEAD";
Stephen Boyd74884b52010-02-27 00:59:22 -0800559
560 if (get_sha1(object_ref, object))
Ævar Arnfjörð Bjarmasoncaeba0e2011-02-22 23:42:26 +0000561 die(_("Failed to resolve '%s' as a valid ref."), object_ref);
Stephen Boyd74884b52010-02-27 00:59:22 -0800562
563 t = init_notes_check("add");
564 note = get_note(t, object);
565
566 if (note) {
567 if (!force) {
Johan Herland84a7e352011-03-30 02:02:55 +0200568 if (!msg.given) {
569 /*
570 * Redirect to "edit" subcommand.
571 *
572 * We only end up here if none of -m/-F/-c/-C
573 * or -f are given. The original args are
574 * therefore still in argv[0-1].
575 */
576 argv[0] = "edit";
577 free_notes(t);
578 return append_edit(argc, argv, prefix);
579 }
Ævar Arnfjörð Bjarmasoncaeba0e2011-02-22 23:42:26 +0000580 retval = error(_("Cannot add notes. Found existing notes "
Stephen Boyd74884b52010-02-27 00:59:22 -0800581 "for object %s. Use '-f' to overwrite "
Ævar Arnfjörð Bjarmasoncaeba0e2011-02-22 23:42:26 +0000582 "existing notes"), sha1_to_hex(object));
Stephen Boyd74884b52010-02-27 00:59:22 -0800583 goto out;
584 }
Ævar Arnfjörð Bjarmasoncaeba0e2011-02-22 23:42:26 +0000585 fprintf(stderr, _("Overwriting existing notes for object %s\n"),
Stephen Boyd74884b52010-02-27 00:59:22 -0800586 sha1_to_hex(object));
587 }
588
589 create_note(object, &msg, 0, note, new_note);
590
591 if (is_null_sha1(new_note))
592 remove_note(t, object);
Johan Herland180619a2010-11-15 00:52:26 +0100593 else if (add_note(t, object, new_note, combine_notes_overwrite))
594 die("BUG: combine_notes_overwrite failed");
Stephen Boyd74884b52010-02-27 00:59:22 -0800595
596 snprintf(logmsg, sizeof(logmsg), "Notes %s by 'git notes %s'",
597 is_null_sha1(new_note) ? "removed" : "added", "add");
598 commit_notes(t, logmsg);
599out:
600 free_notes(t);
601 strbuf_release(&(msg.buf));
602 return retval;
603}
604
605static int copy(int argc, const char **argv, const char *prefix)
606{
607 int retval = 0, force = 0, from_stdin = 0;
608 const unsigned char *from_note, *note;
609 const char *object_ref;
610 unsigned char object[20], from_obj[20];
611 struct notes_tree *t;
612 const char *rewrite_cmd = NULL;
613 struct option options[] = {
René Scharfe76946b72010-11-08 19:01:54 +0100614 OPT__FORCE(&force, "replace existing notes"),
Thomas Rast160baa02010-03-12 18:04:31 +0100615 OPT_BOOLEAN(0, "stdin", &from_stdin, "read objects from stdin"),
Stephen Boyd74884b52010-02-27 00:59:22 -0800616 OPT_STRING(0, "for-rewrite", &rewrite_cmd, "command",
617 "load rewriting config for <command> (implies "
618 "--stdin)"),
619 OPT_END()
620 };
621
622 argc = parse_options(argc, argv, prefix, options, git_notes_copy_usage,
623 0);
624
625 if (from_stdin || rewrite_cmd) {
626 if (argc) {
Ævar Arnfjörð Bjarmasoncaeba0e2011-02-22 23:42:26 +0000627 error(_("too many parameters"));
Stephen Boyd74884b52010-02-27 00:59:22 -0800628 usage_with_options(git_notes_copy_usage, options);
629 } else {
630 return notes_copy_from_stdin(force, rewrite_cmd);
631 }
632 }
633
Jeff Kingbbb1b8a2010-06-28 04:59:07 -0400634 if (argc < 2) {
Ævar Arnfjörð Bjarmasoncaeba0e2011-02-22 23:42:26 +0000635 error(_("too few parameters"));
Jeff Kingbbb1b8a2010-06-28 04:59:07 -0400636 usage_with_options(git_notes_copy_usage, options);
637 }
Stephen Boyd74884b52010-02-27 00:59:22 -0800638 if (2 < argc) {
Ævar Arnfjörð Bjarmasoncaeba0e2011-02-22 23:42:26 +0000639 error(_("too many parameters"));
Stephen Boyd74884b52010-02-27 00:59:22 -0800640 usage_with_options(git_notes_copy_usage, options);
641 }
642
643 if (get_sha1(argv[0], from_obj))
Ævar Arnfjörð Bjarmasoncaeba0e2011-02-22 23:42:26 +0000644 die(_("Failed to resolve '%s' as a valid ref."), argv[0]);
Stephen Boyd74884b52010-02-27 00:59:22 -0800645
646 object_ref = 1 < argc ? argv[1] : "HEAD";
647
648 if (get_sha1(object_ref, object))
Ævar Arnfjörð Bjarmasoncaeba0e2011-02-22 23:42:26 +0000649 die(_("Failed to resolve '%s' as a valid ref."), object_ref);
Stephen Boyd74884b52010-02-27 00:59:22 -0800650
651 t = init_notes_check("copy");
652 note = get_note(t, object);
653
654 if (note) {
655 if (!force) {
Ævar Arnfjörð Bjarmasoncaeba0e2011-02-22 23:42:26 +0000656 retval = error(_("Cannot copy notes. Found existing "
Stephen Boyd74884b52010-02-27 00:59:22 -0800657 "notes for object %s. Use '-f' to "
Ævar Arnfjörð Bjarmasoncaeba0e2011-02-22 23:42:26 +0000658 "overwrite existing notes"),
Stephen Boyd74884b52010-02-27 00:59:22 -0800659 sha1_to_hex(object));
660 goto out;
661 }
Ævar Arnfjörð Bjarmasoncaeba0e2011-02-22 23:42:26 +0000662 fprintf(stderr, _("Overwriting existing notes for object %s\n"),
Stephen Boyd74884b52010-02-27 00:59:22 -0800663 sha1_to_hex(object));
664 }
665
666 from_note = get_note(t, from_obj);
667 if (!from_note) {
Ævar Arnfjörð Bjarmasoncaeba0e2011-02-22 23:42:26 +0000668 retval = error(_("Missing notes on source object %s. Cannot "
669 "copy."), sha1_to_hex(from_obj));
Stephen Boyd74884b52010-02-27 00:59:22 -0800670 goto out;
671 }
672
Johan Herland180619a2010-11-15 00:52:26 +0100673 if (add_note(t, object, from_note, combine_notes_overwrite))
674 die("BUG: combine_notes_overwrite failed");
Stephen Boyd74884b52010-02-27 00:59:22 -0800675 commit_notes(t, "Notes added by 'git notes copy'");
676out:
677 free_notes(t);
678 return retval;
679}
680
681static int append_edit(int argc, const char **argv, const char *prefix)
682{
683 const char *object_ref;
684 struct notes_tree *t;
685 unsigned char object[20], new_note[20];
686 const unsigned char *note;
687 char logmsg[100];
688 const char * const *usage;
689 struct msg_arg msg = { 0, 0, STRBUF_INIT };
690 struct option options[] = {
Michael J Gruber23c6a802011-02-15 14:09:12 +0100691 { OPTION_CALLBACK, 'm', "message", &msg, "msg",
Stephen Boyd74884b52010-02-27 00:59:22 -0800692 "note contents as a string", PARSE_OPT_NONEG,
693 parse_msg_arg},
Michael J Gruber23c6a802011-02-15 14:09:12 +0100694 { OPTION_CALLBACK, 'F', "file", &msg, "file",
Stephen Boyd74884b52010-02-27 00:59:22 -0800695 "note contents in a file", PARSE_OPT_NONEG,
696 parse_file_arg},
Michael J Gruber23c6a802011-02-15 14:09:12 +0100697 { OPTION_CALLBACK, 'c', "reedit-message", &msg, "object",
Stephen Boyd74884b52010-02-27 00:59:22 -0800698 "reuse and edit specified note object", PARSE_OPT_NONEG,
699 parse_reedit_arg},
Michael J Gruber23c6a802011-02-15 14:09:12 +0100700 { OPTION_CALLBACK, 'C', "reuse-message", &msg, "object",
Stephen Boyd74884b52010-02-27 00:59:22 -0800701 "reuse specified note object", PARSE_OPT_NONEG,
702 parse_reuse_arg},
703 OPT_END()
704 };
705 int edit = !strcmp(argv[0], "edit");
706
707 usage = edit ? git_notes_edit_usage : git_notes_append_usage;
708 argc = parse_options(argc, argv, prefix, options, usage,
709 PARSE_OPT_KEEP_ARGV0);
710
711 if (2 < argc) {
Ævar Arnfjörð Bjarmasoncaeba0e2011-02-22 23:42:26 +0000712 error(_("too many parameters"));
Stephen Boyd74884b52010-02-27 00:59:22 -0800713 usage_with_options(usage, options);
714 }
715
716 if (msg.given && edit)
Ævar Arnfjörð Bjarmasoncaeba0e2011-02-22 23:42:26 +0000717 fprintf(stderr, _("The -m/-F/-c/-C options have been deprecated "
Stephen Boyd74884b52010-02-27 00:59:22 -0800718 "for the 'edit' subcommand.\n"
Ævar Arnfjörð Bjarmasoncaeba0e2011-02-22 23:42:26 +0000719 "Please use 'git notes add -f -m/-F/-c/-C' instead.\n"));
Stephen Boyd74884b52010-02-27 00:59:22 -0800720
721 object_ref = 1 < argc ? argv[1] : "HEAD";
722
723 if (get_sha1(object_ref, object))
Ævar Arnfjörð Bjarmasoncaeba0e2011-02-22 23:42:26 +0000724 die(_("Failed to resolve '%s' as a valid ref."), object_ref);
Stephen Boyd74884b52010-02-27 00:59:22 -0800725
726 t = init_notes_check(argv[0]);
727 note = get_note(t, object);
728
729 create_note(object, &msg, !edit, note, new_note);
730
731 if (is_null_sha1(new_note))
732 remove_note(t, object);
Johan Herland180619a2010-11-15 00:52:26 +0100733 else if (add_note(t, object, new_note, combine_notes_overwrite))
734 die("BUG: combine_notes_overwrite failed");
Stephen Boyd74884b52010-02-27 00:59:22 -0800735
736 snprintf(logmsg, sizeof(logmsg), "Notes %s by 'git notes %s'",
737 is_null_sha1(new_note) ? "removed" : "added", argv[0]);
738 commit_notes(t, logmsg);
739 free_notes(t);
740 strbuf_release(&(msg.buf));
741 return 0;
742}
743
744static int show(int argc, const char **argv, const char *prefix)
745{
746 const char *object_ref;
747 struct notes_tree *t;
748 unsigned char object[20];
749 const unsigned char *note;
750 int retval;
751 struct option options[] = {
752 OPT_END()
753 };
754
755 argc = parse_options(argc, argv, prefix, options, git_notes_show_usage,
756 0);
757
758 if (1 < argc) {
Ævar Arnfjörð Bjarmasoncaeba0e2011-02-22 23:42:26 +0000759 error(_("too many parameters"));
Stephen Boyd74884b52010-02-27 00:59:22 -0800760 usage_with_options(git_notes_show_usage, options);
761 }
762
763 object_ref = argc ? argv[0] : "HEAD";
764
765 if (get_sha1(object_ref, object))
Ævar Arnfjörð Bjarmasoncaeba0e2011-02-22 23:42:26 +0000766 die(_("Failed to resolve '%s' as a valid ref."), object_ref);
Stephen Boyd74884b52010-02-27 00:59:22 -0800767
768 t = init_notes_check("show");
769 note = get_note(t, object);
770
771 if (!note)
Ævar Arnfjörð Bjarmasoncaeba0e2011-02-22 23:42:26 +0000772 retval = error(_("No note found for object %s."),
Stephen Boyd74884b52010-02-27 00:59:22 -0800773 sha1_to_hex(object));
774 else {
775 const char *show_args[3] = {"show", sha1_to_hex(note), NULL};
776 retval = execv_git_cmd(show_args);
777 }
778 free_notes(t);
779 return retval;
780}
781
Johan Herland6abb3652010-11-09 22:49:52 +0100782static int merge_abort(struct notes_merge_options *o)
783{
784 int ret = 0;
785
786 /*
787 * Remove .git/NOTES_MERGE_PARTIAL and .git/NOTES_MERGE_REF, and call
788 * notes_merge_abort() to remove .git/NOTES_MERGE_WORKTREE.
789 */
790
791 if (delete_ref("NOTES_MERGE_PARTIAL", NULL, 0))
792 ret += error("Failed to delete ref NOTES_MERGE_PARTIAL");
793 if (delete_ref("NOTES_MERGE_REF", NULL, REF_NODEREF))
794 ret += error("Failed to delete ref NOTES_MERGE_REF");
795 if (notes_merge_abort(o))
796 ret += error("Failed to remove 'git notes merge' worktree");
797 return ret;
798}
799
800static int merge_commit(struct notes_merge_options *o)
801{
802 struct strbuf msg = STRBUF_INIT;
Johan Herland6cfd6a92010-11-09 22:49:54 +0100803 unsigned char sha1[20], parent_sha1[20];
Johan Herland6abb3652010-11-09 22:49:52 +0100804 struct notes_tree *t;
805 struct commit *partial;
806 struct pretty_print_context pretty_ctx;
807
808 /*
809 * Read partial merge result from .git/NOTES_MERGE_PARTIAL,
810 * and target notes ref from .git/NOTES_MERGE_REF.
811 */
812
813 if (get_sha1("NOTES_MERGE_PARTIAL", sha1))
814 die("Failed to read ref NOTES_MERGE_PARTIAL");
815 else if (!(partial = lookup_commit_reference(sha1)))
816 die("Could not find commit from NOTES_MERGE_PARTIAL.");
817 else if (parse_commit(partial))
818 die("Could not parse commit from NOTES_MERGE_PARTIAL.");
819
Johan Herland6cfd6a92010-11-09 22:49:54 +0100820 if (partial->parents)
821 hashcpy(parent_sha1, partial->parents->item->object.sha1);
822 else
823 hashclr(parent_sha1);
824
Johan Herland6abb3652010-11-09 22:49:52 +0100825 t = xcalloc(1, sizeof(struct notes_tree));
826 init_notes(t, "NOTES_MERGE_PARTIAL", combine_notes_overwrite, 0);
827
Stephen Boydc2e86ad2011-03-22 00:51:05 -0700828 o->local_ref = resolve_ref("NOTES_MERGE_REF", sha1, 0, NULL);
Johan Herland6abb3652010-11-09 22:49:52 +0100829 if (!o->local_ref)
830 die("Failed to resolve NOTES_MERGE_REF");
831
832 if (notes_merge_commit(o, t, partial, sha1))
833 die("Failed to finalize notes merge");
834
835 /* Reuse existing commit message in reflog message */
836 memset(&pretty_ctx, 0, sizeof(pretty_ctx));
837 format_commit_message(partial, "%s", &msg, &pretty_ctx);
838 strbuf_trim(&msg);
839 strbuf_insert(&msg, 0, "notes: ", 7);
Johan Herland6cfd6a92010-11-09 22:49:54 +0100840 update_ref(msg.buf, o->local_ref, sha1,
841 is_null_sha1(parent_sha1) ? NULL : parent_sha1,
842 0, DIE_ON_ERR);
Johan Herland6abb3652010-11-09 22:49:52 +0100843
844 free_notes(t);
845 strbuf_release(&msg);
846 return merge_abort(o);
847}
848
Johan Herland75ef3f42010-11-09 22:49:46 +0100849static int merge(int argc, const char **argv, const char *prefix)
850{
851 struct strbuf remote_ref = STRBUF_INIT, msg = STRBUF_INIT;
852 unsigned char result_sha1[20];
Johan Herland2085b162010-11-15 00:54:11 +0100853 struct notes_tree *t;
Johan Herland75ef3f42010-11-09 22:49:46 +0100854 struct notes_merge_options o;
Johan Herland6abb3652010-11-09 22:49:52 +0100855 int do_merge = 0, do_commit = 0, do_abort = 0;
Johan Herland75ef3f42010-11-09 22:49:46 +0100856 int verbosity = 0, result;
Johan Herland3228e672010-11-15 00:55:12 +0100857 const char *strategy = NULL;
Johan Herland75ef3f42010-11-09 22:49:46 +0100858 struct option options[] = {
Johan Herland6abb3652010-11-09 22:49:52 +0100859 OPT_GROUP("General options"),
Johan Herland75ef3f42010-11-09 22:49:46 +0100860 OPT__VERBOSITY(&verbosity),
Johan Herland6abb3652010-11-09 22:49:52 +0100861 OPT_GROUP("Merge options"),
Johan Herland3228e672010-11-15 00:55:12 +0100862 OPT_STRING('s', "strategy", &strategy, "strategy",
Johan Herlanda6a09092010-11-15 00:57:17 +0100863 "resolve notes conflicts using the given strategy "
864 "(manual/ours/theirs/union/cat_sort_uniq)"),
Johan Herland6abb3652010-11-09 22:49:52 +0100865 OPT_GROUP("Committing unmerged notes"),
866 { OPTION_BOOLEAN, 0, "commit", &do_commit, NULL,
867 "finalize notes merge by committing unmerged notes",
868 PARSE_OPT_NOARG | PARSE_OPT_NONEG },
869 OPT_GROUP("Aborting notes merge resolution"),
870 { OPTION_BOOLEAN, 0, "abort", &do_abort, NULL,
871 "abort notes merge",
872 PARSE_OPT_NOARG | PARSE_OPT_NONEG },
Johan Herland75ef3f42010-11-09 22:49:46 +0100873 OPT_END()
874 };
875
876 argc = parse_options(argc, argv, prefix, options,
877 git_notes_merge_usage, 0);
878
Johan Herland6abb3652010-11-09 22:49:52 +0100879 if (strategy || do_commit + do_abort == 0)
880 do_merge = 1;
881 if (do_merge + do_commit + do_abort != 1) {
882 error("cannot mix --commit, --abort or -s/--strategy");
883 usage_with_options(git_notes_merge_usage, options);
884 }
885
886 if (do_merge && argc != 1) {
Johan Herland75ef3f42010-11-09 22:49:46 +0100887 error("Must specify a notes ref to merge");
888 usage_with_options(git_notes_merge_usage, options);
Johan Herland6abb3652010-11-09 22:49:52 +0100889 } else if (!do_merge && argc) {
890 error("too many parameters");
891 usage_with_options(git_notes_merge_usage, options);
Johan Herland75ef3f42010-11-09 22:49:46 +0100892 }
893
894 init_notes_merge_options(&o);
895 o.verbosity = verbosity + NOTES_MERGE_VERBOSITY_DEFAULT;
896
Johan Herland6abb3652010-11-09 22:49:52 +0100897 if (do_abort)
898 return merge_abort(&o);
899 if (do_commit)
900 return merge_commit(&o);
901
Johan Herland75ef3f42010-11-09 22:49:46 +0100902 o.local_ref = default_notes_ref();
903 strbuf_addstr(&remote_ref, argv[0]);
904 expand_notes_ref(&remote_ref);
905 o.remote_ref = remote_ref.buf;
906
Johan Herland3228e672010-11-15 00:55:12 +0100907 if (strategy) {
908 if (!strcmp(strategy, "manual"))
909 o.strategy = NOTES_MERGE_RESOLVE_MANUAL;
910 else if (!strcmp(strategy, "ours"))
911 o.strategy = NOTES_MERGE_RESOLVE_OURS;
912 else if (!strcmp(strategy, "theirs"))
913 o.strategy = NOTES_MERGE_RESOLVE_THEIRS;
914 else if (!strcmp(strategy, "union"))
915 o.strategy = NOTES_MERGE_RESOLVE_UNION;
Johan Herlanda6a09092010-11-15 00:57:17 +0100916 else if (!strcmp(strategy, "cat_sort_uniq"))
917 o.strategy = NOTES_MERGE_RESOLVE_CAT_SORT_UNIQ;
Johan Herland3228e672010-11-15 00:55:12 +0100918 else {
919 error("Unknown -s/--strategy: %s", strategy);
920 usage_with_options(git_notes_merge_usage, options);
921 }
922 }
923
Johan Herland2085b162010-11-15 00:54:11 +0100924 t = init_notes_check("merge");
Johan Herland75ef3f42010-11-09 22:49:46 +0100925
926 strbuf_addf(&msg, "notes: Merged notes from %s into %s",
927 remote_ref.buf, default_notes_ref());
Johan Herland443259c2010-11-09 22:49:53 +0100928 strbuf_add(&(o.commit_msg), msg.buf + 7, msg.len - 7); /* skip "notes: " */
Johan Herland2085b162010-11-15 00:54:11 +0100929
930 result = notes_merge(&o, t, result_sha1);
931
932 if (result >= 0) /* Merge resulted (trivially) in result_sha1 */
Johan Herland75ef3f42010-11-09 22:49:46 +0100933 /* Update default notes ref with new commit */
934 update_ref(msg.buf, default_notes_ref(), result_sha1, NULL,
935 0, DIE_ON_ERR);
Johan Herland6abb3652010-11-09 22:49:52 +0100936 else { /* Merge has unresolved conflicts */
937 /* Update .git/NOTES_MERGE_PARTIAL with partial merge result */
938 update_ref(msg.buf, "NOTES_MERGE_PARTIAL", result_sha1, NULL,
939 0, DIE_ON_ERR);
940 /* Store ref-to-be-updated into .git/NOTES_MERGE_REF */
941 if (create_symref("NOTES_MERGE_REF", default_notes_ref(), NULL))
942 die("Failed to store link to current notes ref (%s)",
943 default_notes_ref());
944 printf("Automatic notes merge failed. Fix conflicts in %s and "
945 "commit the result with 'git notes merge --commit', or "
946 "abort the merge with 'git notes merge --abort'.\n",
Johan Herland809f38c2010-11-09 22:49:51 +0100947 git_path(NOTES_MERGE_WORKTREE));
Johan Herland6abb3652010-11-09 22:49:52 +0100948 }
Johan Herland75ef3f42010-11-09 22:49:46 +0100949
Johan Herland2085b162010-11-15 00:54:11 +0100950 free_notes(t);
Johan Herland75ef3f42010-11-09 22:49:46 +0100951 strbuf_release(&remote_ref);
952 strbuf_release(&msg);
Johan Herland809f38c2010-11-09 22:49:51 +0100953 return result < 0; /* return non-zero on conflicts */
Johan Herland75ef3f42010-11-09 22:49:46 +0100954}
955
Junio C Hamano46538012011-05-18 16:44:30 -0700956#define IGNORE_MISSING 1
Junio C Hamano2d370d22011-05-18 16:02:58 -0700957
958static int remove_one_note(struct notes_tree *t, const char *name, unsigned flag)
Junio C Hamanoc3ab1a82011-05-18 15:44:37 -0700959{
960 int status;
961 unsigned char sha1[20];
962 if (get_sha1(name, sha1))
963 return error(_("Failed to resolve '%s' as a valid ref."), name);
964 status = remove_note(t, sha1);
965 if (status)
966 fprintf(stderr, _("Object %s has no note\n"), name);
967 else
968 fprintf(stderr, _("Removing note for object %s\n"), name);
Junio C Hamano46538012011-05-18 16:44:30 -0700969 return (flag & IGNORE_MISSING) ? 0 : status;
Junio C Hamanoc3ab1a82011-05-18 15:44:37 -0700970}
971
Stephen Boyd74884b52010-02-27 00:59:22 -0800972static int remove_cmd(int argc, const char **argv, const char *prefix)
973{
Junio C Hamano2d370d22011-05-18 16:02:58 -0700974 unsigned flag = 0;
Junio C Hamano46538012011-05-18 16:44:30 -0700975 int from_stdin = 0;
Stephen Boyd74884b52010-02-27 00:59:22 -0800976 struct option options[] = {
Junio C Hamano2d370d22011-05-18 16:02:58 -0700977 OPT_BIT(0, "ignore-missing", &flag,
978 "attempt to remove non-existent note is not an error",
Junio C Hamano46538012011-05-18 16:44:30 -0700979 IGNORE_MISSING),
980 OPT_BOOLEAN(0, "stdin", &from_stdin,
981 "read object names from the standard input"),
Stephen Boyd74884b52010-02-27 00:59:22 -0800982 OPT_END()
983 };
Stephen Boyd74884b52010-02-27 00:59:22 -0800984 struct notes_tree *t;
Junio C Hamanoc3ab1a82011-05-18 15:44:37 -0700985 int retval = 0;
Stephen Boyd74884b52010-02-27 00:59:22 -0800986
987 argc = parse_options(argc, argv, prefix, options,
988 git_notes_remove_usage, 0);
989
Stephen Boyd74884b52010-02-27 00:59:22 -0800990 t = init_notes_check("remove");
991
Junio C Hamano46538012011-05-18 16:44:30 -0700992 if (!argc && !from_stdin) {
Junio C Hamano2d370d22011-05-18 16:02:58 -0700993 retval = remove_one_note(t, "HEAD", flag);
Junio C Hamanoc3ab1a82011-05-18 15:44:37 -0700994 } else {
995 while (*argv) {
Junio C Hamano2d370d22011-05-18 16:02:58 -0700996 retval |= remove_one_note(t, *argv, flag);
Junio C Hamanoc3ab1a82011-05-18 15:44:37 -0700997 argv++;
998 }
Johan Herland1ee1e432010-08-31 17:56:50 +0200999 }
Junio C Hamano46538012011-05-18 16:44:30 -07001000 if (from_stdin) {
1001 struct strbuf sb = STRBUF_INIT;
1002 while (strbuf_getwholeline(&sb, stdin, '\n') != EOF) {
1003 strbuf_rtrim(&sb);
1004 retval |= remove_one_note(t, sb.buf, flag);
1005 }
1006 strbuf_release(&sb);
1007 }
Junio C Hamanoc3ab1a82011-05-18 15:44:37 -07001008 if (!retval)
1009 commit_notes(t, "Notes removed by 'git notes remove'");
Stephen Boyd74884b52010-02-27 00:59:22 -08001010 free_notes(t);
Johan Herland1ee1e432010-08-31 17:56:50 +02001011 return retval;
Stephen Boyd74884b52010-02-27 00:59:22 -08001012}
1013
1014static int prune(int argc, const char **argv, const char *prefix)
1015{
1016 struct notes_tree *t;
Michael J Grubera9f2adf2010-05-14 23:42:07 +02001017 int show_only = 0, verbose = 0;
Stephen Boyd74884b52010-02-27 00:59:22 -08001018 struct option options[] = {
René Scharfee21adb82010-11-08 18:58:51 +01001019 OPT__DRY_RUN(&show_only, "do not remove, show only"),
René Scharfefd038812010-11-08 18:56:39 +01001020 OPT__VERBOSE(&verbose, "report pruned notes"),
Stephen Boyd74884b52010-02-27 00:59:22 -08001021 OPT_END()
1022 };
1023
1024 argc = parse_options(argc, argv, prefix, options, git_notes_prune_usage,
1025 0);
1026
1027 if (argc) {
Ævar Arnfjörð Bjarmasoncaeba0e2011-02-22 23:42:26 +00001028 error(_("too many parameters"));
Stephen Boyd74884b52010-02-27 00:59:22 -08001029 usage_with_options(git_notes_prune_usage, options);
1030 }
1031
1032 t = init_notes_check("prune");
1033
Michael J Grubera9f2adf2010-05-14 23:42:07 +02001034 prune_notes(t, (verbose ? NOTES_PRUNE_VERBOSE : 0) |
1035 (show_only ? NOTES_PRUNE_VERBOSE|NOTES_PRUNE_DRYRUN : 0) );
1036 if (!show_only)
1037 commit_notes(t, "Notes removed by 'git notes prune'");
Stephen Boyd74884b52010-02-27 00:59:22 -08001038 free_notes(t);
1039 return 0;
1040}
1041
Johan Herland618cd752010-11-09 22:49:57 +01001042static int get_ref(int argc, const char **argv, const char *prefix)
1043{
1044 struct option options[] = { OPT_END() };
1045 argc = parse_options(argc, argv, prefix, options,
1046 git_notes_get_ref_usage, 0);
1047
1048 if (argc) {
1049 error("too many parameters");
1050 usage_with_options(git_notes_get_ref_usage, options);
1051 }
1052
1053 puts(default_notes_ref());
1054 return 0;
1055}
1056
Stephen Boyd74884b52010-02-27 00:59:22 -08001057int cmd_notes(int argc, const char **argv, const char *prefix)
1058{
1059 int result;
1060 const char *override_notes_ref = NULL;
1061 struct option options[] = {
Thomas Rastdcf783a2010-03-12 18:04:35 +01001062 OPT_STRING(0, "ref", &override_notes_ref, "notes_ref",
1063 "use notes from <notes_ref>"),
Johan Herlandcd067d32010-02-13 22:28:20 +01001064 OPT_END()
1065 };
1066
1067 git_config(git_default_config, NULL);
Stephen Boyd74884b52010-02-27 00:59:22 -08001068 argc = parse_options(argc, argv, prefix, options, git_notes_usage,
1069 PARSE_OPT_STOP_AT_NON_OPTION);
Johan Herlandcd067d32010-02-13 22:28:20 +01001070
Thomas Rastdcf783a2010-03-12 18:04:35 +01001071 if (override_notes_ref) {
1072 struct strbuf sb = STRBUF_INIT;
Thomas Rastdcf783a2010-03-12 18:04:35 +01001073 strbuf_addstr(&sb, override_notes_ref);
Johan Herland8ef313e2010-11-09 22:49:45 +01001074 expand_notes_ref(&sb);
Thomas Rastdcf783a2010-03-12 18:04:35 +01001075 setenv("GIT_NOTES_REF", sb.buf, 1);
1076 strbuf_release(&sb);
1077 }
1078
Stephen Boyd74884b52010-02-27 00:59:22 -08001079 if (argc < 1 || !strcmp(argv[0], "list"))
1080 result = list(argc, argv, prefix);
1081 else if (!strcmp(argv[0], "add"))
1082 result = add(argc, argv, prefix);
1083 else if (!strcmp(argv[0], "copy"))
1084 result = copy(argc, argv, prefix);
1085 else if (!strcmp(argv[0], "append") || !strcmp(argv[0], "edit"))
1086 result = append_edit(argc, argv, prefix);
1087 else if (!strcmp(argv[0], "show"))
1088 result = show(argc, argv, prefix);
Johan Herland75ef3f42010-11-09 22:49:46 +01001089 else if (!strcmp(argv[0], "merge"))
1090 result = merge(argc, argv, prefix);
Stephen Boyd74884b52010-02-27 00:59:22 -08001091 else if (!strcmp(argv[0], "remove"))
1092 result = remove_cmd(argc, argv, prefix);
1093 else if (!strcmp(argv[0], "prune"))
1094 result = prune(argc, argv, prefix);
Johan Herland618cd752010-11-09 22:49:57 +01001095 else if (!strcmp(argv[0], "get-ref"))
1096 result = get_ref(argc, argv, prefix);
Stephen Boyd74884b52010-02-27 00:59:22 -08001097 else {
Ævar Arnfjörð Bjarmasoncaeba0e2011-02-22 23:42:26 +00001098 result = error(_("Unknown subcommand: %s"), argv[0]);
Johan Herland92b33852010-02-13 22:28:25 +01001099 usage_with_options(git_notes_usage, options);
1100 }
1101
Stephen Boyd74884b52010-02-27 00:59:22 -08001102 return result ? 1 : 0;
Johan Herlandcd067d32010-02-13 22:28:20 +01001103}