11 const char *git_path_commit_editmsg(void);
12 const char *rebase_path_todo(void);
13 const char *rebase_path_todo_backup(void);
14 const char *rebase_path_dropped(void);
16 #define APPEND_SIGNOFF_DEDUP (1u << 0)
21 REPLAY_INTERACTIVE_REBASE
24 enum commit_msg_cleanup_mode {
25 COMMIT_MSG_CLEANUP_SPACE,
26 COMMIT_MSG_CLEANUP_NONE,
27 COMMIT_MSG_CLEANUP_SCISSORS,
28 COMMIT_MSG_CLEANUP_ALL
32 enum replay_action action;
40 int allow_rerere_auto;
42 int allow_empty_message;
43 int drop_redundant_commits;
44 int keep_redundant_commits;
47 int reschedule_failed_exec;
48 int committer_date_is_author_date;
53 char *committer_email;
55 enum commit_msg_cleanup_mode default_msg_cleanup;
61 size_t xopts_nr, xopts_alloc;
63 /* Used by fixup/squash */
64 struct strbuf current_fixups;
65 int current_fixup_count;
67 /* placeholder commit for -i --root */
68 struct object_id squash_onto;
71 /* Only used by REPLAY_NONE */
72 struct rev_info *revs;
74 #define REPLAY_OPTS_INIT { .action = -1, .current_fixups = STRBUF_INIT }
77 * Note that ordering matters in this enum. Not only must it match the mapping
78 * of todo_command_info (in sequencer.c), it is also divided into several
79 * sections that matter. When adding new commands, make sure you add it in the
83 /* commands that handle commits */
90 /* commands that do something else than handling a single commit */
96 /* commands that do nothing but are counted for reporting progress */
99 /* comments (not counted for reporting progress) */
104 enum todo_command command;
105 struct commit *commit;
108 /* The offset of the command and its argument in the strbuf */
109 size_t offset_in_buf, arg_offset;
114 struct todo_item *items;
115 int nr, alloc, current;
116 int done_nr, total_nr;
117 struct stat_data stat;
120 #define TODO_LIST_INIT { STRBUF_INIT }
122 int todo_list_parse_insn_buffer(struct repository *r, char *buf,
123 struct todo_list *todo_list);
124 int todo_list_write_to_file(struct repository *r, struct todo_list *todo_list,
125 const char *file, const char *shortrevisions,
126 const char *shortonto, int num, unsigned flags);
127 void todo_list_release(struct todo_list *todo_list);
128 const char *todo_item_get_arg(struct todo_list *todo_list,
129 struct todo_item *item);
131 /* Call this to setup defaults before parsing command line options */
132 void sequencer_init_config(struct replay_opts *opts);
133 int sequencer_pick_revisions(struct repository *repo,
134 struct replay_opts *opts);
135 int sequencer_continue(struct repository *repo, struct replay_opts *opts);
136 int sequencer_rollback(struct repository *repo, struct replay_opts *opts);
137 int sequencer_skip(struct repository *repo, struct replay_opts *opts);
138 int sequencer_remove_state(struct replay_opts *opts);
140 /* #define TODO_LIST_KEEP_EMPTY (1U << 0) */ /* No longer used */
141 #define TODO_LIST_SHORTEN_IDS (1U << 1)
142 #define TODO_LIST_ABBREVIATE_CMDS (1U << 2)
143 #define TODO_LIST_REBASE_MERGES (1U << 3)
145 * When rebasing merges, commits that do have the base commit as ancestor
146 * ("cousins") are *not* rebased onto the new base by default. If those
147 * commits should be rebased onto the new base, this flag needs to be passed.
149 #define TODO_LIST_REBASE_COUSINS (1U << 4)
150 #define TODO_LIST_APPEND_TODO_HELP (1U << 5)
152 * When generating a script that rebases merges with `--root` *and* with
153 * `--onto`, we do not want to re-generate the root commits.
155 #define TODO_LIST_ROOT_WITH_ONTO (1U << 6)
158 int sequencer_make_script(struct repository *r, struct strbuf *out, int argc,
159 const char **argv, unsigned flags);
161 void todo_list_add_exec_commands(struct todo_list *todo_list,
162 struct string_list *commands);
163 int complete_action(struct repository *r, struct replay_opts *opts, unsigned flags,
164 const char *shortrevisions, const char *onto_name,
165 struct commit *onto, const char *orig_head, struct string_list *commands,
166 unsigned autosquash, struct todo_list *todo_list);
167 int todo_list_rearrange_squash(struct todo_list *todo_list);
170 * Append a signoff to the commit message in "msgbuf". The ignore_footer
171 * parameter specifies the number of bytes at the end of msgbuf that should
172 * not be considered at all. I.e., they are not checked for existing trailers,
173 * and the new signoff will be spliced into the buffer before those bytes.
175 void append_signoff(struct strbuf *msgbuf, size_t ignore_footer, unsigned flag);
177 void append_conflicts_hint(struct index_state *istate,
178 struct strbuf *msgbuf, enum commit_msg_cleanup_mode cleanup_mode);
179 enum commit_msg_cleanup_mode get_cleanup_mode(const char *cleanup_arg,
182 void cleanup_message(struct strbuf *msgbuf,
183 enum commit_msg_cleanup_mode cleanup_mode, int verbose);
185 int message_is_empty(const struct strbuf *sb,
186 enum commit_msg_cleanup_mode cleanup_mode);
187 int template_untouched(const struct strbuf *sb, const char *template_file,
188 enum commit_msg_cleanup_mode cleanup_mode);
189 int update_head_with_reflog(const struct commit *old_head,
190 const struct object_id *new_head,
191 const char *action, const struct strbuf *msg,
193 void commit_post_rewrite(struct repository *r,
194 const struct commit *current_head,
195 const struct object_id *new_head);
197 #define SUMMARY_INITIAL_COMMIT (1 << 0)
198 #define SUMMARY_SHOW_AUTHOR_DATE (1 << 1)
199 void print_commit_summary(struct repository *repo,
201 const struct object_id *oid,
204 int read_author_script(const char *path, char **name, char **email, char **date,
206 void parse_strategy_opts(struct replay_opts *opts, char *raw_opts);
207 int write_basic_state(struct replay_opts *opts, const char *head_name,
208 struct commit *onto, const char *orig_head);
209 void sequencer_post_commit_cleanup(struct repository *r, int verbose);
210 int sequencer_get_last_command(struct repository* r,
211 enum replay_action *action);
212 int sequencer_determine_whence(struct repository *r, enum commit_whence *whence);
213 #endif /* SEQUENCER_H */