@matheusbsbs / matheus-bagliano / commits / c22f7dfb0c

sequencer: remember the onelines when parsing the todo file

The `git-rebase-todo` file contains a list of commands. Most of those commands have the form <verb> <sha1> <oneline> The <oneline> is displayed primarily for the user's convenience, as rebase -i really interprets only the <verb> <sha1> part. However, there are *some* places in interactive rebase where the <oneline> is used to display messages, e.g. for reporting at which commit we stopped. So let's just remember it when parsing the todo file; we keep a copy of the entire todo file anyway (to write out the new `done` and `git-rebase-todo` file just before processing each command), so all we need to do is remember the begin offsets and lengths. As we will have to parse and remember the command-line for `exec` commands later, we do not call the field "oneline" but rather "arg" (and will reuse that for exec's command-line). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Johannes Schindelin committed Oct 21, 2016 at 14:25 UTC c22f7dfb0c34da55390d820ff69b9568a3be4a46

1 file changed +7

sequencer.c

@@ -706,6 +706,8 @@ static int read_and_refresh_cache(struct replay_opts *opts)

706 struct todo_item {

707 enum todo_command command;

708 struct commit *commit;

709 + const char *arg;

710 + int arg_len;

711 size_t offset_in_buf;

712 };

713

@@ -757,6 +759,9 @@ static int parse_insn_line(struct todo_item *item, const char *bol, char *eol)

759 status = get_sha1(bol, commit_sha1);

760 *end_of_object_name = saved;

761

762 + item->arg = end_of_object_name + strspn(end_of_object_name, " \t");

763 + item->arg_len = (int)(eol - item->arg);

764 +

765 if (status < 0)

766 return -1;

767

@@ -907,6 +912,8 @@ static int walk_revs_populate_todo(struct todo_list *todo_list,

912

913 item->command = command;

914 item->commit = commit;

915 + item->arg = NULL;

916 + item->arg_len = 0;

917 item->offset_in_buf = todo_list->buf.len;

918 subject_len = find_commit_subject(commit_buffer, &subject);

919 strbuf_addf(&todo_list->buf, "%s %s %.*s\n", command_string,