From: Phillip Wood <phillip.wood123@gmail.com>
To: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>, git@vger.kernel.org
Subject: Re: [PATCH 4/8] sequencer: create enum for edit_todo_list() return value
Date: Thu, 23 Mar 2023 19:27:57 +0000 [thread overview]
Message-ID: <81ad705d-beef-03d5-e56b-e25a0eccea1e@dunelm.org.uk> (raw)
In-Reply-To: <20230323162235.995574-5-oswald.buddenhagen@gmx.de>
Hi Oswald
This is a really useful cleanup
Thanks
Phillip
On 23/03/2023 16:22, Oswald Buddenhagen wrote:
> This is a lot cleaner than open-coding magic numbers.
>
> Signed-off-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
> ---
> rebase-interactive.c | 15 ++++++++-------
> rebase-interactive.h | 11 ++++++++++-
> sequencer.c | 8 ++++----
> 3 files changed, 22 insertions(+), 12 deletions(-)
>
> diff --git a/rebase-interactive.c b/rebase-interactive.c
> index 111a2071ae..a3d8925b06 100644
> --- a/rebase-interactive.c
> +++ b/rebase-interactive.c
> @@ -94,7 +94,8 @@ void append_todo_help(int command_count, enum rebase_action action,
> strbuf_add_commented_lines(buf, msg, strlen(msg));
> }
>
> -int edit_todo_list(struct repository *r, struct todo_list *todo_list,
> +enum edit_todo_result edit_todo_list(
> + struct repository *r, struct todo_list *todo_list,
> struct todo_list *new_todo, const char *shortrevisions,
> const char *shortonto, unsigned flags,
> enum rebase_action action)
> @@ -123,37 +124,37 @@ int edit_todo_list(struct repository *r, struct todo_list *todo_list,
> return error(_("could not write '%s'."), rebase_path_todo_backup());
>
> if (launch_sequence_editor(todo_file, &new_todo->buf, NULL))
> - return -2;
> + return EDIT_TODO_FAILED;
>
> strbuf_stripspace(&new_todo->buf, 1);
> if (action != ACTION_EDIT_TODO && new_todo->buf.len == 0)
> - return -3;
> + return EDIT_TODO_ABORT;
>
> if (todo_list_parse_insn_buffer(r, new_todo->buf.buf, new_todo)) {
> fprintf(stderr, _(edit_todo_list_advice));
> - return -4;
> + return EDIT_TODO_INCORRECT;
> }
>
> if (incorrect) {
> if (todo_list_check_against_backup(r, new_todo)) {
> write_file(rebase_path_dropped(), "%s", "");
> - return -4;
> + return EDIT_TODO_INCORRECT;
> }
>
> if (incorrect > 0)
> unlink(rebase_path_dropped());
> } else if (todo_list_check(todo_list, new_todo)) {
> write_file(rebase_path_dropped(), "%s", "");
> - return -4;
> + return EDIT_TODO_INCORRECT;
> }
>
> /*
> * See if branches need to be added or removed from the update-refs
> * file based on the new todo list.
> */
> todo_list_filter_update_refs(r, new_todo);
>
> - return 0;
> + return EDIT_TODO_OK;
> }
>
> define_commit_slab(commit_seen, unsigned char);
> diff --git a/rebase-interactive.h b/rebase-interactive.h
> index d9873d3497..5aa4111b4f 100644
> --- a/rebase-interactive.h
> +++ b/rebase-interactive.h
> @@ -16,10 +16,19 @@ enum rebase_action {
> ACTION_LAST
> };
>
> +enum edit_todo_result {
> + EDIT_TODO_OK = 0, // must be 0
> + EDIT_TODO_IOERROR = -1, // generic i/o error; must be -1
> + EDIT_TODO_FAILED = -2, // editing failed
> + EDIT_TODO_ABORT = -3, // user requested abort
> + EDIT_TODO_INCORRECT = -4 // file violates syntax or constraints
> +};
> +
> void append_todo_help(int command_count, enum rebase_action action,
> const char *shortrevisions, const char *shortonto,
> struct strbuf *buf);
> -int edit_todo_list(struct repository *r, struct todo_list *todo_list,
> +enum edit_todo_result edit_todo_list(
> + struct repository *r, struct todo_list *todo_list,
> struct todo_list *new_todo, const char *shortrevisions,
> const char *shortonto, unsigned flags,
> enum rebase_action action);
> diff --git a/sequencer.c b/sequencer.c
> index f05174d151..b1c29c8802 100644
> --- a/sequencer.c
> +++ b/sequencer.c
> @@ -6125,20 +6125,20 @@ int complete_action(struct repository *r, struct replay_opts *opts, unsigned fla
>
> res = edit_todo_list(r, todo_list, &new_todo, shortrevisions,
> shortonto, flags, action);
> - if (res == -1)
> + if (res == EDIT_TODO_IOERROR)
> return -1;
> - else if (res == -2) {
> + else if (res == EDIT_TODO_FAILED) {
> apply_autostash(rebase_path_autostash());
> sequencer_remove_state(opts);
>
> return -1;
> - } else if (res == -3) {
> + } else if (res == EDIT_TODO_ABORT) {
> apply_autostash(rebase_path_autostash());
> sequencer_remove_state(opts);
> todo_list_release(&new_todo);
>
> return error(_("nothing to do"));
> - } else if (res == -4) {
> + } else if (res == EDIT_TODO_INCORRECT) {
> checkout_onto(r, opts, onto_name, &onto->object.oid, orig_head);
> todo_list_release(&new_todo);
>
next prev parent reply other threads:[~2023-03-23 19:28 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-23 16:22 [PATCH 0/8] sequencer refactoring Oswald Buddenhagen
2023-03-23 16:22 ` [PATCH 1/8] rebase: simplify code related to imply_merge() Oswald Buddenhagen
2023-03-23 19:40 ` Phillip Wood
2023-03-23 20:00 ` Junio C Hamano
2023-03-23 21:08 ` Felipe Contreras
2023-08-09 17:15 ` [PATCH v2 0/3] rebase refactoring Oswald Buddenhagen
2023-08-09 17:15 ` [PATCH v2 1/3] rebase: simplify code related to imply_merge() Oswald Buddenhagen
2023-08-09 17:15 ` [PATCH v2 2/3] rebase: handle --strategy via imply_merge() as well Oswald Buddenhagen
2023-08-09 17:15 ` [PATCH v2 3/3] rebase: move parse_opt_keep_empty() down Oswald Buddenhagen
2023-08-15 14:01 ` Phillip Wood
2023-10-20 9:36 ` [PATCH v3 0/3] rebase refactoring Oswald Buddenhagen
2023-10-20 9:36 ` [PATCH v3 1/3] rebase: simplify code related to imply_merge() Oswald Buddenhagen
2023-10-20 9:36 ` [PATCH v3 2/3] rebase: handle --strategy via imply_merge() as well Oswald Buddenhagen
2023-10-20 21:51 ` Junio C Hamano
2023-10-20 9:36 ` [PATCH v3 3/3] rebase: move parse_opt_keep_empty() down Oswald Buddenhagen
2023-10-20 22:07 ` [PATCH v3 0/3] rebase refactoring Junio C Hamano
2023-10-23 15:43 ` Phillip Wood
2023-10-23 19:02 ` Junio C Hamano
2023-03-23 16:22 ` [PATCH 2/8] rebase: move parse_opt_keep_empty() down Oswald Buddenhagen
2023-03-23 19:39 ` Phillip Wood
2023-03-23 16:22 ` [PATCH 3/8] sequencer: pass around rebase action explicitly Oswald Buddenhagen
2023-03-23 19:27 ` Phillip Wood
2023-03-23 21:27 ` Oswald Buddenhagen
2023-03-23 16:22 ` [PATCH 4/8] sequencer: create enum for edit_todo_list() return value Oswald Buddenhagen
2023-03-23 19:27 ` Phillip Wood [this message]
2023-03-23 16:22 ` [PATCH 5/8] rebase: preserve interactive todo file on checkout failure Oswald Buddenhagen
2023-03-23 19:31 ` Phillip Wood
2023-03-23 22:38 ` Oswald Buddenhagen
2023-03-24 14:15 ` Phillip Wood
2023-03-24 14:42 ` Oswald Buddenhagen
2023-03-23 20:16 ` Junio C Hamano
2023-03-23 23:23 ` Oswald Buddenhagen
2023-03-24 4:31 ` Junio C Hamano
2023-03-23 16:22 ` [PATCH 6/8] sequencer: simplify allocation of result array in todo_list_rearrange_squash() Oswald Buddenhagen
2023-03-23 19:46 ` Phillip Wood
2023-03-23 22:13 ` Oswald Buddenhagen
2023-03-23 16:22 ` [PATCH 7/8] sequencer: pass `onto` to complete_action() as object-id Oswald Buddenhagen
2023-03-23 19:34 ` Phillip Wood
2023-03-23 21:36 ` Oswald Buddenhagen
2023-03-24 14:18 ` Phillip Wood
2023-03-23 16:22 ` [PATCH 8/8] rebase: improve resumption from incorrect initial todo list Oswald Buddenhagen
2023-03-26 14:28 ` Phillip Wood
2023-04-26 15:34 ` Oswald Buddenhagen
2023-05-17 12:13 ` Phillip Wood
2023-08-24 16:46 ` Oswald Buddenhagen
2023-03-23 19:38 ` [PATCH 0/8] sequencer refactoring Phillip Wood
2023-03-25 11:08 ` Phillip Wood
2023-04-06 12:09 ` Phillip Wood
2023-05-17 13:10 ` Phillip Wood
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=81ad705d-beef-03d5-e56b-e25a0eccea1e@dunelm.org.uk \
--to=phillip.wood123@gmail.com \
--cc=git@vger.kernel.org \
--cc=oswald.buddenhagen@gmx.de \
--cc=phillip.wood@dunelm.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).