sequencer: refactor transform_todos() to work on a todo_list

diff --git a/sequencer.h b/sequencer.h
index c6360bac66b033ef2bbc76d1dc5c720442972ff9..2ddb20cbc1e5bde42ca04e36dcade1482afab276 100644 (file)
--- a/sequencer.h
+++ b/sequencer.h
@@ -104,9 +104,9 @@ struct todo_item {
        enum todo_command command;
        struct commit *commit;
        unsigned int flags;
-       const char *arg;
        int arg_len;
-       size_t offset_in_buf;
+       /* The offset of the command and its argument in the strbuf */
+       size_t offset_in_buf, arg_offset;
 };
 
 struct todo_list {
@@ -121,7 +121,11 @@ struct todo_list {
 
 int todo_list_parse_insn_buffer(struct repository *r, char *buf,
                                struct todo_list *todo_list);
+void todo_list_transform(struct repository *r, struct todo_list *todo_list,
+                        unsigned flags);
 void todo_list_release(struct todo_list *todo_list);
+const char *todo_item_get_arg(struct todo_list *todo_list,
+                             struct todo_item *item);
 
 /* Call this to setup defaults before parsing command line options */
 void sequencer_init_config(struct replay_opts *opts);
@@ -146,7 +150,7 @@ int sequencer_make_script(struct repository *repo, FILE *out,
                          unsigned flags);
 
 int sequencer_add_exec_commands(struct repository *r, const char *command);
-int transform_todos(struct repository *r, unsigned flags);
+int transform_todo_file(struct repository *r, unsigned flags);
 enum missing_commit_check_level get_missing_commit_check_level(void);
 int check_todo_list(struct repository *r);
 int complete_action(struct repository *r, struct replay_opts *opts, unsigned flags,