Re: [PATCH 4/5] Make sequencer abort safer

[Junio C Hamano]

Stephan Beyer <s-be...@gmx.net> writes:

> However:
>
>> -static void update_curr_file()
>> +static void update_current_file(void)
>
> This function name could lead to the impression that there is some
> current file (defined by a global state or whatever) that is updated.
>
> So I'd rather rename the *file* to one of
>
>  * sequencer/abort-safety (consistent to am, describes its purpose)
>  * sequencer/safety (shorter, still describes the purpose)
>  * sequencer/current-head (describes what it contains)
>  * sequencer/last (a four-letter word, not totally unambiguous though)

OK, so here is a patch that needs to be squashed further on top of
4/5.  I just picked the first one on your list ;-)

Thanks.

 sequencer.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/sequencer.c b/sequencer.c
index 874aaa4cd4..3ac4cb8d3b 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -27,7 +27,7 @@ GIT_PATH_FUNC(git_path_seq_dir, "sequencer")
 static GIT_PATH_FUNC(git_path_todo_file, "sequencer/todo")
 static GIT_PATH_FUNC(git_path_opts_file, "sequencer/opts")
 static GIT_PATH_FUNC(git_path_head_file, "sequencer/head")
-static GIT_PATH_FUNC(git_path_current_file, "sequencer/current")
+static GIT_PATH_FUNC(git_path_abort_safety_file, "sequencer/abort-safety")
 
 /*
  * A script to set the GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL, and
@@ -306,7 +306,7 @@ static int error_dirty_index(struct replay_opts *opts)
        return -1;
 }
 
-static void update_current_file(void)
+static void update_abort_safety_file(void)
 {
        struct object_id head;
 
@@ -315,9 +315,9 @@ static void update_current_file(void)
                return;
 
        if (!get_oid("HEAD", &head))
-               write_file(git_path_current_file(), "%s", oid_to_hex(&head));
+               write_file(git_path_abort_safety_file(), "%s", 
oid_to_hex(&head));
        else
-               write_file(git_path_current_file(), "%s", "");
+               write_file(git_path_abort_safety_file(), "%s", "");
 }
 
 static int fast_forward_to(const unsigned char *to, const unsigned char *from,
@@ -349,7 +349,7 @@ static int fast_forward_to(const unsigned char *to, const 
unsigned char *from,
        strbuf_release(&sb);
        strbuf_release(&err);
        ref_transaction_free(transaction);
-       update_current_file();
+       update_abort_safety_file();
        return 0;
 }
 
@@ -824,7 +824,7 @@ static int do_pick_commit(enum todo_command command, struct 
commit *commit,
 
 leave:
        free_message(commit, &msg);
-       update_current_file();
+       update_abort_safety_file();
 
        return res;
 }
@@ -1149,18 +1149,18 @@ static int rollback_is_safe(void)
        struct strbuf sb = STRBUF_INIT;
        struct object_id expected_head, actual_head;
 
-       if (strbuf_read_file(&sb, git_path_current_file(), 0) >= 0) {
+       if (strbuf_read_file(&sb, git_path_abort_safety_file(), 0) >= 0) {
                strbuf_trim(&sb);
                if (get_oid_hex(sb.buf, &expected_head)) {
                        strbuf_release(&sb);
-                       die(_("could not parse %s"), git_path_current_file());
+                       die(_("could not parse %s"), 
git_path_abort_safety_file());
                }
                strbuf_release(&sb);
        }
        else if (errno == ENOENT)
                oidclr(&expected_head);
        else
-               die_errno(_("could not read '%s'"), git_path_current_file());
+               die_errno(_("could not read '%s'"), 
git_path_abort_safety_file());
 
        if (get_oid("HEAD", &actual_head))
                oidclr(&actual_head);
@@ -1436,7 +1436,7 @@ int sequencer_pick_revisions(struct replay_opts *opts)
                return -1;
        if (save_opts(opts))
                return -1;
-       update_current_file();
+       update_abort_safety_file();
        res = pick_commits(&todo_list, opts);
        todo_list_release(&todo_list);
        return res;