2010-02-13 21:28:20 +00:00
|
|
|
/*
|
|
|
|
* Builtin "git notes"
|
|
|
|
*
|
|
|
|
* Copyright (c) 2010 Johan Herland <johan@herland.net>
|
|
|
|
*
|
|
|
|
* Based on git-notes.sh by Johannes Schindelin,
|
2013-06-18 17:44:58 +00:00
|
|
|
* and builtin/tag.c by Kristian Høgsberg and Carlos Rica.
|
2010-02-13 21:28:20 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
#include "cache.h"
|
2017-06-14 18:07:36 +00:00
|
|
|
#include "config.h"
|
2010-02-13 21:28:20 +00:00
|
|
|
#include "builtin.h"
|
|
|
|
#include "notes.h"
|
|
|
|
#include "blob.h"
|
2017-12-12 08:55:35 +00:00
|
|
|
#include "pretty.h"
|
2010-02-13 21:28:20 +00:00
|
|
|
#include "refs.h"
|
2018-04-10 21:26:18 +00:00
|
|
|
#include "exec-cmd.h"
|
2010-02-13 21:28:20 +00:00
|
|
|
#include "run-command.h"
|
|
|
|
#include "parse-options.h"
|
2010-03-12 17:04:32 +00:00
|
|
|
#include "string-list.h"
|
2010-11-09 21:49:46 +00:00
|
|
|
#include "notes-merge.h"
|
2013-06-12 00:13:00 +00:00
|
|
|
#include "notes-utils.h"
|
2015-10-02 11:55:31 +00:00
|
|
|
#include "worktree.h"
|
2012-09-15 20:56:07 +00:00
|
|
|
|
2010-02-13 21:28:20 +00:00
|
|
|
static const char * const git_notes_usage[] = {
|
2015-01-13 07:44:47 +00:00
|
|
|
N_("git notes [--ref <notes-ref>] [list [<object>]]"),
|
|
|
|
N_("git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> | (-c | -C) <object>] [<object>]"),
|
|
|
|
N_("git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"),
|
|
|
|
N_("git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | (-c | -C) <object>] [<object>]"),
|
|
|
|
N_("git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"),
|
|
|
|
N_("git notes [--ref <notes-ref>] show [<object>]"),
|
|
|
|
N_("git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"),
|
2012-08-20 12:32:28 +00:00
|
|
|
N_("git notes merge --commit [-v | -q]"),
|
|
|
|
N_("git notes merge --abort [-v | -q]"),
|
2015-01-13 07:44:47 +00:00
|
|
|
N_("git notes [--ref <notes-ref>] remove [<object>...]"),
|
2017-11-21 19:17:21 +00:00
|
|
|
N_("git notes [--ref <notes-ref>] prune [-n] [-v]"),
|
2015-01-13 07:44:47 +00:00
|
|
|
N_("git notes [--ref <notes-ref>] get-ref"),
|
2010-02-27 08:59:22 +00:00
|
|
|
NULL
|
|
|
|
};
|
|
|
|
|
|
|
|
static const char * const git_notes_list_usage[] = {
|
2012-08-20 12:32:28 +00:00
|
|
|
N_("git notes [list [<object>]]"),
|
2010-02-27 08:59:22 +00:00
|
|
|
NULL
|
|
|
|
};
|
|
|
|
|
|
|
|
static const char * const git_notes_add_usage[] = {
|
2012-08-20 12:32:28 +00:00
|
|
|
N_("git notes add [<options>] [<object>]"),
|
2010-02-27 08:59:22 +00:00
|
|
|
NULL
|
|
|
|
};
|
|
|
|
|
|
|
|
static const char * const git_notes_copy_usage[] = {
|
2012-08-20 12:32:28 +00:00
|
|
|
N_("git notes copy [<options>] <from-object> <to-object>"),
|
|
|
|
N_("git notes copy --stdin [<from-object> <to-object>]..."),
|
2010-02-27 08:59:22 +00:00
|
|
|
NULL
|
|
|
|
};
|
|
|
|
|
|
|
|
static const char * const git_notes_append_usage[] = {
|
2012-08-20 12:32:28 +00:00
|
|
|
N_("git notes append [<options>] [<object>]"),
|
2010-02-27 08:59:22 +00:00
|
|
|
NULL
|
|
|
|
};
|
|
|
|
|
|
|
|
static const char * const git_notes_edit_usage[] = {
|
2012-08-20 12:32:28 +00:00
|
|
|
N_("git notes edit [<object>]"),
|
2010-02-27 08:59:22 +00:00
|
|
|
NULL
|
|
|
|
};
|
|
|
|
|
|
|
|
static const char * const git_notes_show_usage[] = {
|
2012-08-20 12:32:28 +00:00
|
|
|
N_("git notes show [<object>]"),
|
2010-02-27 08:59:22 +00:00
|
|
|
NULL
|
|
|
|
};
|
|
|
|
|
2010-11-09 21:49:46 +00:00
|
|
|
static const char * const git_notes_merge_usage[] = {
|
2015-01-13 07:44:47 +00:00
|
|
|
N_("git notes merge [<options>] <notes-ref>"),
|
2012-08-20 12:32:28 +00:00
|
|
|
N_("git notes merge --commit [<options>]"),
|
|
|
|
N_("git notes merge --abort [<options>]"),
|
2010-11-09 21:49:46 +00:00
|
|
|
NULL
|
|
|
|
};
|
|
|
|
|
2010-02-27 08:59:22 +00:00
|
|
|
static const char * const git_notes_remove_usage[] = {
|
2012-08-20 12:32:28 +00:00
|
|
|
N_("git notes remove [<object>]"),
|
2010-02-27 08:59:22 +00:00
|
|
|
NULL
|
|
|
|
};
|
|
|
|
|
|
|
|
static const char * const git_notes_prune_usage[] = {
|
2012-08-20 12:32:28 +00:00
|
|
|
N_("git notes prune [<options>]"),
|
2010-02-13 21:28:20 +00:00
|
|
|
NULL
|
|
|
|
};
|
|
|
|
|
2010-11-09 21:49:57 +00:00
|
|
|
static const char * const git_notes_get_ref_usage[] = {
|
2012-08-20 12:32:28 +00:00
|
|
|
N_("git notes get-ref"),
|
2010-11-09 21:49:57 +00:00
|
|
|
NULL
|
|
|
|
};
|
|
|
|
|
2010-02-13 21:28:20 +00:00
|
|
|
static const char note_template[] =
|
2016-07-28 11:26:15 +00:00
|
|
|
N_("Write/edit the notes for the following object:");
|
2010-02-13 21:28:20 +00:00
|
|
|
|
2014-11-09 12:30:49 +00:00
|
|
|
struct note_data {
|
2010-02-13 21:28:35 +00:00
|
|
|
int given;
|
2010-02-13 21:28:36 +00:00
|
|
|
int use_editor;
|
2014-11-09 12:30:50 +00:00
|
|
|
char *edit_path;
|
2010-02-13 21:28:35 +00:00
|
|
|
struct strbuf buf;
|
|
|
|
};
|
|
|
|
|
2014-11-09 12:30:50 +00:00
|
|
|
static void free_note_data(struct note_data *d)
|
|
|
|
{
|
|
|
|
if (d->edit_path) {
|
|
|
|
unlink_or_warn(d->edit_path);
|
|
|
|
free(d->edit_path);
|
|
|
|
}
|
|
|
|
strbuf_release(&d->buf);
|
|
|
|
}
|
|
|
|
|
2017-05-30 17:30:39 +00:00
|
|
|
static int list_each_note(const struct object_id *object_oid,
|
|
|
|
const struct object_id *note_oid, char *note_path,
|
2010-02-13 21:28:30 +00:00
|
|
|
void *cb_data)
|
|
|
|
{
|
2017-05-30 17:30:39 +00:00
|
|
|
printf("%s %s\n", oid_to_hex(note_oid), oid_to_hex(object_oid));
|
2010-02-13 21:28:30 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2018-03-12 02:27:48 +00:00
|
|
|
static void copy_obj_to_fd(int fd, const struct object_id *oid)
|
2010-02-13 21:28:20 +00:00
|
|
|
{
|
|
|
|
unsigned long size;
|
|
|
|
enum object_type type;
|
sha1_file: convert read_sha1_file to struct object_id
Convert read_sha1_file to take a pointer to struct object_id and rename
it read_object_file. Do the same for read_sha1_file_extended.
Convert one use in grep.c to use the new function without any other code
change, since the pointer being passed is a void pointer that is already
initialized with a pointer to struct object_id. Update the declaration
and definitions of the modified functions, and apply the following
semantic patch to convert the remaining callers:
@@
expression E1, E2, E3;
@@
- read_sha1_file(E1.hash, E2, E3)
+ read_object_file(&E1, E2, E3)
@@
expression E1, E2, E3;
@@
- read_sha1_file(E1->hash, E2, E3)
+ read_object_file(E1, E2, E3)
@@
expression E1, E2, E3, E4;
@@
- read_sha1_file_extended(E1.hash, E2, E3, E4)
+ read_object_file_extended(&E1, E2, E3, E4)
@@
expression E1, E2, E3, E4;
@@
- read_sha1_file_extended(E1->hash, E2, E3, E4)
+ read_object_file_extended(E1, E2, E3, E4)
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-03-12 02:27:53 +00:00
|
|
|
char *buf = read_object_file(oid, &type, &size);
|
2010-02-13 21:28:20 +00:00
|
|
|
if (buf) {
|
|
|
|
if (size)
|
|
|
|
write_or_die(fd, buf, size);
|
|
|
|
free(buf);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-05-30 17:30:42 +00:00
|
|
|
static void write_commented_object(int fd, const struct object_id *object)
|
2010-02-13 21:28:20 +00:00
|
|
|
{
|
|
|
|
const char *show_args[5] =
|
2017-05-30 17:30:42 +00:00
|
|
|
{"show", "--stat", "--no-notes", oid_to_hex(object), NULL};
|
2014-08-19 19:09:35 +00:00
|
|
|
struct child_process show = CHILD_PROCESS_INIT;
|
2010-02-13 21:28:20 +00:00
|
|
|
struct strbuf buf = STRBUF_INIT;
|
2013-01-16 19:18:48 +00:00
|
|
|
struct strbuf cbuf = STRBUF_INIT;
|
2010-02-13 21:28:20 +00:00
|
|
|
|
|
|
|
/* Invoke "git show --stat --no-notes $object" */
|
|
|
|
show.argv = show_args;
|
|
|
|
show.no_stdin = 1;
|
|
|
|
show.out = -1;
|
|
|
|
show.err = 0;
|
|
|
|
show.git_cmd = 1;
|
|
|
|
if (start_command(&show))
|
2011-02-22 23:42:26 +00:00
|
|
|
die(_("unable to start 'show' for object '%s'"),
|
2017-05-30 17:30:42 +00:00
|
|
|
oid_to_hex(object));
|
2010-02-13 21:28:20 +00:00
|
|
|
|
2013-01-16 19:18:48 +00:00
|
|
|
if (strbuf_read(&buf, show.out, 0) < 0)
|
|
|
|
die_errno(_("could not read 'show' output"));
|
|
|
|
strbuf_add_commented_lines(&cbuf, buf.buf, buf.len);
|
|
|
|
write_or_die(fd, cbuf.buf, cbuf.len);
|
2010-02-13 21:28:20 +00:00
|
|
|
|
2013-01-16 19:18:48 +00:00
|
|
|
strbuf_release(&cbuf);
|
2010-02-13 21:28:20 +00:00
|
|
|
strbuf_release(&buf);
|
2013-01-16 19:18:48 +00:00
|
|
|
|
2010-02-13 21:28:20 +00:00
|
|
|
if (finish_command(&show))
|
2011-02-22 23:42:26 +00:00
|
|
|
die(_("failed to finish 'show' for object '%s'"),
|
2017-05-30 17:30:42 +00:00
|
|
|
oid_to_hex(object));
|
2010-02-13 21:28:20 +00:00
|
|
|
}
|
|
|
|
|
2017-05-30 17:30:42 +00:00
|
|
|
static void prepare_note_data(const struct object_id *object, struct note_data *d,
|
2018-03-12 02:27:48 +00:00
|
|
|
const struct object_id *old_note)
|
2010-02-13 21:28:20 +00:00
|
|
|
{
|
2014-11-09 12:30:49 +00:00
|
|
|
if (d->use_editor || !d->given) {
|
2010-02-13 21:28:20 +00:00
|
|
|
int fd;
|
2013-01-16 19:18:48 +00:00
|
|
|
struct strbuf buf = STRBUF_INIT;
|
2010-02-13 21:28:20 +00:00
|
|
|
|
|
|
|
/* write the template message before editing: */
|
2014-11-09 12:30:50 +00:00
|
|
|
d->edit_path = git_pathdup("NOTES_EDITMSG");
|
|
|
|
fd = open(d->edit_path, O_CREAT | O_TRUNC | O_WRONLY, 0600);
|
2010-02-13 21:28:20 +00:00
|
|
|
if (fd < 0)
|
2014-11-09 12:30:50 +00:00
|
|
|
die_errno(_("could not create file '%s'"), d->edit_path);
|
2010-02-13 21:28:20 +00:00
|
|
|
|
2014-11-09 12:30:49 +00:00
|
|
|
if (d->given)
|
|
|
|
write_or_die(fd, d->buf.buf, d->buf.len);
|
2014-11-12 00:40:13 +00:00
|
|
|
else if (old_note)
|
|
|
|
copy_obj_to_fd(fd, old_note);
|
2013-01-16 19:18:48 +00:00
|
|
|
|
|
|
|
strbuf_addch(&buf, '\n');
|
2016-07-28 11:26:15 +00:00
|
|
|
strbuf_add_commented_lines(&buf, "\n", strlen("\n"));
|
|
|
|
strbuf_add_commented_lines(&buf, _(note_template), strlen(_(note_template)));
|
2013-01-16 19:18:48 +00:00
|
|
|
strbuf_addch(&buf, '\n');
|
|
|
|
write_or_die(fd, buf.buf, buf.len);
|
2010-02-13 21:28:20 +00:00
|
|
|
|
|
|
|
write_commented_object(fd, object);
|
|
|
|
|
|
|
|
close(fd);
|
2013-01-16 19:18:48 +00:00
|
|
|
strbuf_release(&buf);
|
2014-11-09 12:30:49 +00:00
|
|
|
strbuf_reset(&d->buf);
|
2010-02-13 21:28:20 +00:00
|
|
|
|
2014-11-09 12:30:50 +00:00
|
|
|
if (launch_editor(d->edit_path, &d->buf, NULL)) {
|
2016-09-15 14:59:04 +00:00
|
|
|
die(_("please supply the note contents using either -m or -F option"));
|
2010-02-13 21:28:20 +00:00
|
|
|
}
|
2015-10-16 15:16:42 +00:00
|
|
|
strbuf_stripspace(&d->buf, 1);
|
2010-02-13 21:28:20 +00:00
|
|
|
}
|
2014-11-12 00:40:13 +00:00
|
|
|
}
|
2010-02-13 21:28:20 +00:00
|
|
|
|
2018-01-28 00:13:19 +00:00
|
|
|
static void write_note_data(struct note_data *d, struct object_id *oid)
|
2014-11-12 00:40:13 +00:00
|
|
|
{
|
2018-01-28 00:13:19 +00:00
|
|
|
if (write_object_file(d->buf.buf, d->buf.len, blob_type, oid)) {
|
2014-11-12 00:40:13 +00:00
|
|
|
error(_("unable to write note object"));
|
|
|
|
if (d->edit_path)
|
2016-09-15 14:59:04 +00:00
|
|
|
error(_("the note contents have been left in %s"),
|
2014-11-12 00:40:13 +00:00
|
|
|
d->edit_path);
|
|
|
|
exit(128);
|
2010-02-13 21:28:20 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static int parse_msg_arg(const struct option *opt, const char *arg, int unset)
|
|
|
|
{
|
2014-11-09 12:30:49 +00:00
|
|
|
struct note_data *d = opt->value;
|
2010-02-13 21:28:20 +00:00
|
|
|
|
2014-11-09 12:30:49 +00:00
|
|
|
strbuf_grow(&d->buf, strlen(arg) + 2);
|
|
|
|
if (d->buf.len)
|
|
|
|
strbuf_addch(&d->buf, '\n');
|
|
|
|
strbuf_addstr(&d->buf, arg);
|
2015-10-16 15:16:42 +00:00
|
|
|
strbuf_stripspace(&d->buf, 0);
|
2010-02-13 21:28:35 +00:00
|
|
|
|
2014-11-09 12:30:49 +00:00
|
|
|
d->given = 1;
|
2010-02-13 21:28:35 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int parse_file_arg(const struct option *opt, const char *arg, int unset)
|
|
|
|
{
|
2014-11-09 12:30:49 +00:00
|
|
|
struct note_data *d = opt->value;
|
2010-02-13 21:28:35 +00:00
|
|
|
|
2014-11-09 12:30:49 +00:00
|
|
|
if (d->buf.len)
|
|
|
|
strbuf_addch(&d->buf, '\n');
|
2010-02-13 21:28:35 +00:00
|
|
|
if (!strcmp(arg, "-")) {
|
2014-11-09 12:30:49 +00:00
|
|
|
if (strbuf_read(&d->buf, 0, 1024) < 0)
|
2011-02-22 23:42:26 +00:00
|
|
|
die_errno(_("cannot read '%s'"), arg);
|
2014-11-09 12:30:49 +00:00
|
|
|
} else if (strbuf_read_file(&d->buf, arg, 1024) < 0)
|
2011-02-22 23:42:26 +00:00
|
|
|
die_errno(_("could not open or read '%s'"), arg);
|
2015-10-16 15:16:42 +00:00
|
|
|
strbuf_stripspace(&d->buf, 0);
|
2010-02-13 21:28:35 +00:00
|
|
|
|
2014-11-09 12:30:49 +00:00
|
|
|
d->given = 1;
|
2010-02-13 21:28:20 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2010-02-13 21:28:36 +00:00
|
|
|
static int parse_reuse_arg(const struct option *opt, const char *arg, int unset)
|
|
|
|
{
|
2014-11-09 12:30:49 +00:00
|
|
|
struct note_data *d = opt->value;
|
2010-02-13 21:28:36 +00:00
|
|
|
char *buf;
|
2017-05-30 17:30:42 +00:00
|
|
|
struct object_id object;
|
2010-02-13 21:28:36 +00:00
|
|
|
enum object_type type;
|
|
|
|
unsigned long len;
|
|
|
|
|
2014-11-09 12:30:49 +00:00
|
|
|
if (d->buf.len)
|
|
|
|
strbuf_addch(&d->buf, '\n');
|
2010-02-13 21:28:36 +00:00
|
|
|
|
2017-05-30 17:30:42 +00:00
|
|
|
if (get_oid(arg, &object))
|
2016-09-15 14:59:04 +00:00
|
|
|
die(_("failed to resolve '%s' as a valid ref."), arg);
|
sha1_file: convert read_sha1_file to struct object_id
Convert read_sha1_file to take a pointer to struct object_id and rename
it read_object_file. Do the same for read_sha1_file_extended.
Convert one use in grep.c to use the new function without any other code
change, since the pointer being passed is a void pointer that is already
initialized with a pointer to struct object_id. Update the declaration
and definitions of the modified functions, and apply the following
semantic patch to convert the remaining callers:
@@
expression E1, E2, E3;
@@
- read_sha1_file(E1.hash, E2, E3)
+ read_object_file(&E1, E2, E3)
@@
expression E1, E2, E3;
@@
- read_sha1_file(E1->hash, E2, E3)
+ read_object_file(E1, E2, E3)
@@
expression E1, E2, E3, E4;
@@
- read_sha1_file_extended(E1.hash, E2, E3, E4)
+ read_object_file_extended(&E1, E2, E3, E4)
@@
expression E1, E2, E3, E4;
@@
- read_sha1_file_extended(E1->hash, E2, E3, E4)
+ read_object_file_extended(E1, E2, E3, E4)
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-03-12 02:27:53 +00:00
|
|
|
if (!(buf = read_object_file(&object, &type, &len))) {
|
2010-02-13 21:28:36 +00:00
|
|
|
free(buf);
|
2016-09-15 14:59:04 +00:00
|
|
|
die(_("failed to read object '%s'."), arg);
|
2014-02-12 09:54:16 +00:00
|
|
|
}
|
|
|
|
if (type != OBJ_BLOB) {
|
|
|
|
free(buf);
|
2016-09-15 14:59:04 +00:00
|
|
|
die(_("cannot read note data from non-blob object '%s'."), arg);
|
2010-02-13 21:28:36 +00:00
|
|
|
}
|
2014-11-09 12:30:49 +00:00
|
|
|
strbuf_add(&d->buf, buf, len);
|
2010-02-13 21:28:36 +00:00
|
|
|
free(buf);
|
|
|
|
|
2014-11-09 12:30:49 +00:00
|
|
|
d->given = 1;
|
2010-02-13 21:28:36 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int parse_reedit_arg(const struct option *opt, const char *arg, int unset)
|
|
|
|
{
|
2014-11-09 12:30:49 +00:00
|
|
|
struct note_data *d = opt->value;
|
|
|
|
d->use_editor = 1;
|
2010-02-13 21:28:36 +00:00
|
|
|
return parse_reuse_arg(opt, arg, unset);
|
|
|
|
}
|
|
|
|
|
Fix sparse warnings
Fix warnings from 'make check'.
- These files don't include 'builtin.h' causing sparse to complain that
cmd_* isn't declared:
builtin/clone.c:364, builtin/fetch-pack.c:797,
builtin/fmt-merge-msg.c:34, builtin/hash-object.c:78,
builtin/merge-index.c:69, builtin/merge-recursive.c:22
builtin/merge-tree.c:341, builtin/mktag.c:156, builtin/notes.c:426
builtin/notes.c:822, builtin/pack-redundant.c:596,
builtin/pack-refs.c:10, builtin/patch-id.c:60, builtin/patch-id.c:149,
builtin/remote.c:1512, builtin/remote-ext.c:240,
builtin/remote-fd.c:53, builtin/reset.c:236, builtin/send-pack.c:384,
builtin/unpack-file.c:25, builtin/var.c:75
- These files have symbols which should be marked static since they're
only file scope:
submodule.c:12, diff.c:631, replace_object.c:92, submodule.c:13,
submodule.c:14, trace.c:78, transport.c:195, transport-helper.c:79,
unpack-trees.c:19, url.c:3, url.c:18, url.c:104, url.c:117, url.c:123,
url.c:129, url.c:136, thread-utils.c:21, thread-utils.c:48
- These files redeclare symbols to be different types:
builtin/index-pack.c:210, parse-options.c:564, parse-options.c:571,
usage.c:49, usage.c:58, usage.c:63, usage.c:72
- These files use a literal integer 0 when they really should use a NULL
pointer:
daemon.c:663, fast-import.c:2942, imap-send.c:1072, notes-merge.c:362
While we're in the area, clean up some unused #includes in builtin files
(mostly exec_cmd.h).
Signed-off-by: Stephen Boyd <bebarino@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-03-22 07:51:05 +00:00
|
|
|
static int notes_copy_from_stdin(int force, const char *rewrite_cmd)
|
2010-03-12 17:04:31 +00:00
|
|
|
{
|
|
|
|
struct strbuf buf = STRBUF_INIT;
|
2010-03-12 17:04:32 +00:00
|
|
|
struct notes_rewrite_cfg *c = NULL;
|
2010-06-14 23:40:05 +00:00
|
|
|
struct notes_tree *t = NULL;
|
2010-03-12 17:04:31 +00:00
|
|
|
int ret = 0;
|
2013-06-12 00:12:59 +00:00
|
|
|
const char *msg = "Notes added by 'git notes copy'";
|
2010-03-12 17:04:31 +00:00
|
|
|
|
2010-03-12 17:04:32 +00:00
|
|
|
if (rewrite_cmd) {
|
|
|
|
c = init_copy_notes_for_rewrite(rewrite_cmd);
|
|
|
|
if (!c)
|
|
|
|
return 0;
|
|
|
|
} else {
|
2015-10-08 02:54:43 +00:00
|
|
|
init_notes(NULL, NULL, NULL, NOTES_INIT_WRITABLE);
|
2010-03-12 17:04:32 +00:00
|
|
|
t = &default_notes_tree;
|
|
|
|
}
|
2010-03-12 17:04:31 +00:00
|
|
|
|
2016-01-13 23:31:17 +00:00
|
|
|
while (strbuf_getline_lf(&buf, stdin) != EOF) {
|
2017-05-30 17:30:42 +00:00
|
|
|
struct object_id from_obj, to_obj;
|
2010-03-12 17:04:31 +00:00
|
|
|
struct strbuf **split;
|
|
|
|
int err;
|
|
|
|
|
|
|
|
split = strbuf_split(&buf, ' ');
|
|
|
|
if (!split[0] || !split[1])
|
2016-09-15 14:59:04 +00:00
|
|
|
die(_("malformed input line: '%s'."), buf.buf);
|
2010-03-12 17:04:31 +00:00
|
|
|
strbuf_rtrim(split[0]);
|
|
|
|
strbuf_rtrim(split[1]);
|
2017-05-30 17:30:42 +00:00
|
|
|
if (get_oid(split[0]->buf, &from_obj))
|
2016-09-15 14:59:04 +00:00
|
|
|
die(_("failed to resolve '%s' as a valid ref."), split[0]->buf);
|
2017-05-30 17:30:42 +00:00
|
|
|
if (get_oid(split[1]->buf, &to_obj))
|
2016-09-15 14:59:04 +00:00
|
|
|
die(_("failed to resolve '%s' as a valid ref."), split[1]->buf);
|
2010-03-12 17:04:31 +00:00
|
|
|
|
2010-03-12 17:04:32 +00:00
|
|
|
if (rewrite_cmd)
|
2017-05-30 17:30:42 +00:00
|
|
|
err = copy_note_for_rewrite(c, &from_obj, &to_obj);
|
2010-03-12 17:04:32 +00:00
|
|
|
else
|
2017-05-30 17:30:43 +00:00
|
|
|
err = copy_note(t, &from_obj, &to_obj, force,
|
2010-03-12 17:04:32 +00:00
|
|
|
combine_notes_overwrite);
|
2010-03-12 17:04:31 +00:00
|
|
|
|
|
|
|
if (err) {
|
2016-09-15 14:59:04 +00:00
|
|
|
error(_("failed to copy notes from '%s' to '%s'"),
|
2010-03-12 17:04:31 +00:00
|
|
|
split[0]->buf, split[1]->buf);
|
|
|
|
ret = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
strbuf_list_free(split);
|
|
|
|
}
|
|
|
|
|
2010-03-12 17:04:32 +00:00
|
|
|
if (!rewrite_cmd) {
|
2013-06-12 00:12:59 +00:00
|
|
|
commit_notes(t, msg);
|
2010-03-12 17:04:32 +00:00
|
|
|
free_notes(t);
|
|
|
|
} else {
|
2013-06-12 00:12:59 +00:00
|
|
|
finish_copy_notes_for_rewrite(c, msg);
|
2010-03-12 17:04:32 +00:00
|
|
|
}
|
2017-08-30 17:57:30 +00:00
|
|
|
strbuf_release(&buf);
|
2010-03-12 17:04:31 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2015-10-08 02:54:43 +00:00
|
|
|
static struct notes_tree *init_notes_check(const char *subcommand,
|
|
|
|
int flags)
|
2010-02-13 21:28:20 +00:00
|
|
|
{
|
|
|
|
struct notes_tree *t;
|
2015-10-08 02:54:43 +00:00
|
|
|
const char *ref;
|
|
|
|
init_notes(NULL, NULL, NULL, flags);
|
2010-02-27 08:59:22 +00:00
|
|
|
t = &default_notes_tree;
|
2010-02-13 21:28:24 +00:00
|
|
|
|
2015-10-08 02:54:43 +00:00
|
|
|
ref = (flags & NOTES_INIT_WRITABLE) ? t->update_ref : t->ref;
|
|
|
|
if (!starts_with(ref, "refs/notes/"))
|
C style: use standard style for "TRANSLATORS" comments
Change all the "TRANSLATORS: [...]" comments in the C code to use the
regular Git coding style, and amend the style guide so that the
example there uses that style.
This custom style was necessary back in 2010 when the gettext support
was initially added, and was subsequently documented in commit
cbcfd4e3ea ("i18n: mention "TRANSLATORS:" marker in
Documentation/CodingGuidelines", 2014-04-18).
GNU xgettext hasn't had the parsing limitation that necessitated this
exception for almost 3 years. Since its 0.19 release on 2014-06-02
it's been able to recognize TRANSLATOR comments in the standard Git
comment syntax[1].
Usually we'd like to keep compatibility with software that's that
young, but in this case literally the only person who needs to be
using a gettext newer than 3 years old is Jiang Xin (the only person
who runs & commits "make pot" results), so I think in this case we can
make an exception.
This xgettext parsing feature was added after a thread on the Git
mailing list[2] which continued on the bug-gettext[3] list, but we
never subsequently changed our style & styleguide, do so.
There are already longstanding changes in git that use the standard
comment style & have their TRANSLATORS comments extracted properly
without getting the literal "*"'s mixed up in the text, as would
happen before xgettext 0.19.
Commit 7ff2683253 ("builtin-am: implement -i/--interactive",
2015-08-04) added one such comment, which in commit df0617bfa7 ("l10n:
git.pot: v2.6.0 round 1 (123 new, 41 removed)", 2015-09-05) got picked
up in the po/git.pot file with the right format, showing that Jiang
already runs a modern xgettext.
The xgettext parser does not handle the sort of non-standard comment
style that I'm amending here in sequencer.c, but that isn't standard
Git comment syntax anyway. With this change to sequencer.c & "make
pot" the comment in the pot file is now correct:
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
-#. * "rebase -i".
+#. "rebase -i".
1. http://git.savannah.gnu.org/cgit/gettext.git/commit/?id=10af7fe6bd
2. <2ce9ec406501d112e032c8208417f8100bed04c6.1397712142.git.worldhello.net@gmail.com>
(https://public-inbox.org/git/2ce9ec406501d112e032c8208417f8100bed04c6.1397712142.git.worldhello.net@gmail.com/)
3. https://lists.gnu.org/archive/html/bug-gettext/2014-04/msg00016.html
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Acked-by: Jiang Xin <worldhello.net@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-05-11 21:20:12 +00:00
|
|
|
/*
|
|
|
|
* TRANSLATORS: the first %s will be replaced by a git
|
|
|
|
* notes command: 'add', 'merge', 'remove', etc.
|
|
|
|
*/
|
2016-09-15 14:59:04 +00:00
|
|
|
die(_("refusing to %s notes in %s (outside of refs/notes/)"),
|
2015-10-08 02:54:43 +00:00
|
|
|
subcommand, ref);
|
2010-02-27 08:59:22 +00:00
|
|
|
return t;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int list(int argc, const char **argv, const char *prefix)
|
2010-02-13 21:28:20 +00:00
|
|
|
{
|
|
|
|
struct notes_tree *t;
|
2017-05-30 17:30:42 +00:00
|
|
|
struct object_id object;
|
2017-05-30 17:30:40 +00:00
|
|
|
const struct object_id *note;
|
2010-02-27 08:59:22 +00:00
|
|
|
int retval = -1;
|
2010-02-13 21:28:20 +00:00
|
|
|
struct option options[] = {
|
|
|
|
OPT_END()
|
|
|
|
};
|
|
|
|
|
2010-02-27 08:59:22 +00:00
|
|
|
if (argc)
|
|
|
|
argc = parse_options(argc, argv, prefix, options,
|
|
|
|
git_notes_list_usage, 0);
|
2010-02-13 21:28:20 +00:00
|
|
|
|
2010-02-27 08:59:22 +00:00
|
|
|
if (1 < argc) {
|
2011-02-22 23:42:26 +00:00
|
|
|
error(_("too many parameters"));
|
2010-02-27 08:59:22 +00:00
|
|
|
usage_with_options(git_notes_list_usage, options);
|
2010-03-12 17:04:35 +00:00
|
|
|
}
|
|
|
|
|
2015-10-08 02:54:43 +00:00
|
|
|
t = init_notes_check("list", 0);
|
2010-02-27 08:59:22 +00:00
|
|
|
if (argc) {
|
2017-05-30 17:30:42 +00:00
|
|
|
if (get_oid(argv[0], &object))
|
2016-09-15 14:59:04 +00:00
|
|
|
die(_("failed to resolve '%s' as a valid ref."), argv[0]);
|
2017-05-30 17:30:43 +00:00
|
|
|
note = get_note(t, &object);
|
2010-02-27 08:59:22 +00:00
|
|
|
if (note) {
|
2017-05-30 17:30:40 +00:00
|
|
|
puts(oid_to_hex(note));
|
2010-02-27 08:59:22 +00:00
|
|
|
retval = 0;
|
|
|
|
} else
|
2016-09-15 14:59:04 +00:00
|
|
|
retval = error(_("no note found for object %s."),
|
2017-05-30 17:30:42 +00:00
|
|
|
oid_to_hex(&object));
|
2010-02-27 08:59:22 +00:00
|
|
|
} else
|
|
|
|
retval = for_each_note(t, 0, list_each_note, NULL);
|
2010-02-13 21:28:20 +00:00
|
|
|
|
2010-02-27 08:59:22 +00:00
|
|
|
free_notes(t);
|
|
|
|
return retval;
|
|
|
|
}
|
2010-02-13 21:28:20 +00:00
|
|
|
|
2011-03-30 00:02:55 +00:00
|
|
|
static int append_edit(int argc, const char **argv, const char *prefix);
|
|
|
|
|
2010-02-27 08:59:22 +00:00
|
|
|
static int add(int argc, const char **argv, const char *prefix)
|
|
|
|
{
|
2014-11-12 00:40:14 +00:00
|
|
|
int force = 0, allow_empty = 0;
|
2010-02-13 21:28:25 +00:00
|
|
|
const char *object_ref;
|
2010-02-27 08:59:22 +00:00
|
|
|
struct notes_tree *t;
|
2017-05-30 17:30:42 +00:00
|
|
|
struct object_id object, new_note;
|
2017-05-30 17:30:40 +00:00
|
|
|
const struct object_id *note;
|
2014-11-09 12:30:50 +00:00
|
|
|
struct note_data d = { 0, 0, NULL, STRBUF_INIT };
|
2010-02-13 21:28:20 +00:00
|
|
|
struct option options[] = {
|
2014-11-09 12:30:49 +00:00
|
|
|
{ OPTION_CALLBACK, 'm', "message", &d, N_("message"),
|
2012-08-20 12:32:28 +00:00
|
|
|
N_("note contents as a string"), PARSE_OPT_NONEG,
|
2010-02-25 00:48:11 +00:00
|
|
|
parse_msg_arg},
|
2014-11-09 12:30:49 +00:00
|
|
|
{ OPTION_CALLBACK, 'F', "file", &d, N_("file"),
|
2012-08-20 12:32:28 +00:00
|
|
|
N_("note contents in a file"), PARSE_OPT_NONEG,
|
2010-02-25 00:48:11 +00:00
|
|
|
parse_file_arg},
|
2014-11-09 12:30:49 +00:00
|
|
|
{ OPTION_CALLBACK, 'c', "reedit-message", &d, N_("object"),
|
2012-08-20 12:32:28 +00:00
|
|
|
N_("reuse and edit specified note object"), PARSE_OPT_NONEG,
|
2010-02-25 00:48:11 +00:00
|
|
|
parse_reedit_arg},
|
2014-11-09 12:30:49 +00:00
|
|
|
{ OPTION_CALLBACK, 'C', "reuse-message", &d, N_("object"),
|
2012-08-20 12:32:28 +00:00
|
|
|
N_("reuse specified note object"), PARSE_OPT_NONEG,
|
2010-02-25 00:48:11 +00:00
|
|
|
parse_reuse_arg},
|
2014-11-12 00:40:14 +00:00
|
|
|
OPT_BOOL(0, "allow-empty", &allow_empty,
|
|
|
|
N_("allow storing empty note")),
|
2018-02-09 11:02:08 +00:00
|
|
|
OPT__FORCE(&force, N_("replace existing notes"), PARSE_OPT_NOCOMPLETE),
|
2010-02-13 21:28:20 +00:00
|
|
|
OPT_END()
|
|
|
|
};
|
|
|
|
|
2010-02-27 08:59:22 +00:00
|
|
|
argc = parse_options(argc, argv, prefix, options, git_notes_add_usage,
|
2011-03-30 00:02:55 +00:00
|
|
|
PARSE_OPT_KEEP_ARGV0);
|
2010-02-13 21:28:20 +00:00
|
|
|
|
2011-03-30 00:02:55 +00:00
|
|
|
if (2 < argc) {
|
2011-02-22 23:42:26 +00:00
|
|
|
error(_("too many parameters"));
|
2010-02-27 08:59:22 +00:00
|
|
|
usage_with_options(git_notes_add_usage, options);
|
2010-03-12 17:04:35 +00:00
|
|
|
}
|
|
|
|
|
2011-03-30 00:02:55 +00:00
|
|
|
object_ref = argc > 1 ? argv[1] : "HEAD";
|
2010-02-13 21:28:20 +00:00
|
|
|
|
2017-05-30 17:30:42 +00:00
|
|
|
if (get_oid(object_ref, &object))
|
2016-09-15 14:59:04 +00:00
|
|
|
die(_("failed to resolve '%s' as a valid ref."), object_ref);
|
2010-02-13 21:28:20 +00:00
|
|
|
|
2015-10-08 02:54:43 +00:00
|
|
|
t = init_notes_check("add", NOTES_INIT_WRITABLE);
|
2017-05-30 17:30:43 +00:00
|
|
|
note = get_note(t, &object);
|
2010-02-13 21:28:25 +00:00
|
|
|
|
2010-02-27 08:59:22 +00:00
|
|
|
if (note) {
|
|
|
|
if (!force) {
|
2014-11-12 00:40:12 +00:00
|
|
|
free_notes(t);
|
|
|
|
if (d.given) {
|
2014-11-09 12:30:50 +00:00
|
|
|
free_note_data(&d);
|
2014-11-12 00:40:12 +00:00
|
|
|
return error(_("Cannot add notes. "
|
|
|
|
"Found existing notes for object %s. "
|
|
|
|
"Use '-f' to overwrite existing notes"),
|
2017-05-30 17:30:42 +00:00
|
|
|
oid_to_hex(&object));
|
2011-03-30 00:02:55 +00:00
|
|
|
}
|
2014-11-12 00:40:12 +00:00
|
|
|
/*
|
|
|
|
* Redirect to "edit" subcommand.
|
|
|
|
*
|
|
|
|
* We only end up here if none of -m/-F/-c/-C or -f are
|
|
|
|
* given. The original args are therefore still in
|
|
|
|
* argv[0-1].
|
|
|
|
*/
|
|
|
|
argv[0] = "edit";
|
|
|
|
return append_edit(argc, argv, prefix);
|
2010-02-27 08:59:22 +00:00
|
|
|
}
|
2011-02-22 23:42:26 +00:00
|
|
|
fprintf(stderr, _("Overwriting existing notes for object %s\n"),
|
2017-05-30 17:30:42 +00:00
|
|
|
oid_to_hex(&object));
|
2010-02-13 21:28:34 +00:00
|
|
|
}
|
|
|
|
|
2018-03-12 02:27:48 +00:00
|
|
|
prepare_note_data(&object, &d, note);
|
2014-11-12 00:40:14 +00:00
|
|
|
if (d.buf.len || allow_empty) {
|
2018-01-28 00:13:19 +00:00
|
|
|
write_note_data(&d, &new_note);
|
2017-05-30 17:30:43 +00:00
|
|
|
if (add_note(t, &object, &new_note, combine_notes_overwrite))
|
2018-05-02 09:38:39 +00:00
|
|
|
BUG("combine_notes_overwrite failed");
|
2014-11-12 00:40:13 +00:00
|
|
|
commit_notes(t, "Notes added by 'git notes add'");
|
|
|
|
} else {
|
|
|
|
fprintf(stderr, _("Removing note for object %s\n"),
|
2017-05-30 17:30:42 +00:00
|
|
|
oid_to_hex(&object));
|
|
|
|
remove_note(t, object.hash);
|
2014-11-12 00:40:13 +00:00
|
|
|
commit_notes(t, "Notes removed by 'git notes add'");
|
|
|
|
}
|
2010-03-12 17:04:31 +00:00
|
|
|
|
2014-11-12 00:40:13 +00:00
|
|
|
free_note_data(&d);
|
2010-02-27 08:59:22 +00:00
|
|
|
free_notes(t);
|
2014-11-12 00:40:12 +00:00
|
|
|
return 0;
|
2010-02-27 08:59:22 +00:00
|
|
|
}
|
2010-02-13 21:28:20 +00:00
|
|
|
|
2010-02-27 08:59:22 +00:00
|
|
|
static int copy(int argc, const char **argv, const char *prefix)
|
|
|
|
{
|
|
|
|
int retval = 0, force = 0, from_stdin = 0;
|
2017-05-30 17:30:40 +00:00
|
|
|
const struct object_id *from_note, *note;
|
2010-02-27 08:59:22 +00:00
|
|
|
const char *object_ref;
|
2017-05-30 17:30:42 +00:00
|
|
|
struct object_id object, from_obj;
|
2010-02-27 08:59:22 +00:00
|
|
|
struct notes_tree *t;
|
|
|
|
const char *rewrite_cmd = NULL;
|
|
|
|
struct option options[] = {
|
2018-02-09 11:02:08 +00:00
|
|
|
OPT__FORCE(&force, N_("replace existing notes"), PARSE_OPT_NOCOMPLETE),
|
2013-08-03 11:51:19 +00:00
|
|
|
OPT_BOOL(0, "stdin", &from_stdin, N_("read objects from stdin")),
|
2012-08-20 12:32:28 +00:00
|
|
|
OPT_STRING(0, "for-rewrite", &rewrite_cmd, N_("command"),
|
|
|
|
N_("load rewriting config for <command> (implies "
|
|
|
|
"--stdin)")),
|
2010-02-27 08:59:22 +00:00
|
|
|
OPT_END()
|
|
|
|
};
|
2010-02-13 21:28:20 +00:00
|
|
|
|
2010-02-27 08:59:22 +00:00
|
|
|
argc = parse_options(argc, argv, prefix, options, git_notes_copy_usage,
|
|
|
|
0);
|
2010-02-13 21:28:30 +00:00
|
|
|
|
2010-02-27 08:59:22 +00:00
|
|
|
if (from_stdin || rewrite_cmd) {
|
|
|
|
if (argc) {
|
2011-02-22 23:42:26 +00:00
|
|
|
error(_("too many parameters"));
|
2010-02-27 08:59:22 +00:00
|
|
|
usage_with_options(git_notes_copy_usage, options);
|
2010-02-13 21:28:37 +00:00
|
|
|
} else {
|
2010-02-27 08:59:22 +00:00
|
|
|
return notes_copy_from_stdin(force, rewrite_cmd);
|
2010-02-13 21:28:38 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-06-28 08:59:07 +00:00
|
|
|
if (argc < 2) {
|
2011-02-22 23:42:26 +00:00
|
|
|
error(_("too few parameters"));
|
2010-06-28 08:59:07 +00:00
|
|
|
usage_with_options(git_notes_copy_usage, options);
|
|
|
|
}
|
2010-02-27 08:59:22 +00:00
|
|
|
if (2 < argc) {
|
2011-02-22 23:42:26 +00:00
|
|
|
error(_("too many parameters"));
|
2010-02-27 08:59:22 +00:00
|
|
|
usage_with_options(git_notes_copy_usage, options);
|
2010-02-13 21:28:20 +00:00
|
|
|
}
|
|
|
|
|
2017-05-30 17:30:42 +00:00
|
|
|
if (get_oid(argv[0], &from_obj))
|
2016-09-15 14:59:04 +00:00
|
|
|
die(_("failed to resolve '%s' as a valid ref."), argv[0]);
|
2010-02-13 21:28:20 +00:00
|
|
|
|
2010-02-27 08:59:22 +00:00
|
|
|
object_ref = 1 < argc ? argv[1] : "HEAD";
|
2010-02-13 21:28:20 +00:00
|
|
|
|
2017-05-30 17:30:42 +00:00
|
|
|
if (get_oid(object_ref, &object))
|
2016-09-15 14:59:04 +00:00
|
|
|
die(_("failed to resolve '%s' as a valid ref."), object_ref);
|
2010-02-13 21:28:20 +00:00
|
|
|
|
2015-10-08 02:54:43 +00:00
|
|
|
t = init_notes_check("copy", NOTES_INIT_WRITABLE);
|
2017-05-30 17:30:43 +00:00
|
|
|
note = get_note(t, &object);
|
2010-02-13 21:28:20 +00:00
|
|
|
|
2010-02-27 08:59:22 +00:00
|
|
|
if (note) {
|
2010-02-13 21:28:37 +00:00
|
|
|
if (!force) {
|
2011-02-22 23:42:26 +00:00
|
|
|
retval = error(_("Cannot copy notes. Found existing "
|
2010-02-27 08:59:22 +00:00
|
|
|
"notes for object %s. Use '-f' to "
|
2011-02-22 23:42:26 +00:00
|
|
|
"overwrite existing notes"),
|
2017-05-30 17:30:42 +00:00
|
|
|
oid_to_hex(&object));
|
2010-02-27 08:59:22 +00:00
|
|
|
goto out;
|
2010-02-13 21:28:37 +00:00
|
|
|
}
|
2011-02-22 23:42:26 +00:00
|
|
|
fprintf(stderr, _("Overwriting existing notes for object %s\n"),
|
2017-05-30 17:30:42 +00:00
|
|
|
oid_to_hex(&object));
|
2010-02-13 21:28:30 +00:00
|
|
|
}
|
|
|
|
|
2017-05-30 17:30:43 +00:00
|
|
|
from_note = get_note(t, &from_obj);
|
2010-02-27 08:59:22 +00:00
|
|
|
if (!from_note) {
|
2016-09-15 14:59:04 +00:00
|
|
|
retval = error(_("missing notes on source object %s. Cannot "
|
2017-05-30 17:30:42 +00:00
|
|
|
"copy."), oid_to_hex(&from_obj));
|
2010-02-27 08:59:22 +00:00
|
|
|
goto out;
|
2010-02-13 21:28:20 +00:00
|
|
|
}
|
|
|
|
|
2017-05-30 17:30:43 +00:00
|
|
|
if (add_note(t, &object, from_note, combine_notes_overwrite))
|
2018-05-02 09:38:39 +00:00
|
|
|
BUG("combine_notes_overwrite failed");
|
2010-02-27 08:59:22 +00:00
|
|
|
commit_notes(t, "Notes added by 'git notes copy'");
|
|
|
|
out:
|
|
|
|
free_notes(t);
|
|
|
|
return retval;
|
|
|
|
}
|
2010-02-13 21:28:32 +00:00
|
|
|
|
2010-02-27 08:59:22 +00:00
|
|
|
static int append_edit(int argc, const char **argv, const char *prefix)
|
|
|
|
{
|
2014-11-12 00:40:14 +00:00
|
|
|
int allow_empty = 0;
|
2010-02-27 08:59:22 +00:00
|
|
|
const char *object_ref;
|
|
|
|
struct notes_tree *t;
|
2017-05-30 17:30:42 +00:00
|
|
|
struct object_id object, new_note;
|
2017-05-30 17:30:40 +00:00
|
|
|
const struct object_id *note;
|
2017-03-28 19:46:50 +00:00
|
|
|
char *logmsg;
|
2010-02-27 08:59:22 +00:00
|
|
|
const char * const *usage;
|
2014-11-09 12:30:50 +00:00
|
|
|
struct note_data d = { 0, 0, NULL, STRBUF_INIT };
|
2010-02-27 08:59:22 +00:00
|
|
|
struct option options[] = {
|
2014-11-09 12:30:49 +00:00
|
|
|
{ OPTION_CALLBACK, 'm', "message", &d, N_("message"),
|
2012-08-20 12:32:28 +00:00
|
|
|
N_("note contents as a string"), PARSE_OPT_NONEG,
|
2010-02-27 08:59:22 +00:00
|
|
|
parse_msg_arg},
|
2014-11-09 12:30:49 +00:00
|
|
|
{ OPTION_CALLBACK, 'F', "file", &d, N_("file"),
|
2012-08-20 12:32:28 +00:00
|
|
|
N_("note contents in a file"), PARSE_OPT_NONEG,
|
2010-02-27 08:59:22 +00:00
|
|
|
parse_file_arg},
|
2014-11-09 12:30:49 +00:00
|
|
|
{ OPTION_CALLBACK, 'c', "reedit-message", &d, N_("object"),
|
2012-08-20 12:32:28 +00:00
|
|
|
N_("reuse and edit specified note object"), PARSE_OPT_NONEG,
|
2010-02-27 08:59:22 +00:00
|
|
|
parse_reedit_arg},
|
2014-11-09 12:30:49 +00:00
|
|
|
{ OPTION_CALLBACK, 'C', "reuse-message", &d, N_("object"),
|
2012-08-20 12:32:28 +00:00
|
|
|
N_("reuse specified note object"), PARSE_OPT_NONEG,
|
2010-02-27 08:59:22 +00:00
|
|
|
parse_reuse_arg},
|
2014-11-12 00:40:14 +00:00
|
|
|
OPT_BOOL(0, "allow-empty", &allow_empty,
|
|
|
|
N_("allow storing empty note")),
|
2010-02-27 08:59:22 +00:00
|
|
|
OPT_END()
|
|
|
|
};
|
|
|
|
int edit = !strcmp(argv[0], "edit");
|
|
|
|
|
|
|
|
usage = edit ? git_notes_edit_usage : git_notes_append_usage;
|
|
|
|
argc = parse_options(argc, argv, prefix, options, usage,
|
|
|
|
PARSE_OPT_KEEP_ARGV0);
|
2010-02-13 21:28:25 +00:00
|
|
|
|
2010-02-27 08:59:22 +00:00
|
|
|
if (2 < argc) {
|
2011-02-22 23:42:26 +00:00
|
|
|
error(_("too many parameters"));
|
2010-02-27 08:59:22 +00:00
|
|
|
usage_with_options(usage, options);
|
2010-02-13 21:28:20 +00:00
|
|
|
}
|
|
|
|
|
2014-11-09 12:30:49 +00:00
|
|
|
if (d.given && edit)
|
2011-02-22 23:42:26 +00:00
|
|
|
fprintf(stderr, _("The -m/-F/-c/-C options have been deprecated "
|
2010-02-27 08:59:22 +00:00
|
|
|
"for the 'edit' subcommand.\n"
|
2011-02-22 23:42:26 +00:00
|
|
|
"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"));
|
2010-02-27 08:59:22 +00:00
|
|
|
|
|
|
|
object_ref = 1 < argc ? argv[1] : "HEAD";
|
|
|
|
|
2017-05-30 17:30:42 +00:00
|
|
|
if (get_oid(object_ref, &object))
|
2016-09-15 14:59:04 +00:00
|
|
|
die(_("failed to resolve '%s' as a valid ref."), object_ref);
|
2010-02-27 08:59:22 +00:00
|
|
|
|
2015-10-08 02:54:43 +00:00
|
|
|
t = init_notes_check(argv[0], NOTES_INIT_WRITABLE);
|
2017-05-30 17:30:43 +00:00
|
|
|
note = get_note(t, &object);
|
2010-02-27 08:59:22 +00:00
|
|
|
|
2018-03-12 02:27:48 +00:00
|
|
|
prepare_note_data(&object, &d, edit && note ? note : NULL);
|
2010-02-13 21:28:37 +00:00
|
|
|
|
2014-11-12 00:40:13 +00:00
|
|
|
if (note && !edit) {
|
|
|
|
/* Append buf to previous note contents */
|
|
|
|
unsigned long size;
|
|
|
|
enum object_type type;
|
sha1_file: convert read_sha1_file to struct object_id
Convert read_sha1_file to take a pointer to struct object_id and rename
it read_object_file. Do the same for read_sha1_file_extended.
Convert one use in grep.c to use the new function without any other code
change, since the pointer being passed is a void pointer that is already
initialized with a pointer to struct object_id. Update the declaration
and definitions of the modified functions, and apply the following
semantic patch to convert the remaining callers:
@@
expression E1, E2, E3;
@@
- read_sha1_file(E1.hash, E2, E3)
+ read_object_file(&E1, E2, E3)
@@
expression E1, E2, E3;
@@
- read_sha1_file(E1->hash, E2, E3)
+ read_object_file(E1, E2, E3)
@@
expression E1, E2, E3, E4;
@@
- read_sha1_file_extended(E1.hash, E2, E3, E4)
+ read_object_file_extended(&E1, E2, E3, E4)
@@
expression E1, E2, E3, E4;
@@
- read_sha1_file_extended(E1->hash, E2, E3, E4)
+ read_object_file_extended(E1, E2, E3, E4)
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-03-12 02:27:53 +00:00
|
|
|
char *prev_buf = read_object_file(note, &type, &size);
|
2014-11-12 00:40:13 +00:00
|
|
|
|
|
|
|
strbuf_grow(&d.buf, size + 1);
|
|
|
|
if (d.buf.len && prev_buf && size)
|
|
|
|
strbuf_insert(&d.buf, 0, "\n", 1);
|
|
|
|
if (prev_buf && size)
|
|
|
|
strbuf_insert(&d.buf, 0, prev_buf, size);
|
|
|
|
free(prev_buf);
|
|
|
|
}
|
2010-02-13 21:28:37 +00:00
|
|
|
|
2014-11-12 00:40:14 +00:00
|
|
|
if (d.buf.len || allow_empty) {
|
2018-01-28 00:13:19 +00:00
|
|
|
write_note_data(&d, &new_note);
|
2017-05-30 17:30:43 +00:00
|
|
|
if (add_note(t, &object, &new_note, combine_notes_overwrite))
|
2018-05-02 09:38:39 +00:00
|
|
|
BUG("combine_notes_overwrite failed");
|
2017-03-28 19:46:50 +00:00
|
|
|
logmsg = xstrfmt("Notes added by 'git notes %s'", argv[0]);
|
2014-11-12 00:40:13 +00:00
|
|
|
} else {
|
|
|
|
fprintf(stderr, _("Removing note for object %s\n"),
|
2017-05-30 17:30:42 +00:00
|
|
|
oid_to_hex(&object));
|
|
|
|
remove_note(t, object.hash);
|
2017-03-28 19:46:50 +00:00
|
|
|
logmsg = xstrfmt("Notes removed by 'git notes %s'", argv[0]);
|
2014-11-12 00:40:13 +00:00
|
|
|
}
|
2010-02-13 21:28:24 +00:00
|
|
|
commit_notes(t, logmsg);
|
2014-11-12 00:40:13 +00:00
|
|
|
|
2017-03-28 19:46:50 +00:00
|
|
|
free(logmsg);
|
2014-11-12 00:40:13 +00:00
|
|
|
free_note_data(&d);
|
2010-02-13 21:28:20 +00:00
|
|
|
free_notes(t);
|
2010-02-27 08:59:22 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int show(int argc, const char **argv, const char *prefix)
|
|
|
|
{
|
|
|
|
const char *object_ref;
|
|
|
|
struct notes_tree *t;
|
2017-05-30 17:30:42 +00:00
|
|
|
struct object_id object;
|
2017-05-30 17:30:40 +00:00
|
|
|
const struct object_id *note;
|
2010-02-27 08:59:22 +00:00
|
|
|
int retval;
|
|
|
|
struct option options[] = {
|
|
|
|
OPT_END()
|
|
|
|
};
|
|
|
|
|
|
|
|
argc = parse_options(argc, argv, prefix, options, git_notes_show_usage,
|
|
|
|
0);
|
|
|
|
|
|
|
|
if (1 < argc) {
|
2011-02-22 23:42:26 +00:00
|
|
|
error(_("too many parameters"));
|
2010-02-27 08:59:22 +00:00
|
|
|
usage_with_options(git_notes_show_usage, options);
|
|
|
|
}
|
|
|
|
|
|
|
|
object_ref = argc ? argv[0] : "HEAD";
|
|
|
|
|
2017-05-30 17:30:42 +00:00
|
|
|
if (get_oid(object_ref, &object))
|
2016-09-15 14:59:04 +00:00
|
|
|
die(_("failed to resolve '%s' as a valid ref."), object_ref);
|
2010-02-27 08:59:22 +00:00
|
|
|
|
2015-10-08 02:54:43 +00:00
|
|
|
t = init_notes_check("show", 0);
|
2017-05-30 17:30:43 +00:00
|
|
|
note = get_note(t, &object);
|
2010-02-27 08:59:22 +00:00
|
|
|
|
|
|
|
if (!note)
|
2016-09-15 14:59:04 +00:00
|
|
|
retval = error(_("no note found for object %s."),
|
2017-05-30 17:30:42 +00:00
|
|
|
oid_to_hex(&object));
|
2010-02-27 08:59:22 +00:00
|
|
|
else {
|
2017-05-30 17:30:40 +00:00
|
|
|
const char *show_args[3] = {"show", oid_to_hex(note), NULL};
|
2010-02-27 08:59:22 +00:00
|
|
|
retval = execv_git_cmd(show_args);
|
|
|
|
}
|
|
|
|
free_notes(t);
|
2010-02-13 21:28:37 +00:00
|
|
|
return retval;
|
2010-02-13 21:28:20 +00:00
|
|
|
}
|
2010-02-27 08:59:22 +00:00
|
|
|
|
git notes merge: Manual conflict resolution, part 2/2
When the notes merge conflicts in .git/NOTES_MERGE_WORKTREE have been
resolved, we need to record a new notes commit on the appropriate notes
ref with the resolved notes.
This patch implements 'git notes merge --commit' which the user should
run after resolving conflicts in the notes merge worktree. This command
finalizes the notes merge by recombining the partial notes tree from
part 1 with the now-resolved conflicts in the notes merge worktree in a
merge commit, and updating the appropriate ref to this merge commit.
In order to correctly finalize the merge, we need to keep track of three
things:
- The partial merge result from part 1, containing the auto-merged notes.
This is now stored into a ref called .git/NOTES_MERGE_PARTIAL.
- The unmerged notes. These are already stored in
.git/NOTES_MERGE_WORKTREE, thanks to part 1.
- The notes ref to be updated by the finalized merge result. This is now
stored in a symref called .git/NOTES_MERGE_REF.
In addition to "git notes merge --commit", which uses the above details
to create the finalized notes merge commit, this patch also implements
"git notes merge --reset", which aborts the ongoing notes merge by simply
removing the files/directory described above.
FTR, "git notes merge --commit" reuses "git notes merge --reset" to remove
the information described above (.git/NOTES_MERGE_*) after the notes merge
have been successfully finalized.
The patch also contains documentation and testcases for the two new options.
This patch has been improved by the following contributions:
- Ævar Arnfjörð Bjarmason: Fix nonsense sentence in --commit description
- Sverre Rabbelier: Rename --reset to --abort
Thanks-to: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Thanks-to: Sverre Rabbelier <srabbelier@gmail.com>
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-11-09 21:49:52 +00:00
|
|
|
static int merge_abort(struct notes_merge_options *o)
|
|
|
|
{
|
|
|
|
int ret = 0;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Remove .git/NOTES_MERGE_PARTIAL and .git/NOTES_MERGE_REF, and call
|
|
|
|
* notes_merge_abort() to remove .git/NOTES_MERGE_WORKTREE.
|
|
|
|
*/
|
|
|
|
|
2017-02-21 01:10:32 +00:00
|
|
|
if (delete_ref(NULL, "NOTES_MERGE_PARTIAL", NULL, 0))
|
2016-09-15 14:59:04 +00:00
|
|
|
ret += error(_("failed to delete ref NOTES_MERGE_PARTIAL"));
|
2017-11-05 08:42:06 +00:00
|
|
|
if (delete_ref(NULL, "NOTES_MERGE_REF", NULL, REF_NO_DEREF))
|
2016-09-15 14:59:04 +00:00
|
|
|
ret += error(_("failed to delete ref NOTES_MERGE_REF"));
|
git notes merge: Manual conflict resolution, part 2/2
When the notes merge conflicts in .git/NOTES_MERGE_WORKTREE have been
resolved, we need to record a new notes commit on the appropriate notes
ref with the resolved notes.
This patch implements 'git notes merge --commit' which the user should
run after resolving conflicts in the notes merge worktree. This command
finalizes the notes merge by recombining the partial notes tree from
part 1 with the now-resolved conflicts in the notes merge worktree in a
merge commit, and updating the appropriate ref to this merge commit.
In order to correctly finalize the merge, we need to keep track of three
things:
- The partial merge result from part 1, containing the auto-merged notes.
This is now stored into a ref called .git/NOTES_MERGE_PARTIAL.
- The unmerged notes. These are already stored in
.git/NOTES_MERGE_WORKTREE, thanks to part 1.
- The notes ref to be updated by the finalized merge result. This is now
stored in a symref called .git/NOTES_MERGE_REF.
In addition to "git notes merge --commit", which uses the above details
to create the finalized notes merge commit, this patch also implements
"git notes merge --reset", which aborts the ongoing notes merge by simply
removing the files/directory described above.
FTR, "git notes merge --commit" reuses "git notes merge --reset" to remove
the information described above (.git/NOTES_MERGE_*) after the notes merge
have been successfully finalized.
The patch also contains documentation and testcases for the two new options.
This patch has been improved by the following contributions:
- Ævar Arnfjörð Bjarmason: Fix nonsense sentence in --commit description
- Sverre Rabbelier: Rename --reset to --abort
Thanks-to: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Thanks-to: Sverre Rabbelier <srabbelier@gmail.com>
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-11-09 21:49:52 +00:00
|
|
|
if (notes_merge_abort(o))
|
2016-09-15 14:59:04 +00:00
|
|
|
ret += error(_("failed to remove 'git notes merge' worktree"));
|
git notes merge: Manual conflict resolution, part 2/2
When the notes merge conflicts in .git/NOTES_MERGE_WORKTREE have been
resolved, we need to record a new notes commit on the appropriate notes
ref with the resolved notes.
This patch implements 'git notes merge --commit' which the user should
run after resolving conflicts in the notes merge worktree. This command
finalizes the notes merge by recombining the partial notes tree from
part 1 with the now-resolved conflicts in the notes merge worktree in a
merge commit, and updating the appropriate ref to this merge commit.
In order to correctly finalize the merge, we need to keep track of three
things:
- The partial merge result from part 1, containing the auto-merged notes.
This is now stored into a ref called .git/NOTES_MERGE_PARTIAL.
- The unmerged notes. These are already stored in
.git/NOTES_MERGE_WORKTREE, thanks to part 1.
- The notes ref to be updated by the finalized merge result. This is now
stored in a symref called .git/NOTES_MERGE_REF.
In addition to "git notes merge --commit", which uses the above details
to create the finalized notes merge commit, this patch also implements
"git notes merge --reset", which aborts the ongoing notes merge by simply
removing the files/directory described above.
FTR, "git notes merge --commit" reuses "git notes merge --reset" to remove
the information described above (.git/NOTES_MERGE_*) after the notes merge
have been successfully finalized.
The patch also contains documentation and testcases for the two new options.
This patch has been improved by the following contributions:
- Ævar Arnfjörð Bjarmason: Fix nonsense sentence in --commit description
- Sverre Rabbelier: Rename --reset to --abort
Thanks-to: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Thanks-to: Sverre Rabbelier <srabbelier@gmail.com>
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-11-09 21:49:52 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int merge_commit(struct notes_merge_options *o)
|
|
|
|
{
|
|
|
|
struct strbuf msg = STRBUF_INIT;
|
2017-02-21 23:47:29 +00:00
|
|
|
struct object_id oid, parent_oid;
|
git notes merge: Manual conflict resolution, part 2/2
When the notes merge conflicts in .git/NOTES_MERGE_WORKTREE have been
resolved, we need to record a new notes commit on the appropriate notes
ref with the resolved notes.
This patch implements 'git notes merge --commit' which the user should
run after resolving conflicts in the notes merge worktree. This command
finalizes the notes merge by recombining the partial notes tree from
part 1 with the now-resolved conflicts in the notes merge worktree in a
merge commit, and updating the appropriate ref to this merge commit.
In order to correctly finalize the merge, we need to keep track of three
things:
- The partial merge result from part 1, containing the auto-merged notes.
This is now stored into a ref called .git/NOTES_MERGE_PARTIAL.
- The unmerged notes. These are already stored in
.git/NOTES_MERGE_WORKTREE, thanks to part 1.
- The notes ref to be updated by the finalized merge result. This is now
stored in a symref called .git/NOTES_MERGE_REF.
In addition to "git notes merge --commit", which uses the above details
to create the finalized notes merge commit, this patch also implements
"git notes merge --reset", which aborts the ongoing notes merge by simply
removing the files/directory described above.
FTR, "git notes merge --commit" reuses "git notes merge --reset" to remove
the information described above (.git/NOTES_MERGE_*) after the notes merge
have been successfully finalized.
The patch also contains documentation and testcases for the two new options.
This patch has been improved by the following contributions:
- Ævar Arnfjörð Bjarmason: Fix nonsense sentence in --commit description
- Sverre Rabbelier: Rename --reset to --abort
Thanks-to: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Thanks-to: Sverre Rabbelier <srabbelier@gmail.com>
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-11-09 21:49:52 +00:00
|
|
|
struct notes_tree *t;
|
|
|
|
struct commit *partial;
|
|
|
|
struct pretty_print_context pretty_ctx;
|
2011-12-13 14:17:48 +00:00
|
|
|
void *local_ref_to_free;
|
2011-11-13 10:22:15 +00:00
|
|
|
int ret;
|
git notes merge: Manual conflict resolution, part 2/2
When the notes merge conflicts in .git/NOTES_MERGE_WORKTREE have been
resolved, we need to record a new notes commit on the appropriate notes
ref with the resolved notes.
This patch implements 'git notes merge --commit' which the user should
run after resolving conflicts in the notes merge worktree. This command
finalizes the notes merge by recombining the partial notes tree from
part 1 with the now-resolved conflicts in the notes merge worktree in a
merge commit, and updating the appropriate ref to this merge commit.
In order to correctly finalize the merge, we need to keep track of three
things:
- The partial merge result from part 1, containing the auto-merged notes.
This is now stored into a ref called .git/NOTES_MERGE_PARTIAL.
- The unmerged notes. These are already stored in
.git/NOTES_MERGE_WORKTREE, thanks to part 1.
- The notes ref to be updated by the finalized merge result. This is now
stored in a symref called .git/NOTES_MERGE_REF.
In addition to "git notes merge --commit", which uses the above details
to create the finalized notes merge commit, this patch also implements
"git notes merge --reset", which aborts the ongoing notes merge by simply
removing the files/directory described above.
FTR, "git notes merge --commit" reuses "git notes merge --reset" to remove
the information described above (.git/NOTES_MERGE_*) after the notes merge
have been successfully finalized.
The patch also contains documentation and testcases for the two new options.
This patch has been improved by the following contributions:
- Ævar Arnfjörð Bjarmason: Fix nonsense sentence in --commit description
- Sverre Rabbelier: Rename --reset to --abort
Thanks-to: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Thanks-to: Sverre Rabbelier <srabbelier@gmail.com>
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-11-09 21:49:52 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Read partial merge result from .git/NOTES_MERGE_PARTIAL,
|
|
|
|
* and target notes ref from .git/NOTES_MERGE_REF.
|
|
|
|
*/
|
|
|
|
|
2017-02-21 23:47:29 +00:00
|
|
|
if (get_oid("NOTES_MERGE_PARTIAL", &oid))
|
2016-09-15 14:59:04 +00:00
|
|
|
die(_("failed to read ref NOTES_MERGE_PARTIAL"));
|
Convert lookup_commit* to struct object_id
Convert lookup_commit, lookup_commit_or_die,
lookup_commit_reference, and lookup_commit_reference_gently to take
struct object_id arguments.
Introduce a temporary in parse_object buffer in order to convert this
function. This is required since in order to convert parse_object and
parse_object_buffer, lookup_commit_reference_gently and
lookup_commit_or_die would need to be converted. Not introducing a
temporary would therefore require that lookup_commit_or_die take a
struct object_id *, but lookup_commit would take unsigned char *,
leaving a confusing and hard-to-use interface.
parse_object_buffer will lose this temporary in a later patch.
This commit was created with manual changes to commit.c, commit.h, and
object.c, plus the following semantic patch:
@@
expression E1, E2;
@@
- lookup_commit_reference_gently(E1.hash, E2)
+ lookup_commit_reference_gently(&E1, E2)
@@
expression E1, E2;
@@
- lookup_commit_reference_gently(E1->hash, E2)
+ lookup_commit_reference_gently(E1, E2)
@@
expression E1;
@@
- lookup_commit_reference(E1.hash)
+ lookup_commit_reference(&E1)
@@
expression E1;
@@
- lookup_commit_reference(E1->hash)
+ lookup_commit_reference(E1)
@@
expression E1;
@@
- lookup_commit(E1.hash)
+ lookup_commit(&E1)
@@
expression E1;
@@
- lookup_commit(E1->hash)
+ lookup_commit(E1)
@@
expression E1, E2;
@@
- lookup_commit_or_die(E1.hash, E2)
+ lookup_commit_or_die(&E1, E2)
@@
expression E1, E2;
@@
- lookup_commit_or_die(E1->hash, E2)
+ lookup_commit_or_die(E1, E2)
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-05-06 22:10:10 +00:00
|
|
|
else if (!(partial = lookup_commit_reference(&oid)))
|
2016-09-15 14:59:04 +00:00
|
|
|
die(_("could not find commit from NOTES_MERGE_PARTIAL."));
|
git notes merge: Manual conflict resolution, part 2/2
When the notes merge conflicts in .git/NOTES_MERGE_WORKTREE have been
resolved, we need to record a new notes commit on the appropriate notes
ref with the resolved notes.
This patch implements 'git notes merge --commit' which the user should
run after resolving conflicts in the notes merge worktree. This command
finalizes the notes merge by recombining the partial notes tree from
part 1 with the now-resolved conflicts in the notes merge worktree in a
merge commit, and updating the appropriate ref to this merge commit.
In order to correctly finalize the merge, we need to keep track of three
things:
- The partial merge result from part 1, containing the auto-merged notes.
This is now stored into a ref called .git/NOTES_MERGE_PARTIAL.
- The unmerged notes. These are already stored in
.git/NOTES_MERGE_WORKTREE, thanks to part 1.
- The notes ref to be updated by the finalized merge result. This is now
stored in a symref called .git/NOTES_MERGE_REF.
In addition to "git notes merge --commit", which uses the above details
to create the finalized notes merge commit, this patch also implements
"git notes merge --reset", which aborts the ongoing notes merge by simply
removing the files/directory described above.
FTR, "git notes merge --commit" reuses "git notes merge --reset" to remove
the information described above (.git/NOTES_MERGE_*) after the notes merge
have been successfully finalized.
The patch also contains documentation and testcases for the two new options.
This patch has been improved by the following contributions:
- Ævar Arnfjörð Bjarmason: Fix nonsense sentence in --commit description
- Sverre Rabbelier: Rename --reset to --abort
Thanks-to: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Thanks-to: Sverre Rabbelier <srabbelier@gmail.com>
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-11-09 21:49:52 +00:00
|
|
|
else if (parse_commit(partial))
|
2016-09-15 14:59:04 +00:00
|
|
|
die(_("could not parse commit from NOTES_MERGE_PARTIAL."));
|
git notes merge: Manual conflict resolution, part 2/2
When the notes merge conflicts in .git/NOTES_MERGE_WORKTREE have been
resolved, we need to record a new notes commit on the appropriate notes
ref with the resolved notes.
This patch implements 'git notes merge --commit' which the user should
run after resolving conflicts in the notes merge worktree. This command
finalizes the notes merge by recombining the partial notes tree from
part 1 with the now-resolved conflicts in the notes merge worktree in a
merge commit, and updating the appropriate ref to this merge commit.
In order to correctly finalize the merge, we need to keep track of three
things:
- The partial merge result from part 1, containing the auto-merged notes.
This is now stored into a ref called .git/NOTES_MERGE_PARTIAL.
- The unmerged notes. These are already stored in
.git/NOTES_MERGE_WORKTREE, thanks to part 1.
- The notes ref to be updated by the finalized merge result. This is now
stored in a symref called .git/NOTES_MERGE_REF.
In addition to "git notes merge --commit", which uses the above details
to create the finalized notes merge commit, this patch also implements
"git notes merge --reset", which aborts the ongoing notes merge by simply
removing the files/directory described above.
FTR, "git notes merge --commit" reuses "git notes merge --reset" to remove
the information described above (.git/NOTES_MERGE_*) after the notes merge
have been successfully finalized.
The patch also contains documentation and testcases for the two new options.
This patch has been improved by the following contributions:
- Ævar Arnfjörð Bjarmason: Fix nonsense sentence in --commit description
- Sverre Rabbelier: Rename --reset to --abort
Thanks-to: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Thanks-to: Sverre Rabbelier <srabbelier@gmail.com>
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-11-09 21:49:52 +00:00
|
|
|
|
2010-11-09 21:49:54 +00:00
|
|
|
if (partial->parents)
|
2017-02-21 23:47:29 +00:00
|
|
|
oidcpy(&parent_oid, &partial->parents->item->object.oid);
|
2010-11-09 21:49:54 +00:00
|
|
|
else
|
2017-02-21 23:47:29 +00:00
|
|
|
oidclr(&parent_oid);
|
2010-11-09 21:49:54 +00:00
|
|
|
|
git notes merge: Manual conflict resolution, part 2/2
When the notes merge conflicts in .git/NOTES_MERGE_WORKTREE have been
resolved, we need to record a new notes commit on the appropriate notes
ref with the resolved notes.
This patch implements 'git notes merge --commit' which the user should
run after resolving conflicts in the notes merge worktree. This command
finalizes the notes merge by recombining the partial notes tree from
part 1 with the now-resolved conflicts in the notes merge worktree in a
merge commit, and updating the appropriate ref to this merge commit.
In order to correctly finalize the merge, we need to keep track of three
things:
- The partial merge result from part 1, containing the auto-merged notes.
This is now stored into a ref called .git/NOTES_MERGE_PARTIAL.
- The unmerged notes. These are already stored in
.git/NOTES_MERGE_WORKTREE, thanks to part 1.
- The notes ref to be updated by the finalized merge result. This is now
stored in a symref called .git/NOTES_MERGE_REF.
In addition to "git notes merge --commit", which uses the above details
to create the finalized notes merge commit, this patch also implements
"git notes merge --reset", which aborts the ongoing notes merge by simply
removing the files/directory described above.
FTR, "git notes merge --commit" reuses "git notes merge --reset" to remove
the information described above (.git/NOTES_MERGE_*) after the notes merge
have been successfully finalized.
The patch also contains documentation and testcases for the two new options.
This patch has been improved by the following contributions:
- Ævar Arnfjörð Bjarmason: Fix nonsense sentence in --commit description
- Sverre Rabbelier: Rename --reset to --abort
Thanks-to: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Thanks-to: Sverre Rabbelier <srabbelier@gmail.com>
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-11-09 21:49:52 +00:00
|
|
|
t = xcalloc(1, sizeof(struct notes_tree));
|
|
|
|
init_notes(t, "NOTES_MERGE_PARTIAL", combine_notes_overwrite, 0);
|
|
|
|
|
2011-12-13 14:17:48 +00:00
|
|
|
o->local_ref = local_ref_to_free =
|
refs: convert resolve_refdup and refs_resolve_refdup to struct object_id
All of the callers already pass the hash member of struct object_id, so
update them to pass a pointer to the struct directly,
This transformation was done with an update to declaration and
definition and the following semantic patch:
@@
expression E1, E2, E3, E4;
@@
- resolve_refdup(E1, E2, E3.hash, E4)
+ resolve_refdup(E1, E2, &E3, E4)
@@
expression E1, E2, E3, E4;
@@
- resolve_refdup(E1, E2, E3->hash, E4)
+ resolve_refdup(E1, E2, E3, E4)
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-10-15 22:06:55 +00:00
|
|
|
resolve_refdup("NOTES_MERGE_REF", 0, &oid, NULL);
|
git notes merge: Manual conflict resolution, part 2/2
When the notes merge conflicts in .git/NOTES_MERGE_WORKTREE have been
resolved, we need to record a new notes commit on the appropriate notes
ref with the resolved notes.
This patch implements 'git notes merge --commit' which the user should
run after resolving conflicts in the notes merge worktree. This command
finalizes the notes merge by recombining the partial notes tree from
part 1 with the now-resolved conflicts in the notes merge worktree in a
merge commit, and updating the appropriate ref to this merge commit.
In order to correctly finalize the merge, we need to keep track of three
things:
- The partial merge result from part 1, containing the auto-merged notes.
This is now stored into a ref called .git/NOTES_MERGE_PARTIAL.
- The unmerged notes. These are already stored in
.git/NOTES_MERGE_WORKTREE, thanks to part 1.
- The notes ref to be updated by the finalized merge result. This is now
stored in a symref called .git/NOTES_MERGE_REF.
In addition to "git notes merge --commit", which uses the above details
to create the finalized notes merge commit, this patch also implements
"git notes merge --reset", which aborts the ongoing notes merge by simply
removing the files/directory described above.
FTR, "git notes merge --commit" reuses "git notes merge --reset" to remove
the information described above (.git/NOTES_MERGE_*) after the notes merge
have been successfully finalized.
The patch also contains documentation and testcases for the two new options.
This patch has been improved by the following contributions:
- Ævar Arnfjörð Bjarmason: Fix nonsense sentence in --commit description
- Sverre Rabbelier: Rename --reset to --abort
Thanks-to: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Thanks-to: Sverre Rabbelier <srabbelier@gmail.com>
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-11-09 21:49:52 +00:00
|
|
|
if (!o->local_ref)
|
2016-09-15 14:59:04 +00:00
|
|
|
die(_("failed to resolve NOTES_MERGE_REF"));
|
git notes merge: Manual conflict resolution, part 2/2
When the notes merge conflicts in .git/NOTES_MERGE_WORKTREE have been
resolved, we need to record a new notes commit on the appropriate notes
ref with the resolved notes.
This patch implements 'git notes merge --commit' which the user should
run after resolving conflicts in the notes merge worktree. This command
finalizes the notes merge by recombining the partial notes tree from
part 1 with the now-resolved conflicts in the notes merge worktree in a
merge commit, and updating the appropriate ref to this merge commit.
In order to correctly finalize the merge, we need to keep track of three
things:
- The partial merge result from part 1, containing the auto-merged notes.
This is now stored into a ref called .git/NOTES_MERGE_PARTIAL.
- The unmerged notes. These are already stored in
.git/NOTES_MERGE_WORKTREE, thanks to part 1.
- The notes ref to be updated by the finalized merge result. This is now
stored in a symref called .git/NOTES_MERGE_REF.
In addition to "git notes merge --commit", which uses the above details
to create the finalized notes merge commit, this patch also implements
"git notes merge --reset", which aborts the ongoing notes merge by simply
removing the files/directory described above.
FTR, "git notes merge --commit" reuses "git notes merge --reset" to remove
the information described above (.git/NOTES_MERGE_*) after the notes merge
have been successfully finalized.
The patch also contains documentation and testcases for the two new options.
This patch has been improved by the following contributions:
- Ævar Arnfjörð Bjarmason: Fix nonsense sentence in --commit description
- Sverre Rabbelier: Rename --reset to --abort
Thanks-to: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Thanks-to: Sverre Rabbelier <srabbelier@gmail.com>
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-11-09 21:49:52 +00:00
|
|
|
|
2017-05-30 17:30:58 +00:00
|
|
|
if (notes_merge_commit(o, t, partial, &oid))
|
2016-09-15 14:59:04 +00:00
|
|
|
die(_("failed to finalize notes merge"));
|
git notes merge: Manual conflict resolution, part 2/2
When the notes merge conflicts in .git/NOTES_MERGE_WORKTREE have been
resolved, we need to record a new notes commit on the appropriate notes
ref with the resolved notes.
This patch implements 'git notes merge --commit' which the user should
run after resolving conflicts in the notes merge worktree. This command
finalizes the notes merge by recombining the partial notes tree from
part 1 with the now-resolved conflicts in the notes merge worktree in a
merge commit, and updating the appropriate ref to this merge commit.
In order to correctly finalize the merge, we need to keep track of three
things:
- The partial merge result from part 1, containing the auto-merged notes.
This is now stored into a ref called .git/NOTES_MERGE_PARTIAL.
- The unmerged notes. These are already stored in
.git/NOTES_MERGE_WORKTREE, thanks to part 1.
- The notes ref to be updated by the finalized merge result. This is now
stored in a symref called .git/NOTES_MERGE_REF.
In addition to "git notes merge --commit", which uses the above details
to create the finalized notes merge commit, this patch also implements
"git notes merge --reset", which aborts the ongoing notes merge by simply
removing the files/directory described above.
FTR, "git notes merge --commit" reuses "git notes merge --reset" to remove
the information described above (.git/NOTES_MERGE_*) after the notes merge
have been successfully finalized.
The patch also contains documentation and testcases for the two new options.
This patch has been improved by the following contributions:
- Ævar Arnfjörð Bjarmason: Fix nonsense sentence in --commit description
- Sverre Rabbelier: Rename --reset to --abort
Thanks-to: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Thanks-to: Sverre Rabbelier <srabbelier@gmail.com>
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-11-09 21:49:52 +00:00
|
|
|
|
|
|
|
/* Reuse existing commit message in reflog message */
|
|
|
|
memset(&pretty_ctx, 0, sizeof(pretty_ctx));
|
|
|
|
format_commit_message(partial, "%s", &msg, &pretty_ctx);
|
|
|
|
strbuf_trim(&msg);
|
|
|
|
strbuf_insert(&msg, 0, "notes: ", 7);
|
2017-10-15 22:06:51 +00:00
|
|
|
update_ref(msg.buf, o->local_ref, &oid,
|
|
|
|
is_null_oid(&parent_oid) ? NULL : &parent_oid,
|
2014-04-07 13:47:56 +00:00
|
|
|
0, UPDATE_REFS_DIE_ON_ERR);
|
git notes merge: Manual conflict resolution, part 2/2
When the notes merge conflicts in .git/NOTES_MERGE_WORKTREE have been
resolved, we need to record a new notes commit on the appropriate notes
ref with the resolved notes.
This patch implements 'git notes merge --commit' which the user should
run after resolving conflicts in the notes merge worktree. This command
finalizes the notes merge by recombining the partial notes tree from
part 1 with the now-resolved conflicts in the notes merge worktree in a
merge commit, and updating the appropriate ref to this merge commit.
In order to correctly finalize the merge, we need to keep track of three
things:
- The partial merge result from part 1, containing the auto-merged notes.
This is now stored into a ref called .git/NOTES_MERGE_PARTIAL.
- The unmerged notes. These are already stored in
.git/NOTES_MERGE_WORKTREE, thanks to part 1.
- The notes ref to be updated by the finalized merge result. This is now
stored in a symref called .git/NOTES_MERGE_REF.
In addition to "git notes merge --commit", which uses the above details
to create the finalized notes merge commit, this patch also implements
"git notes merge --reset", which aborts the ongoing notes merge by simply
removing the files/directory described above.
FTR, "git notes merge --commit" reuses "git notes merge --reset" to remove
the information described above (.git/NOTES_MERGE_*) after the notes merge
have been successfully finalized.
The patch also contains documentation and testcases for the two new options.
This patch has been improved by the following contributions:
- Ævar Arnfjörð Bjarmason: Fix nonsense sentence in --commit description
- Sverre Rabbelier: Rename --reset to --abort
Thanks-to: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Thanks-to: Sverre Rabbelier <srabbelier@gmail.com>
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-11-09 21:49:52 +00:00
|
|
|
|
|
|
|
free_notes(t);
|
|
|
|
strbuf_release(&msg);
|
2011-11-13 10:22:15 +00:00
|
|
|
ret = merge_abort(o);
|
2011-12-13 14:17:48 +00:00
|
|
|
free(local_ref_to_free);
|
2011-11-13 10:22:15 +00:00
|
|
|
return ret;
|
git notes merge: Manual conflict resolution, part 2/2
When the notes merge conflicts in .git/NOTES_MERGE_WORKTREE have been
resolved, we need to record a new notes commit on the appropriate notes
ref with the resolved notes.
This patch implements 'git notes merge --commit' which the user should
run after resolving conflicts in the notes merge worktree. This command
finalizes the notes merge by recombining the partial notes tree from
part 1 with the now-resolved conflicts in the notes merge worktree in a
merge commit, and updating the appropriate ref to this merge commit.
In order to correctly finalize the merge, we need to keep track of three
things:
- The partial merge result from part 1, containing the auto-merged notes.
This is now stored into a ref called .git/NOTES_MERGE_PARTIAL.
- The unmerged notes. These are already stored in
.git/NOTES_MERGE_WORKTREE, thanks to part 1.
- The notes ref to be updated by the finalized merge result. This is now
stored in a symref called .git/NOTES_MERGE_REF.
In addition to "git notes merge --commit", which uses the above details
to create the finalized notes merge commit, this patch also implements
"git notes merge --reset", which aborts the ongoing notes merge by simply
removing the files/directory described above.
FTR, "git notes merge --commit" reuses "git notes merge --reset" to remove
the information described above (.git/NOTES_MERGE_*) after the notes merge
have been successfully finalized.
The patch also contains documentation and testcases for the two new options.
This patch has been improved by the following contributions:
- Ævar Arnfjörð Bjarmason: Fix nonsense sentence in --commit description
- Sverre Rabbelier: Rename --reset to --abort
Thanks-to: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Thanks-to: Sverre Rabbelier <srabbelier@gmail.com>
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-11-09 21:49:52 +00:00
|
|
|
}
|
|
|
|
|
2015-08-17 21:33:33 +00:00
|
|
|
static int git_config_get_notes_strategy(const char *key,
|
|
|
|
enum notes_merge_strategy *strategy)
|
|
|
|
{
|
2016-04-01 00:35:43 +00:00
|
|
|
char *value;
|
2015-08-17 21:33:33 +00:00
|
|
|
|
2016-04-01 00:35:43 +00:00
|
|
|
if (git_config_get_string(key, &value))
|
2015-08-17 21:33:33 +00:00
|
|
|
return 1;
|
|
|
|
if (parse_notes_merge_strategy(value, strategy))
|
2016-06-17 20:21:14 +00:00
|
|
|
git_die_config(key, _("unknown notes merge strategy %s"), value);
|
2015-08-17 21:33:33 +00:00
|
|
|
|
2016-04-01 00:35:43 +00:00
|
|
|
free(value);
|
2015-08-17 21:33:33 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2010-11-09 21:49:46 +00:00
|
|
|
static int merge(int argc, const char **argv, const char *prefix)
|
|
|
|
{
|
|
|
|
struct strbuf remote_ref = STRBUF_INIT, msg = STRBUF_INIT;
|
2017-05-30 17:30:42 +00:00
|
|
|
struct object_id result_oid;
|
git notes merge: Handle real, non-conflicting notes merges
This continuation of the 'git notes merge' implementation teaches notes-merge
to properly do real merges between notes trees: Two diffs are performed, one
from $base to $remote, and another from $base to $local. The paths in each
diff are normalized to SHA1 object names. The two diffs are then consolidated
into a single list of change pairs to be evaluated. Each change pair consist
of:
- The annotated object's SHA1
- The $base SHA1 (i.e. the common ancestor notes for this object)
- The $local SHA1 (i.e. the current notes for this object)
- The $remote SHA1 (i.e. the to-be-merged notes for this object)
From the pair ($base -> $local, $base -> $remote), we can determine the merge
result using regular 3-way rules. If conflicts are encountered in this
process, we fail loudly and exit (conflict handling to be added in a future
patch), If we can complete the merge without conflicts, the resulting
notes tree is committed, and the current notes ref updated.
The patch includes added testcases verifying that we can successfully do real
conflict-less merges.
This patch has been improved by the following contributions:
- Jonathan Nieder: Future-proof by always checking add_note() return value
- Stephen Boyd: Use test_commit
- Jonathan Nieder: Use trace_printf(...) instead of OUTPUT(o, 5, ...)
- Junio C Hamano: fixup minor style issues
Thanks-to: Jonathan Nieder <jrnieder@gmail.com>
Thanks-to: Stephen Boyd <bebarino@gmail.com>
Thanks-to: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-11-14 23:54:11 +00:00
|
|
|
struct notes_tree *t;
|
2010-11-09 21:49:46 +00:00
|
|
|
struct notes_merge_options o;
|
git notes merge: Manual conflict resolution, part 2/2
When the notes merge conflicts in .git/NOTES_MERGE_WORKTREE have been
resolved, we need to record a new notes commit on the appropriate notes
ref with the resolved notes.
This patch implements 'git notes merge --commit' which the user should
run after resolving conflicts in the notes merge worktree. This command
finalizes the notes merge by recombining the partial notes tree from
part 1 with the now-resolved conflicts in the notes merge worktree in a
merge commit, and updating the appropriate ref to this merge commit.
In order to correctly finalize the merge, we need to keep track of three
things:
- The partial merge result from part 1, containing the auto-merged notes.
This is now stored into a ref called .git/NOTES_MERGE_PARTIAL.
- The unmerged notes. These are already stored in
.git/NOTES_MERGE_WORKTREE, thanks to part 1.
- The notes ref to be updated by the finalized merge result. This is now
stored in a symref called .git/NOTES_MERGE_REF.
In addition to "git notes merge --commit", which uses the above details
to create the finalized notes merge commit, this patch also implements
"git notes merge --reset", which aborts the ongoing notes merge by simply
removing the files/directory described above.
FTR, "git notes merge --commit" reuses "git notes merge --reset" to remove
the information described above (.git/NOTES_MERGE_*) after the notes merge
have been successfully finalized.
The patch also contains documentation and testcases for the two new options.
This patch has been improved by the following contributions:
- Ævar Arnfjörð Bjarmason: Fix nonsense sentence in --commit description
- Sverre Rabbelier: Rename --reset to --abort
Thanks-to: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Thanks-to: Sverre Rabbelier <srabbelier@gmail.com>
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-11-09 21:49:52 +00:00
|
|
|
int do_merge = 0, do_commit = 0, do_abort = 0;
|
2010-11-09 21:49:46 +00:00
|
|
|
int verbosity = 0, result;
|
2010-11-14 23:55:12 +00:00
|
|
|
const char *strategy = NULL;
|
2010-11-09 21:49:46 +00:00
|
|
|
struct option options[] = {
|
2012-08-20 12:32:28 +00:00
|
|
|
OPT_GROUP(N_("General options")),
|
2010-11-09 21:49:46 +00:00
|
|
|
OPT__VERBOSITY(&verbosity),
|
2012-08-20 12:32:28 +00:00
|
|
|
OPT_GROUP(N_("Merge options")),
|
|
|
|
OPT_STRING('s', "strategy", &strategy, N_("strategy"),
|
|
|
|
N_("resolve notes conflicts using the given strategy "
|
|
|
|
"(manual/ours/theirs/union/cat_sort_uniq)")),
|
|
|
|
OPT_GROUP(N_("Committing unmerged notes")),
|
2018-05-20 15:42:58 +00:00
|
|
|
OPT_SET_INT_F(0, "commit", &do_commit,
|
|
|
|
N_("finalize notes merge by committing unmerged notes"),
|
|
|
|
1, PARSE_OPT_NONEG),
|
2012-08-20 12:32:28 +00:00
|
|
|
OPT_GROUP(N_("Aborting notes merge resolution")),
|
2018-05-20 15:42:58 +00:00
|
|
|
OPT_SET_INT_F(0, "abort", &do_abort,
|
|
|
|
N_("abort notes merge"),
|
|
|
|
1, PARSE_OPT_NONEG),
|
2010-11-09 21:49:46 +00:00
|
|
|
OPT_END()
|
|
|
|
};
|
|
|
|
|
|
|
|
argc = parse_options(argc, argv, prefix, options,
|
|
|
|
git_notes_merge_usage, 0);
|
|
|
|
|
git notes merge: Manual conflict resolution, part 2/2
When the notes merge conflicts in .git/NOTES_MERGE_WORKTREE have been
resolved, we need to record a new notes commit on the appropriate notes
ref with the resolved notes.
This patch implements 'git notes merge --commit' which the user should
run after resolving conflicts in the notes merge worktree. This command
finalizes the notes merge by recombining the partial notes tree from
part 1 with the now-resolved conflicts in the notes merge worktree in a
merge commit, and updating the appropriate ref to this merge commit.
In order to correctly finalize the merge, we need to keep track of three
things:
- The partial merge result from part 1, containing the auto-merged notes.
This is now stored into a ref called .git/NOTES_MERGE_PARTIAL.
- The unmerged notes. These are already stored in
.git/NOTES_MERGE_WORKTREE, thanks to part 1.
- The notes ref to be updated by the finalized merge result. This is now
stored in a symref called .git/NOTES_MERGE_REF.
In addition to "git notes merge --commit", which uses the above details
to create the finalized notes merge commit, this patch also implements
"git notes merge --reset", which aborts the ongoing notes merge by simply
removing the files/directory described above.
FTR, "git notes merge --commit" reuses "git notes merge --reset" to remove
the information described above (.git/NOTES_MERGE_*) after the notes merge
have been successfully finalized.
The patch also contains documentation and testcases for the two new options.
This patch has been improved by the following contributions:
- Ævar Arnfjörð Bjarmason: Fix nonsense sentence in --commit description
- Sverre Rabbelier: Rename --reset to --abort
Thanks-to: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Thanks-to: Sverre Rabbelier <srabbelier@gmail.com>
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-11-09 21:49:52 +00:00
|
|
|
if (strategy || do_commit + do_abort == 0)
|
|
|
|
do_merge = 1;
|
|
|
|
if (do_merge + do_commit + do_abort != 1) {
|
2016-06-17 20:21:14 +00:00
|
|
|
error(_("cannot mix --commit, --abort or -s/--strategy"));
|
git notes merge: Manual conflict resolution, part 2/2
When the notes merge conflicts in .git/NOTES_MERGE_WORKTREE have been
resolved, we need to record a new notes commit on the appropriate notes
ref with the resolved notes.
This patch implements 'git notes merge --commit' which the user should
run after resolving conflicts in the notes merge worktree. This command
finalizes the notes merge by recombining the partial notes tree from
part 1 with the now-resolved conflicts in the notes merge worktree in a
merge commit, and updating the appropriate ref to this merge commit.
In order to correctly finalize the merge, we need to keep track of three
things:
- The partial merge result from part 1, containing the auto-merged notes.
This is now stored into a ref called .git/NOTES_MERGE_PARTIAL.
- The unmerged notes. These are already stored in
.git/NOTES_MERGE_WORKTREE, thanks to part 1.
- The notes ref to be updated by the finalized merge result. This is now
stored in a symref called .git/NOTES_MERGE_REF.
In addition to "git notes merge --commit", which uses the above details
to create the finalized notes merge commit, this patch also implements
"git notes merge --reset", which aborts the ongoing notes merge by simply
removing the files/directory described above.
FTR, "git notes merge --commit" reuses "git notes merge --reset" to remove
the information described above (.git/NOTES_MERGE_*) after the notes merge
have been successfully finalized.
The patch also contains documentation and testcases for the two new options.
This patch has been improved by the following contributions:
- Ævar Arnfjörð Bjarmason: Fix nonsense sentence in --commit description
- Sverre Rabbelier: Rename --reset to --abort
Thanks-to: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Thanks-to: Sverre Rabbelier <srabbelier@gmail.com>
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-11-09 21:49:52 +00:00
|
|
|
usage_with_options(git_notes_merge_usage, options);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (do_merge && argc != 1) {
|
2016-09-15 14:59:04 +00:00
|
|
|
error(_("must specify a notes ref to merge"));
|
2010-11-09 21:49:46 +00:00
|
|
|
usage_with_options(git_notes_merge_usage, options);
|
git notes merge: Manual conflict resolution, part 2/2
When the notes merge conflicts in .git/NOTES_MERGE_WORKTREE have been
resolved, we need to record a new notes commit on the appropriate notes
ref with the resolved notes.
This patch implements 'git notes merge --commit' which the user should
run after resolving conflicts in the notes merge worktree. This command
finalizes the notes merge by recombining the partial notes tree from
part 1 with the now-resolved conflicts in the notes merge worktree in a
merge commit, and updating the appropriate ref to this merge commit.
In order to correctly finalize the merge, we need to keep track of three
things:
- The partial merge result from part 1, containing the auto-merged notes.
This is now stored into a ref called .git/NOTES_MERGE_PARTIAL.
- The unmerged notes. These are already stored in
.git/NOTES_MERGE_WORKTREE, thanks to part 1.
- The notes ref to be updated by the finalized merge result. This is now
stored in a symref called .git/NOTES_MERGE_REF.
In addition to "git notes merge --commit", which uses the above details
to create the finalized notes merge commit, this patch also implements
"git notes merge --reset", which aborts the ongoing notes merge by simply
removing the files/directory described above.
FTR, "git notes merge --commit" reuses "git notes merge --reset" to remove
the information described above (.git/NOTES_MERGE_*) after the notes merge
have been successfully finalized.
The patch also contains documentation and testcases for the two new options.
This patch has been improved by the following contributions:
- Ævar Arnfjörð Bjarmason: Fix nonsense sentence in --commit description
- Sverre Rabbelier: Rename --reset to --abort
Thanks-to: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Thanks-to: Sverre Rabbelier <srabbelier@gmail.com>
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-11-09 21:49:52 +00:00
|
|
|
} else if (!do_merge && argc) {
|
2016-06-17 20:21:14 +00:00
|
|
|
error(_("too many parameters"));
|
git notes merge: Manual conflict resolution, part 2/2
When the notes merge conflicts in .git/NOTES_MERGE_WORKTREE have been
resolved, we need to record a new notes commit on the appropriate notes
ref with the resolved notes.
This patch implements 'git notes merge --commit' which the user should
run after resolving conflicts in the notes merge worktree. This command
finalizes the notes merge by recombining the partial notes tree from
part 1 with the now-resolved conflicts in the notes merge worktree in a
merge commit, and updating the appropriate ref to this merge commit.
In order to correctly finalize the merge, we need to keep track of three
things:
- The partial merge result from part 1, containing the auto-merged notes.
This is now stored into a ref called .git/NOTES_MERGE_PARTIAL.
- The unmerged notes. These are already stored in
.git/NOTES_MERGE_WORKTREE, thanks to part 1.
- The notes ref to be updated by the finalized merge result. This is now
stored in a symref called .git/NOTES_MERGE_REF.
In addition to "git notes merge --commit", which uses the above details
to create the finalized notes merge commit, this patch also implements
"git notes merge --reset", which aborts the ongoing notes merge by simply
removing the files/directory described above.
FTR, "git notes merge --commit" reuses "git notes merge --reset" to remove
the information described above (.git/NOTES_MERGE_*) after the notes merge
have been successfully finalized.
The patch also contains documentation and testcases for the two new options.
This patch has been improved by the following contributions:
- Ævar Arnfjörð Bjarmason: Fix nonsense sentence in --commit description
- Sverre Rabbelier: Rename --reset to --abort
Thanks-to: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Thanks-to: Sverre Rabbelier <srabbelier@gmail.com>
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-11-09 21:49:52 +00:00
|
|
|
usage_with_options(git_notes_merge_usage, options);
|
2010-11-09 21:49:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
init_notes_merge_options(&o);
|
|
|
|
o.verbosity = verbosity + NOTES_MERGE_VERBOSITY_DEFAULT;
|
|
|
|
|
git notes merge: Manual conflict resolution, part 2/2
When the notes merge conflicts in .git/NOTES_MERGE_WORKTREE have been
resolved, we need to record a new notes commit on the appropriate notes
ref with the resolved notes.
This patch implements 'git notes merge --commit' which the user should
run after resolving conflicts in the notes merge worktree. This command
finalizes the notes merge by recombining the partial notes tree from
part 1 with the now-resolved conflicts in the notes merge worktree in a
merge commit, and updating the appropriate ref to this merge commit.
In order to correctly finalize the merge, we need to keep track of three
things:
- The partial merge result from part 1, containing the auto-merged notes.
This is now stored into a ref called .git/NOTES_MERGE_PARTIAL.
- The unmerged notes. These are already stored in
.git/NOTES_MERGE_WORKTREE, thanks to part 1.
- The notes ref to be updated by the finalized merge result. This is now
stored in a symref called .git/NOTES_MERGE_REF.
In addition to "git notes merge --commit", which uses the above details
to create the finalized notes merge commit, this patch also implements
"git notes merge --reset", which aborts the ongoing notes merge by simply
removing the files/directory described above.
FTR, "git notes merge --commit" reuses "git notes merge --reset" to remove
the information described above (.git/NOTES_MERGE_*) after the notes merge
have been successfully finalized.
The patch also contains documentation and testcases for the two new options.
This patch has been improved by the following contributions:
- Ævar Arnfjörð Bjarmason: Fix nonsense sentence in --commit description
- Sverre Rabbelier: Rename --reset to --abort
Thanks-to: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Thanks-to: Sverre Rabbelier <srabbelier@gmail.com>
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-11-09 21:49:52 +00:00
|
|
|
if (do_abort)
|
|
|
|
return merge_abort(&o);
|
|
|
|
if (do_commit)
|
|
|
|
return merge_commit(&o);
|
|
|
|
|
2010-11-09 21:49:46 +00:00
|
|
|
o.local_ref = default_notes_ref();
|
|
|
|
strbuf_addstr(&remote_ref, argv[0]);
|
2015-12-29 22:40:28 +00:00
|
|
|
expand_loose_notes_ref(&remote_ref);
|
2010-11-09 21:49:46 +00:00
|
|
|
o.remote_ref = remote_ref.buf;
|
|
|
|
|
2015-10-08 02:54:43 +00:00
|
|
|
t = init_notes_check("merge", NOTES_INIT_WRITABLE);
|
2015-08-17 21:33:33 +00:00
|
|
|
|
2010-11-14 23:55:12 +00:00
|
|
|
if (strategy) {
|
2015-08-17 21:33:31 +00:00
|
|
|
if (parse_notes_merge_strategy(strategy, &o.strategy)) {
|
2016-09-15 14:59:04 +00:00
|
|
|
error(_("unknown -s/--strategy: %s"), strategy);
|
2010-11-14 23:55:12 +00:00
|
|
|
usage_with_options(git_notes_merge_usage, options);
|
|
|
|
}
|
2015-08-17 21:33:33 +00:00
|
|
|
} else {
|
2015-08-17 21:33:34 +00:00
|
|
|
struct strbuf merge_key = STRBUF_INIT;
|
|
|
|
const char *short_ref = NULL;
|
2010-11-14 23:55:12 +00:00
|
|
|
|
2015-08-17 21:33:34 +00:00
|
|
|
if (!skip_prefix(o.local_ref, "refs/notes/", &short_ref))
|
2018-05-02 09:38:39 +00:00
|
|
|
BUG("local ref %s is outside of refs/notes/",
|
2015-08-17 21:33:34 +00:00
|
|
|
o.local_ref);
|
|
|
|
|
|
|
|
strbuf_addf(&merge_key, "notes.%s.mergeStrategy", short_ref);
|
|
|
|
|
|
|
|
if (git_config_get_notes_strategy(merge_key.buf, &o.strategy))
|
|
|
|
git_config_get_notes_strategy("notes.mergeStrategy", &o.strategy);
|
|
|
|
|
|
|
|
strbuf_release(&merge_key);
|
2010-11-14 23:55:12 +00:00
|
|
|
}
|
2010-11-09 21:49:46 +00:00
|
|
|
|
|
|
|
strbuf_addf(&msg, "notes: Merged notes from %s into %s",
|
|
|
|
remote_ref.buf, default_notes_ref());
|
2010-11-09 21:49:53 +00:00
|
|
|
strbuf_add(&(o.commit_msg), msg.buf + 7, msg.len - 7); /* skip "notes: " */
|
git notes merge: Handle real, non-conflicting notes merges
This continuation of the 'git notes merge' implementation teaches notes-merge
to properly do real merges between notes trees: Two diffs are performed, one
from $base to $remote, and another from $base to $local. The paths in each
diff are normalized to SHA1 object names. The two diffs are then consolidated
into a single list of change pairs to be evaluated. Each change pair consist
of:
- The annotated object's SHA1
- The $base SHA1 (i.e. the common ancestor notes for this object)
- The $local SHA1 (i.e. the current notes for this object)
- The $remote SHA1 (i.e. the to-be-merged notes for this object)
From the pair ($base -> $local, $base -> $remote), we can determine the merge
result using regular 3-way rules. If conflicts are encountered in this
process, we fail loudly and exit (conflict handling to be added in a future
patch), If we can complete the merge without conflicts, the resulting
notes tree is committed, and the current notes ref updated.
The patch includes added testcases verifying that we can successfully do real
conflict-less merges.
This patch has been improved by the following contributions:
- Jonathan Nieder: Future-proof by always checking add_note() return value
- Stephen Boyd: Use test_commit
- Jonathan Nieder: Use trace_printf(...) instead of OUTPUT(o, 5, ...)
- Junio C Hamano: fixup minor style issues
Thanks-to: Jonathan Nieder <jrnieder@gmail.com>
Thanks-to: Stephen Boyd <bebarino@gmail.com>
Thanks-to: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-11-14 23:54:11 +00:00
|
|
|
|
2017-05-30 17:30:58 +00:00
|
|
|
result = notes_merge(&o, t, &result_oid);
|
git notes merge: Handle real, non-conflicting notes merges
This continuation of the 'git notes merge' implementation teaches notes-merge
to properly do real merges between notes trees: Two diffs are performed, one
from $base to $remote, and another from $base to $local. The paths in each
diff are normalized to SHA1 object names. The two diffs are then consolidated
into a single list of change pairs to be evaluated. Each change pair consist
of:
- The annotated object's SHA1
- The $base SHA1 (i.e. the common ancestor notes for this object)
- The $local SHA1 (i.e. the current notes for this object)
- The $remote SHA1 (i.e. the to-be-merged notes for this object)
From the pair ($base -> $local, $base -> $remote), we can determine the merge
result using regular 3-way rules. If conflicts are encountered in this
process, we fail loudly and exit (conflict handling to be added in a future
patch), If we can complete the merge without conflicts, the resulting
notes tree is committed, and the current notes ref updated.
The patch includes added testcases verifying that we can successfully do real
conflict-less merges.
This patch has been improved by the following contributions:
- Jonathan Nieder: Future-proof by always checking add_note() return value
- Stephen Boyd: Use test_commit
- Jonathan Nieder: Use trace_printf(...) instead of OUTPUT(o, 5, ...)
- Junio C Hamano: fixup minor style issues
Thanks-to: Jonathan Nieder <jrnieder@gmail.com>
Thanks-to: Stephen Boyd <bebarino@gmail.com>
Thanks-to: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-11-14 23:54:11 +00:00
|
|
|
|
2017-05-30 17:30:58 +00:00
|
|
|
if (result >= 0) /* Merge resulted (trivially) in result_oid */
|
2010-11-09 21:49:46 +00:00
|
|
|
/* Update default notes ref with new commit */
|
2017-10-15 22:06:51 +00:00
|
|
|
update_ref(msg.buf, default_notes_ref(), &result_oid, NULL, 0,
|
|
|
|
UPDATE_REFS_DIE_ON_ERR);
|
git notes merge: Manual conflict resolution, part 2/2
When the notes merge conflicts in .git/NOTES_MERGE_WORKTREE have been
resolved, we need to record a new notes commit on the appropriate notes
ref with the resolved notes.
This patch implements 'git notes merge --commit' which the user should
run after resolving conflicts in the notes merge worktree. This command
finalizes the notes merge by recombining the partial notes tree from
part 1 with the now-resolved conflicts in the notes merge worktree in a
merge commit, and updating the appropriate ref to this merge commit.
In order to correctly finalize the merge, we need to keep track of three
things:
- The partial merge result from part 1, containing the auto-merged notes.
This is now stored into a ref called .git/NOTES_MERGE_PARTIAL.
- The unmerged notes. These are already stored in
.git/NOTES_MERGE_WORKTREE, thanks to part 1.
- The notes ref to be updated by the finalized merge result. This is now
stored in a symref called .git/NOTES_MERGE_REF.
In addition to "git notes merge --commit", which uses the above details
to create the finalized notes merge commit, this patch also implements
"git notes merge --reset", which aborts the ongoing notes merge by simply
removing the files/directory described above.
FTR, "git notes merge --commit" reuses "git notes merge --reset" to remove
the information described above (.git/NOTES_MERGE_*) after the notes merge
have been successfully finalized.
The patch also contains documentation and testcases for the two new options.
This patch has been improved by the following contributions:
- Ævar Arnfjörð Bjarmason: Fix nonsense sentence in --commit description
- Sverre Rabbelier: Rename --reset to --abort
Thanks-to: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Thanks-to: Sverre Rabbelier <srabbelier@gmail.com>
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-11-09 21:49:52 +00:00
|
|
|
else { /* Merge has unresolved conflicts */
|
2016-04-22 13:01:27 +00:00
|
|
|
const struct worktree *wt;
|
git notes merge: Manual conflict resolution, part 2/2
When the notes merge conflicts in .git/NOTES_MERGE_WORKTREE have been
resolved, we need to record a new notes commit on the appropriate notes
ref with the resolved notes.
This patch implements 'git notes merge --commit' which the user should
run after resolving conflicts in the notes merge worktree. This command
finalizes the notes merge by recombining the partial notes tree from
part 1 with the now-resolved conflicts in the notes merge worktree in a
merge commit, and updating the appropriate ref to this merge commit.
In order to correctly finalize the merge, we need to keep track of three
things:
- The partial merge result from part 1, containing the auto-merged notes.
This is now stored into a ref called .git/NOTES_MERGE_PARTIAL.
- The unmerged notes. These are already stored in
.git/NOTES_MERGE_WORKTREE, thanks to part 1.
- The notes ref to be updated by the finalized merge result. This is now
stored in a symref called .git/NOTES_MERGE_REF.
In addition to "git notes merge --commit", which uses the above details
to create the finalized notes merge commit, this patch also implements
"git notes merge --reset", which aborts the ongoing notes merge by simply
removing the files/directory described above.
FTR, "git notes merge --commit" reuses "git notes merge --reset" to remove
the information described above (.git/NOTES_MERGE_*) after the notes merge
have been successfully finalized.
The patch also contains documentation and testcases for the two new options.
This patch has been improved by the following contributions:
- Ævar Arnfjörð Bjarmason: Fix nonsense sentence in --commit description
- Sverre Rabbelier: Rename --reset to --abort
Thanks-to: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Thanks-to: Sverre Rabbelier <srabbelier@gmail.com>
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-11-09 21:49:52 +00:00
|
|
|
/* Update .git/NOTES_MERGE_PARTIAL with partial merge result */
|
2017-10-15 22:06:51 +00:00
|
|
|
update_ref(msg.buf, "NOTES_MERGE_PARTIAL", &result_oid, NULL,
|
2014-04-07 13:47:56 +00:00
|
|
|
0, UPDATE_REFS_DIE_ON_ERR);
|
git notes merge: Manual conflict resolution, part 2/2
When the notes merge conflicts in .git/NOTES_MERGE_WORKTREE have been
resolved, we need to record a new notes commit on the appropriate notes
ref with the resolved notes.
This patch implements 'git notes merge --commit' which the user should
run after resolving conflicts in the notes merge worktree. This command
finalizes the notes merge by recombining the partial notes tree from
part 1 with the now-resolved conflicts in the notes merge worktree in a
merge commit, and updating the appropriate ref to this merge commit.
In order to correctly finalize the merge, we need to keep track of three
things:
- The partial merge result from part 1, containing the auto-merged notes.
This is now stored into a ref called .git/NOTES_MERGE_PARTIAL.
- The unmerged notes. These are already stored in
.git/NOTES_MERGE_WORKTREE, thanks to part 1.
- The notes ref to be updated by the finalized merge result. This is now
stored in a symref called .git/NOTES_MERGE_REF.
In addition to "git notes merge --commit", which uses the above details
to create the finalized notes merge commit, this patch also implements
"git notes merge --reset", which aborts the ongoing notes merge by simply
removing the files/directory described above.
FTR, "git notes merge --commit" reuses "git notes merge --reset" to remove
the information described above (.git/NOTES_MERGE_*) after the notes merge
have been successfully finalized.
The patch also contains documentation and testcases for the two new options.
This patch has been improved by the following contributions:
- Ævar Arnfjörð Bjarmason: Fix nonsense sentence in --commit description
- Sverre Rabbelier: Rename --reset to --abort
Thanks-to: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Thanks-to: Sverre Rabbelier <srabbelier@gmail.com>
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-11-09 21:49:52 +00:00
|
|
|
/* Store ref-to-be-updated into .git/NOTES_MERGE_REF */
|
2016-04-22 13:01:27 +00:00
|
|
|
wt = find_shared_symref("NOTES_MERGE_REF", default_notes_ref());
|
|
|
|
if (wt)
|
2016-09-15 14:59:04 +00:00
|
|
|
die(_("a notes merge into %s is already in-progress at %s"),
|
2016-04-22 13:01:27 +00:00
|
|
|
default_notes_ref(), wt->path);
|
git notes merge: Manual conflict resolution, part 2/2
When the notes merge conflicts in .git/NOTES_MERGE_WORKTREE have been
resolved, we need to record a new notes commit on the appropriate notes
ref with the resolved notes.
This patch implements 'git notes merge --commit' which the user should
run after resolving conflicts in the notes merge worktree. This command
finalizes the notes merge by recombining the partial notes tree from
part 1 with the now-resolved conflicts in the notes merge worktree in a
merge commit, and updating the appropriate ref to this merge commit.
In order to correctly finalize the merge, we need to keep track of three
things:
- The partial merge result from part 1, containing the auto-merged notes.
This is now stored into a ref called .git/NOTES_MERGE_PARTIAL.
- The unmerged notes. These are already stored in
.git/NOTES_MERGE_WORKTREE, thanks to part 1.
- The notes ref to be updated by the finalized merge result. This is now
stored in a symref called .git/NOTES_MERGE_REF.
In addition to "git notes merge --commit", which uses the above details
to create the finalized notes merge commit, this patch also implements
"git notes merge --reset", which aborts the ongoing notes merge by simply
removing the files/directory described above.
FTR, "git notes merge --commit" reuses "git notes merge --reset" to remove
the information described above (.git/NOTES_MERGE_*) after the notes merge
have been successfully finalized.
The patch also contains documentation and testcases for the two new options.
This patch has been improved by the following contributions:
- Ævar Arnfjörð Bjarmason: Fix nonsense sentence in --commit description
- Sverre Rabbelier: Rename --reset to --abort
Thanks-to: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Thanks-to: Sverre Rabbelier <srabbelier@gmail.com>
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-11-09 21:49:52 +00:00
|
|
|
if (create_symref("NOTES_MERGE_REF", default_notes_ref(), NULL))
|
2016-09-15 14:59:04 +00:00
|
|
|
die(_("failed to store link to current notes ref (%s)"),
|
git notes merge: Manual conflict resolution, part 2/2
When the notes merge conflicts in .git/NOTES_MERGE_WORKTREE have been
resolved, we need to record a new notes commit on the appropriate notes
ref with the resolved notes.
This patch implements 'git notes merge --commit' which the user should
run after resolving conflicts in the notes merge worktree. This command
finalizes the notes merge by recombining the partial notes tree from
part 1 with the now-resolved conflicts in the notes merge worktree in a
merge commit, and updating the appropriate ref to this merge commit.
In order to correctly finalize the merge, we need to keep track of three
things:
- The partial merge result from part 1, containing the auto-merged notes.
This is now stored into a ref called .git/NOTES_MERGE_PARTIAL.
- The unmerged notes. These are already stored in
.git/NOTES_MERGE_WORKTREE, thanks to part 1.
- The notes ref to be updated by the finalized merge result. This is now
stored in a symref called .git/NOTES_MERGE_REF.
In addition to "git notes merge --commit", which uses the above details
to create the finalized notes merge commit, this patch also implements
"git notes merge --reset", which aborts the ongoing notes merge by simply
removing the files/directory described above.
FTR, "git notes merge --commit" reuses "git notes merge --reset" to remove
the information described above (.git/NOTES_MERGE_*) after the notes merge
have been successfully finalized.
The patch also contains documentation and testcases for the two new options.
This patch has been improved by the following contributions:
- Ævar Arnfjörð Bjarmason: Fix nonsense sentence in --commit description
- Sverre Rabbelier: Rename --reset to --abort
Thanks-to: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Thanks-to: Sverre Rabbelier <srabbelier@gmail.com>
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-11-09 21:49:52 +00:00
|
|
|
default_notes_ref());
|
2017-11-14 16:17:52 +00:00
|
|
|
fprintf(stderr, _("Automatic notes merge failed. Fix conflicts in %s "
|
|
|
|
"and commit the result with 'git notes merge --commit', "
|
|
|
|
"or abort the merge with 'git notes merge --abort'.\n"),
|
|
|
|
git_path(NOTES_MERGE_WORKTREE));
|
git notes merge: Manual conflict resolution, part 2/2
When the notes merge conflicts in .git/NOTES_MERGE_WORKTREE have been
resolved, we need to record a new notes commit on the appropriate notes
ref with the resolved notes.
This patch implements 'git notes merge --commit' which the user should
run after resolving conflicts in the notes merge worktree. This command
finalizes the notes merge by recombining the partial notes tree from
part 1 with the now-resolved conflicts in the notes merge worktree in a
merge commit, and updating the appropriate ref to this merge commit.
In order to correctly finalize the merge, we need to keep track of three
things:
- The partial merge result from part 1, containing the auto-merged notes.
This is now stored into a ref called .git/NOTES_MERGE_PARTIAL.
- The unmerged notes. These are already stored in
.git/NOTES_MERGE_WORKTREE, thanks to part 1.
- The notes ref to be updated by the finalized merge result. This is now
stored in a symref called .git/NOTES_MERGE_REF.
In addition to "git notes merge --commit", which uses the above details
to create the finalized notes merge commit, this patch also implements
"git notes merge --reset", which aborts the ongoing notes merge by simply
removing the files/directory described above.
FTR, "git notes merge --commit" reuses "git notes merge --reset" to remove
the information described above (.git/NOTES_MERGE_*) after the notes merge
have been successfully finalized.
The patch also contains documentation and testcases for the two new options.
This patch has been improved by the following contributions:
- Ævar Arnfjörð Bjarmason: Fix nonsense sentence in --commit description
- Sverre Rabbelier: Rename --reset to --abort
Thanks-to: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Thanks-to: Sverre Rabbelier <srabbelier@gmail.com>
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-11-09 21:49:52 +00:00
|
|
|
}
|
2010-11-09 21:49:46 +00:00
|
|
|
|
git notes merge: Handle real, non-conflicting notes merges
This continuation of the 'git notes merge' implementation teaches notes-merge
to properly do real merges between notes trees: Two diffs are performed, one
from $base to $remote, and another from $base to $local. The paths in each
diff are normalized to SHA1 object names. The two diffs are then consolidated
into a single list of change pairs to be evaluated. Each change pair consist
of:
- The annotated object's SHA1
- The $base SHA1 (i.e. the common ancestor notes for this object)
- The $local SHA1 (i.e. the current notes for this object)
- The $remote SHA1 (i.e. the to-be-merged notes for this object)
From the pair ($base -> $local, $base -> $remote), we can determine the merge
result using regular 3-way rules. If conflicts are encountered in this
process, we fail loudly and exit (conflict handling to be added in a future
patch), If we can complete the merge without conflicts, the resulting
notes tree is committed, and the current notes ref updated.
The patch includes added testcases verifying that we can successfully do real
conflict-less merges.
This patch has been improved by the following contributions:
- Jonathan Nieder: Future-proof by always checking add_note() return value
- Stephen Boyd: Use test_commit
- Jonathan Nieder: Use trace_printf(...) instead of OUTPUT(o, 5, ...)
- Junio C Hamano: fixup minor style issues
Thanks-to: Jonathan Nieder <jrnieder@gmail.com>
Thanks-to: Stephen Boyd <bebarino@gmail.com>
Thanks-to: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-11-14 23:54:11 +00:00
|
|
|
free_notes(t);
|
2010-11-09 21:49:46 +00:00
|
|
|
strbuf_release(&remote_ref);
|
|
|
|
strbuf_release(&msg);
|
2010-11-09 21:49:51 +00:00
|
|
|
return result < 0; /* return non-zero on conflicts */
|
2010-11-09 21:49:46 +00:00
|
|
|
}
|
|
|
|
|
2011-05-18 23:44:30 +00:00
|
|
|
#define IGNORE_MISSING 1
|
2011-05-18 23:02:58 +00:00
|
|
|
|
|
|
|
static int remove_one_note(struct notes_tree *t, const char *name, unsigned flag)
|
2011-05-18 22:44:37 +00:00
|
|
|
{
|
|
|
|
int status;
|
2017-05-30 17:30:42 +00:00
|
|
|
struct object_id oid;
|
|
|
|
if (get_oid(name, &oid))
|
2011-05-18 22:44:37 +00:00
|
|
|
return error(_("Failed to resolve '%s' as a valid ref."), name);
|
2017-05-30 17:30:42 +00:00
|
|
|
status = remove_note(t, oid.hash);
|
2011-05-18 22:44:37 +00:00
|
|
|
if (status)
|
|
|
|
fprintf(stderr, _("Object %s has no note\n"), name);
|
|
|
|
else
|
|
|
|
fprintf(stderr, _("Removing note for object %s\n"), name);
|
2011-05-18 23:44:30 +00:00
|
|
|
return (flag & IGNORE_MISSING) ? 0 : status;
|
2011-05-18 22:44:37 +00:00
|
|
|
}
|
|
|
|
|
2010-02-27 08:59:22 +00:00
|
|
|
static int remove_cmd(int argc, const char **argv, const char *prefix)
|
|
|
|
{
|
2011-05-18 23:02:58 +00:00
|
|
|
unsigned flag = 0;
|
2011-05-18 23:44:30 +00:00
|
|
|
int from_stdin = 0;
|
2010-02-27 08:59:22 +00:00
|
|
|
struct option options[] = {
|
2011-05-18 23:02:58 +00:00
|
|
|
OPT_BIT(0, "ignore-missing", &flag,
|
2012-08-20 12:32:28 +00:00
|
|
|
N_("attempt to remove non-existent note is not an error"),
|
2011-05-18 23:44:30 +00:00
|
|
|
IGNORE_MISSING),
|
2013-08-03 11:51:19 +00:00
|
|
|
OPT_BOOL(0, "stdin", &from_stdin,
|
2012-08-20 12:32:28 +00:00
|
|
|
N_("read object names from the standard input")),
|
2010-02-27 08:59:22 +00:00
|
|
|
OPT_END()
|
|
|
|
};
|
|
|
|
struct notes_tree *t;
|
2011-05-18 22:44:37 +00:00
|
|
|
int retval = 0;
|
2010-02-27 08:59:22 +00:00
|
|
|
|
|
|
|
argc = parse_options(argc, argv, prefix, options,
|
|
|
|
git_notes_remove_usage, 0);
|
|
|
|
|
2015-10-08 02:54:43 +00:00
|
|
|
t = init_notes_check("remove", NOTES_INIT_WRITABLE);
|
2010-02-27 08:59:22 +00:00
|
|
|
|
2011-05-18 23:44:30 +00:00
|
|
|
if (!argc && !from_stdin) {
|
2011-05-18 23:02:58 +00:00
|
|
|
retval = remove_one_note(t, "HEAD", flag);
|
2011-05-18 22:44:37 +00:00
|
|
|
} else {
|
|
|
|
while (*argv) {
|
2011-05-18 23:02:58 +00:00
|
|
|
retval |= remove_one_note(t, *argv, flag);
|
2011-05-18 22:44:37 +00:00
|
|
|
argv++;
|
|
|
|
}
|
2010-08-31 15:56:50 +00:00
|
|
|
}
|
2011-05-18 23:44:30 +00:00
|
|
|
if (from_stdin) {
|
|
|
|
struct strbuf sb = STRBUF_INIT;
|
|
|
|
while (strbuf_getwholeline(&sb, stdin, '\n') != EOF) {
|
|
|
|
strbuf_rtrim(&sb);
|
|
|
|
retval |= remove_one_note(t, sb.buf, flag);
|
|
|
|
}
|
|
|
|
strbuf_release(&sb);
|
|
|
|
}
|
2011-05-18 22:44:37 +00:00
|
|
|
if (!retval)
|
|
|
|
commit_notes(t, "Notes removed by 'git notes remove'");
|
2010-02-27 08:59:22 +00:00
|
|
|
free_notes(t);
|
2010-08-31 15:56:50 +00:00
|
|
|
return retval;
|
2010-02-27 08:59:22 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static int prune(int argc, const char **argv, const char *prefix)
|
|
|
|
{
|
|
|
|
struct notes_tree *t;
|
2010-05-14 21:42:07 +00:00
|
|
|
int show_only = 0, verbose = 0;
|
2010-02-27 08:59:22 +00:00
|
|
|
struct option options[] = {
|
2016-06-17 20:21:15 +00:00
|
|
|
OPT__DRY_RUN(&show_only, N_("do not remove, show only")),
|
|
|
|
OPT__VERBOSE(&verbose, N_("report pruned notes")),
|
2010-02-27 08:59:22 +00:00
|
|
|
OPT_END()
|
|
|
|
};
|
|
|
|
|
|
|
|
argc = parse_options(argc, argv, prefix, options, git_notes_prune_usage,
|
|
|
|
0);
|
|
|
|
|
|
|
|
if (argc) {
|
2011-02-22 23:42:26 +00:00
|
|
|
error(_("too many parameters"));
|
2010-02-27 08:59:22 +00:00
|
|
|
usage_with_options(git_notes_prune_usage, options);
|
|
|
|
}
|
|
|
|
|
2015-10-08 02:54:43 +00:00
|
|
|
t = init_notes_check("prune", NOTES_INIT_WRITABLE);
|
2010-02-27 08:59:22 +00:00
|
|
|
|
2010-05-14 21:42:07 +00:00
|
|
|
prune_notes(t, (verbose ? NOTES_PRUNE_VERBOSE : 0) |
|
|
|
|
(show_only ? NOTES_PRUNE_VERBOSE|NOTES_PRUNE_DRYRUN : 0) );
|
|
|
|
if (!show_only)
|
|
|
|
commit_notes(t, "Notes removed by 'git notes prune'");
|
2010-02-27 08:59:22 +00:00
|
|
|
free_notes(t);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2010-11-09 21:49:57 +00:00
|
|
|
static int get_ref(int argc, const char **argv, const char *prefix)
|
|
|
|
{
|
|
|
|
struct option options[] = { OPT_END() };
|
|
|
|
argc = parse_options(argc, argv, prefix, options,
|
|
|
|
git_notes_get_ref_usage, 0);
|
|
|
|
|
|
|
|
if (argc) {
|
2016-06-17 20:21:14 +00:00
|
|
|
error(_("too many parameters"));
|
2010-11-09 21:49:57 +00:00
|
|
|
usage_with_options(git_notes_get_ref_usage, options);
|
|
|
|
}
|
|
|
|
|
|
|
|
puts(default_notes_ref());
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2010-02-27 08:59:22 +00:00
|
|
|
int cmd_notes(int argc, const char **argv, const char *prefix)
|
|
|
|
{
|
|
|
|
int result;
|
|
|
|
const char *override_notes_ref = NULL;
|
|
|
|
struct option options[] = {
|
2014-03-23 22:58:12 +00:00
|
|
|
OPT_STRING(0, "ref", &override_notes_ref, N_("notes-ref"),
|
2015-01-13 07:44:47 +00:00
|
|
|
N_("use notes from <notes-ref>")),
|
2010-02-27 08:59:22 +00:00
|
|
|
OPT_END()
|
|
|
|
};
|
|
|
|
|
|
|
|
git_config(git_default_config, NULL);
|
|
|
|
argc = parse_options(argc, argv, prefix, options, git_notes_usage,
|
|
|
|
PARSE_OPT_STOP_AT_NON_OPTION);
|
|
|
|
|
|
|
|
if (override_notes_ref) {
|
|
|
|
struct strbuf sb = STRBUF_INIT;
|
|
|
|
strbuf_addstr(&sb, override_notes_ref);
|
2010-11-09 21:49:45 +00:00
|
|
|
expand_notes_ref(&sb);
|
2010-02-27 08:59:22 +00:00
|
|
|
setenv("GIT_NOTES_REF", sb.buf, 1);
|
|
|
|
strbuf_release(&sb);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (argc < 1 || !strcmp(argv[0], "list"))
|
|
|
|
result = list(argc, argv, prefix);
|
|
|
|
else if (!strcmp(argv[0], "add"))
|
|
|
|
result = add(argc, argv, prefix);
|
|
|
|
else if (!strcmp(argv[0], "copy"))
|
|
|
|
result = copy(argc, argv, prefix);
|
|
|
|
else if (!strcmp(argv[0], "append") || !strcmp(argv[0], "edit"))
|
|
|
|
result = append_edit(argc, argv, prefix);
|
|
|
|
else if (!strcmp(argv[0], "show"))
|
|
|
|
result = show(argc, argv, prefix);
|
2010-11-09 21:49:46 +00:00
|
|
|
else if (!strcmp(argv[0], "merge"))
|
|
|
|
result = merge(argc, argv, prefix);
|
2010-02-27 08:59:22 +00:00
|
|
|
else if (!strcmp(argv[0], "remove"))
|
|
|
|
result = remove_cmd(argc, argv, prefix);
|
|
|
|
else if (!strcmp(argv[0], "prune"))
|
|
|
|
result = prune(argc, argv, prefix);
|
2010-11-09 21:49:57 +00:00
|
|
|
else if (!strcmp(argv[0], "get-ref"))
|
|
|
|
result = get_ref(argc, argv, prefix);
|
2010-02-27 08:59:22 +00:00
|
|
|
else {
|
2016-09-15 14:59:04 +00:00
|
|
|
result = error(_("unknown subcommand: %s"), argv[0]);
|
2010-02-27 08:59:22 +00:00
|
|
|
usage_with_options(git_notes_usage, options);
|
|
|
|
}
|
|
|
|
|
|
|
|
return result ? 1 : 0;
|
|
|
|
}
|