10 const char *git_path_commit_editmsg(void);
11 const char *git_path_seq_dir(void);
12 const char *rebase_path_todo(void);
13 const char *rebase_path_todo_backup(void);
15 #define APPEND_SIGNOFF_DEDUP (1u << 0)
20 REPLAY_INTERACTIVE_REBASE
23 enum commit_msg_cleanup_mode
{
24 COMMIT_MSG_CLEANUP_SPACE
,
25 COMMIT_MSG_CLEANUP_NONE
,
26 COMMIT_MSG_CLEANUP_SCISSORS
,
27 COMMIT_MSG_CLEANUP_ALL
31 enum replay_action action
;
39 int allow_rerere_auto
;
41 int allow_empty_message
;
42 int keep_redundant_commits
;
45 int reschedule_failed_exec
;
50 enum commit_msg_cleanup_mode default_msg_cleanup
;
56 size_t xopts_nr
, xopts_alloc
;
58 /* Used by fixup/squash */
59 struct strbuf current_fixups
;
60 int current_fixup_count
;
62 /* placeholder commit for -i --root */
63 struct object_id squash_onto
;
66 /* Only used by REPLAY_NONE */
67 struct rev_info
*revs
;
69 #define REPLAY_OPTS_INIT { .action = -1, .current_fixups = STRBUF_INIT }
72 * Note that ordering matters in this enum. Not only must it match the mapping
73 * of todo_command_info (in sequencer.c), it is also divided into several
74 * sections that matter. When adding new commands, make sure you add it in the
78 /* commands that handle commits */
85 /* commands that do something else than handling a single commit */
91 /* commands that do nothing but are counted for reporting progress */
94 /* comments (not counted for reporting progress) */
99 enum todo_command command
;
100 struct commit
*commit
;
103 /* The offset of the command and its argument in the strbuf */
104 size_t offset_in_buf
, arg_offset
;
109 struct todo_item
*items
;
110 int nr
, alloc
, current
;
111 int done_nr
, total_nr
;
112 struct stat_data stat
;
115 #define TODO_LIST_INIT { STRBUF_INIT }
117 int todo_list_parse_insn_buffer(struct repository
*r
, char *buf
,
118 struct todo_list
*todo_list
);
119 int todo_list_write_to_file(struct repository
*r
, struct todo_list
*todo_list
,
120 const char *file
, const char *shortrevisions
,
121 const char *shortonto
, int num
, unsigned flags
);
122 void todo_list_release(struct todo_list
*todo_list
);
123 const char *todo_item_get_arg(struct todo_list
*todo_list
,
124 struct todo_item
*item
);
126 /* Call this to setup defaults before parsing command line options */
127 void sequencer_init_config(struct replay_opts
*opts
);
128 int sequencer_pick_revisions(struct repository
*repo
,
129 struct replay_opts
*opts
);
130 int sequencer_continue(struct repository
*repo
, struct replay_opts
*opts
);
131 int sequencer_rollback(struct repository
*repo
, struct replay_opts
*opts
);
132 int sequencer_skip(struct repository
*repo
, struct replay_opts
*opts
);
133 int sequencer_remove_state(struct replay_opts
*opts
);
135 #define TODO_LIST_KEEP_EMPTY (1U << 0)
136 #define TODO_LIST_SHORTEN_IDS (1U << 1)
137 #define TODO_LIST_ABBREVIATE_CMDS (1U << 2)
138 #define TODO_LIST_REBASE_MERGES (1U << 3)
140 * When rebasing merges, commits that do have the base commit as ancestor
141 * ("cousins") are *not* rebased onto the new base by default. If those
142 * commits should be rebased onto the new base, this flag needs to be passed.
144 #define TODO_LIST_REBASE_COUSINS (1U << 4)
145 #define TODO_LIST_APPEND_TODO_HELP (1U << 5)
147 int sequencer_make_script(struct repository
*r
, struct strbuf
*out
, int argc
,
148 const char **argv
, unsigned flags
);
150 void todo_list_add_exec_commands(struct todo_list
*todo_list
,
151 struct string_list
*commands
);
152 int check_todo_list_from_file(struct repository
*r
);
153 int complete_action(struct repository
*r
, struct replay_opts
*opts
, unsigned flags
,
154 const char *shortrevisions
, const char *onto_name
,
155 struct commit
*onto
, const char *orig_head
, struct string_list
*commands
,
156 unsigned autosquash
, struct todo_list
*todo_list
);
157 int todo_list_rearrange_squash(struct todo_list
*todo_list
);
160 * Append a signoff to the commit message in "msgbuf". The ignore_footer
161 * parameter specifies the number of bytes at the end of msgbuf that should
162 * not be considered at all. I.e., they are not checked for existing trailers,
163 * and the new signoff will be spliced into the buffer before those bytes.
165 void append_signoff(struct strbuf
*msgbuf
, size_t ignore_footer
, unsigned flag
);
167 void append_conflicts_hint(struct index_state
*istate
,
168 struct strbuf
*msgbuf
, enum commit_msg_cleanup_mode cleanup_mode
);
169 enum commit_msg_cleanup_mode
get_cleanup_mode(const char *cleanup_arg
,
172 void cleanup_message(struct strbuf
*msgbuf
,
173 enum commit_msg_cleanup_mode cleanup_mode
, int verbose
);
175 int message_is_empty(const struct strbuf
*sb
,
176 enum commit_msg_cleanup_mode cleanup_mode
);
177 int template_untouched(const struct strbuf
*sb
, const char *template_file
,
178 enum commit_msg_cleanup_mode cleanup_mode
);
179 int update_head_with_reflog(const struct commit
*old_head
,
180 const struct object_id
*new_head
,
181 const char *action
, const struct strbuf
*msg
,
183 void commit_post_rewrite(struct repository
*r
,
184 const struct commit
*current_head
,
185 const struct object_id
*new_head
);
187 int prepare_branch_to_be_rebased(struct repository
*r
, struct replay_opts
*opts
,
190 #define SUMMARY_INITIAL_COMMIT (1 << 0)
191 #define SUMMARY_SHOW_AUTHOR_DATE (1 << 1)
192 void print_commit_summary(struct repository
*repo
,
194 const struct object_id
*oid
,
197 int read_author_script(const char *path
, char **name
, char **email
, char **date
,
201 void parse_strategy_opts(struct replay_opts
*opts
, char *raw_opts
);
202 int write_basic_state(struct replay_opts
*opts
, const char *head_name
,
203 struct commit
*onto
, const char *orig_head
);
204 void sequencer_post_commit_cleanup(struct repository
*r
);
205 int sequencer_get_last_command(struct repository
* r
,
206 enum replay_action
*action
);