rebase--interactive: move rearrange_squash_in_todo_file()

As rearrange_squash_in_todo_file() is only needed inside of
rebase--interactive.c for `rebase -p', it is moved there from
sequencer.c.

The parameter r (repository) is dropped along the way, and the error
handling is slightly improved.

Signed-off-by: Alban Gruin <alban.gruin@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/rebase--interactive.c b/builtin/rebase--interactive.c
index 3bf1da69402dbfffe93ae6caa0c0de5d705a73f5..ab2c6fcd998908eb9615b1950beb709678b8a3fd 100644 (file)
--- a/builtin/rebase--interactive.c
+++ b/builtin/rebase--interactive.c
@@ -38,6 +38,32 @@ static int add_exec_commands(struct string_list *commands)
        return 0;
 }
 
        return 0;
 }
 

+static int rearrange_squash_in_todo_file(void)
+{
+       const char *todo_file = rebase_path_todo();
+       struct todo_list todo_list = TODO_LIST_INIT;
+       int res = 0;
+
+       if (strbuf_read_file(&todo_list.buf, todo_file, 0) < 0)
+               return error_errno(_("could not read '%s'."), todo_file);
+       if (todo_list_parse_insn_buffer(the_repository, todo_list.buf.buf,
+                                       &todo_list)) {
+               todo_list_release(&todo_list);
+               return error(_("unusable todo list: '%s'"), todo_file);
+       }
+
+       res = todo_list_rearrange_squash(&todo_list);
+       if (!res)
+               res = todo_list_write_to_file(the_repository, &todo_list,
+                                             todo_file, NULL, NULL, -1, 0);
+
+       todo_list_release(&todo_list);
+
+       if (res)
+               return error_errno(_("could not write '%s'."), todo_file);
+       return 0;
+}
+

 static int get_revision_ranges(const char *upstream, const char *onto,
                               const char **head_hash,
                               char **revisions, char **shortrevisions)
 static int get_revision_ranges(const char *upstream, const char *onto,
                               const char **head_hash,
                               char **revisions, char **shortrevisions)


@@ -288,7 +314,7 @@ int cmd_rebase__interactive(int argc, const char **argv, const char *prefix)
                ret = check_todo_list_from_file(the_repository);
                break;
        case REARRANGE_SQUASH:
                ret = check_todo_list_from_file(the_repository);
                break;
        case REARRANGE_SQUASH:

-               ret = rearrange_squash_in_todo_file(the_repository);
+               ret = rearrange_squash_in_todo_file();

                break;
        case ADD_EXEC:
                ret = add_exec_commands(&commands);
                break;
        case ADD_EXEC:
                ret = add_exec_commands(&commands);

diff --git a/sequencer.c b/sequencer.c
index 280d9bcce7314a202a6d5158493cc77bfa1934e9..ffa43349823e6bca8b5c751ff7f01544cac0c42f 100644 (file)
--- a/sequencer.c
+++ b/sequencer.c
@@ -4793,8 +4793,6 @@ static int skip_unnecessary_picks(struct repository *r, struct object_id *output
        return 0;
 }
 
        return 0;
 }
 

-static int todo_list_rearrange_squash(struct todo_list *todo_list);
-

 int complete_action(struct repository *r, struct replay_opts *opts, unsigned flags,
                    const char *shortrevisions, const char *onto_name,
                    const char *onto, const char *orig_head, struct string_list *commands,
 int complete_action(struct repository *r, struct replay_opts *opts, unsigned flags,
                    const char *shortrevisions, const char *onto_name,
                    const char *onto, const char *orig_head, struct string_list *commands,


@@ -4906,7 +4904,7 @@ define_commit_slab(commit_todo_item, struct todo_item *);
  * message will have to be retrieved from the commit (as the oneline in the
  * script cannot be trusted) in order to normalize the autosquash arrangement.
  */
  * message will have to be retrieved from the commit (as the oneline in the
  * script cannot be trusted) in order to normalize the autosquash arrangement.
  */

-static int todo_list_rearrange_squash(struct todo_list *todo_list)
+int todo_list_rearrange_squash(struct todo_list *todo_list)

 {
        struct hashmap subject2item;
        int rearranged = 0, *next, *tail, i, nr = 0, alloc = 0;
 {
        struct hashmap subject2item;
        int rearranged = 0, *next, *tail, i, nr = 0, alloc = 0;


@@ -5044,27 +5042,3 @@ static int todo_list_rearrange_squash(struct todo_list *todo_list)
 
        return 0;
 }
 
        return 0;
 }

-
-int rearrange_squash_in_todo_file(struct repository *r)
-{
-       const char *todo_file = rebase_path_todo();
-       struct todo_list todo_list = TODO_LIST_INIT;
-       int res = 0;
-
-       if (strbuf_read_file_or_whine(&todo_list.buf, todo_file) < 0)
-               return -1;
-       if (todo_list_parse_insn_buffer(r, todo_list.buf.buf, &todo_list) < 0) {
-               todo_list_release(&todo_list);
-               return -1;
-       }
-
-       res = todo_list_rearrange_squash(&todo_list);
-       if (!res)
-               res = todo_list_write_to_file(r, &todo_list, todo_file, NULL, NULL, -1, 0);
-
-       todo_list_release(&todo_list);
-
-       if (res)
-               return error_errno(_("could not write '%s'."), todo_file);
-       return 0;
-}

diff --git a/sequencer.h b/sequencer.h
index 0c4b7c80f808ddb4a03514f99cecdec6166d46f7..13c5676c246863513ca3b65eb78359ff220980e3 100644 (file)
--- a/sequencer.h
+++ b/sequencer.h
@@ -153,7 +153,7 @@ int complete_action(struct repository *r, struct replay_opts *opts, unsigned fla
                    const char *shortrevisions, const char *onto_name,
                    const char *onto, const char *orig_head, struct string_list *commands,
                    unsigned autosquash, struct todo_list *todo_list);
                    const char *shortrevisions, const char *onto_name,
                    const char *onto, const char *orig_head, struct string_list *commands,
                    unsigned autosquash, struct todo_list *todo_list);

-int rearrange_squash_in_todo_file(struct repository *r);
+int todo_list_rearrange_squash(struct todo_list *todo_list);

 
 extern const char sign_off_header[];
 
 
 extern const char sign_off_header[];