Hi Alban,
On Tue, 3 Dec 2019, Alban Gruin wrote:
> The message contained in `edit_todo_list_advice' (sequencer.c) is
> printed after the initial edit of the todo list if it can't be parsed or
> if commits were dropped. This is done either in complete_action() for
> `rebase -i', or in check_todo_list_from_file() for `rebase -p'.
>
> Since we want to add this check when editing the list, we also want to
> use this message from edit_todo_list() (rebase-interactive.c). To this
> end, check_todo_list_from_file() is moved to rebase-interactive.c, and
> `edit_todo_list_advice' is copied there. In the next commit,
> complete_action() will stop using it, and `edit_todo_list_advice' will
> be removed from sequencer.c.
Makes sense to me.
> diff --git a/rebase-interactive.c b/rebase-interactive.c
> index aa18ae82b7..ad5dd49c31 100644
> --- a/rebase-interactive.c
> +++ b/rebase-interactive.c
> @@ -187,3 +193,32 @@ int todo_list_check(struct todo_list *old_todo, struct todo_list *new_todo)
> clear_commit_seen(&commit_seen);
> return res;
> }
> +
> +int check_todo_list_from_file(struct repository *r)
> +{
> + struct todo_list old_todo = TODO_LIST_INIT, new_todo = TODO_LIST_INIT;
> + int res = 0;
> +
> + if (strbuf_read_file(&new_todo.buf, rebase_path_todo(), 0) < 0) {
> + res = error(_("could not read '%s'."), rebase_path_todo());
> + goto out;
> + }
> +
> + if (strbuf_read_file(&old_todo.buf, rebase_path_todo_backup(), 0) < 0) {
> + res = error(_("could not read '%s'."), rebase_path_todo_backup());
> + goto out;
> + }
> +
> + res = todo_list_parse_insn_buffer(r, old_todo.buf.buf, &old_todo);
> + if (!res)
> + res = todo_list_parse_insn_buffer(r, new_todo.buf.buf, &new_todo);
> + if (!res)
> + res = todo_list_check(&old_todo, &new_todo);
> + if (res)
> + fprintf(stderr, _(edit_todo_list_advice));
> +out:
> + todo_list_release(&old_todo);
> + todo_list_release(&new_todo);
> +
> + return res;
> +}
No need to address the following concern in this patch series, but I do
think that a #leftoverbits project could be to simplify this to
if (strbuf_read_file(&new_todo.buf, rebase_path_todo(), 0) < 0)
res = error(_("could not read '%s'."), rebase_path_todo());
else if (strbuf_read_file(&old_todo.buf, rebase_path_todo_backup(), 0) < 0)
res = error(_("could not read '%s'."), rebase_path_todo_backup());
else if ((res = todo_list_parse_insn_buffer(r, old_todo.buf.buf, &old_todo)) ||
(res = todo_list_parse_insn_buffer(r, new_todo.buf.buf, &new_todo)) ||
(res = todo_list_check(&old_todo, &new_todo)))
fprintf(stderr, _(edit_todo_list_advice));
Ciao,
Dscho
