]>
Commit | Line | Data |
---|---|---|
26ae337b RR |
1 | #ifndef SEQUENCER_H |
2 | #define SEQUENCER_H | |
3 | ||
ef3ca954 EN |
4 | #include "cache.h" |
5 | #include "strbuf.h" | |
6 | ||
7 | struct commit; | |
f11c9580 | 8 | struct repository; |
ef3ca954 | 9 | |
66618a50 | 10 | const char *git_path_commit_editmsg(void); |
8a2a0f53 | 11 | const char *git_path_seq_dir(void); |
44b776c3 | 12 | const char *rebase_path_todo(void); |
26ae337b | 13 | |
bab4d109 BC |
14 | #define APPEND_SIGNOFF_DEDUP (1u << 0) |
15 | ||
043a4492 RR |
16 | enum replay_action { |
17 | REPLAY_REVERT, | |
84583957 JS |
18 | REPLAY_PICK, |
19 | REPLAY_INTERACTIVE_REBASE | |
043a4492 RR |
20 | }; |
21 | ||
28d6daed PW |
22 | enum commit_msg_cleanup_mode { |
23 | COMMIT_MSG_CLEANUP_SPACE, | |
24 | COMMIT_MSG_CLEANUP_NONE, | |
25 | COMMIT_MSG_CLEANUP_SCISSORS, | |
26 | COMMIT_MSG_CLEANUP_ALL | |
27 | }; | |
28 | ||
043a4492 RR |
29 | struct replay_opts { |
30 | enum replay_action action; | |
043a4492 RR |
31 | |
32 | /* Boolean options */ | |
33 | int edit; | |
34 | int record_origin; | |
35 | int no_commit; | |
36 | int signoff; | |
37 | int allow_ff; | |
38 | int allow_rerere_auto; | |
df478b74 | 39 | int allow_empty; |
4bee9584 | 40 | int allow_empty_message; |
b27cfb0d | 41 | int keep_redundant_commits; |
556907f1 | 42 | int verbose; |
043a4492 RR |
43 | |
44 | int mainline; | |
45 | ||
03a4e260 | 46 | char *gpg_sign; |
28d6daed | 47 | enum commit_msg_cleanup_mode default_msg_cleanup; |
3253553e | 48 | |
043a4492 | 49 | /* Merge strategy */ |
03a4e260 JS |
50 | char *strategy; |
51 | char **xopts; | |
043a4492 RR |
52 | size_t xopts_nr, xopts_alloc; |
53 | ||
e12a7ef5 JS |
54 | /* Used by fixup/squash */ |
55 | struct strbuf current_fixups; | |
56 | int current_fixup_count; | |
57 | ||
d87d48b2 JS |
58 | /* placeholder commit for -i --root */ |
59 | struct object_id squash_onto; | |
60 | int have_squash_onto; | |
61 | ||
043a4492 RR |
62 | /* Only used by REPLAY_NONE */ |
63 | struct rev_info *revs; | |
64 | }; | |
e12a7ef5 | 65 | #define REPLAY_OPTS_INIT { .action = -1, .current_fixups = STRBUF_INIT } |
043a4492 | 66 | |
5d94d545 AG |
67 | /* |
68 | * Note that ordering matters in this enum. Not only must it match the mapping | |
69 | * of todo_command_info (in sequencer.c), it is also divided into several | |
70 | * sections that matter. When adding new commands, make sure you add it in the | |
71 | * right section. | |
72 | */ | |
73 | enum todo_command { | |
74 | /* commands that handle commits */ | |
75 | TODO_PICK = 0, | |
76 | TODO_REVERT, | |
77 | TODO_EDIT, | |
78 | TODO_REWORD, | |
79 | TODO_FIXUP, | |
80 | TODO_SQUASH, | |
81 | /* commands that do something else than handling a single commit */ | |
82 | TODO_EXEC, | |
83 | TODO_BREAK, | |
84 | TODO_LABEL, | |
85 | TODO_RESET, | |
86 | TODO_MERGE, | |
87 | /* commands that do nothing but are counted for reporting progress */ | |
88 | TODO_NOOP, | |
89 | TODO_DROP, | |
90 | /* comments (not counted for reporting progress) */ | |
91 | TODO_COMMENT | |
92 | }; | |
93 | ||
94 | struct todo_item { | |
95 | enum todo_command command; | |
96 | struct commit *commit; | |
97 | unsigned int flags; | |
5d94d545 | 98 | int arg_len; |
6ad656db AG |
99 | /* The offset of the command and its argument in the strbuf */ |
100 | size_t offset_in_buf, arg_offset; | |
5d94d545 AG |
101 | }; |
102 | ||
103 | struct todo_list { | |
104 | struct strbuf buf; | |
105 | struct todo_item *items; | |
106 | int nr, alloc, current; | |
107 | int done_nr, total_nr; | |
108 | struct stat_data stat; | |
109 | }; | |
110 | ||
111 | #define TODO_LIST_INIT { STRBUF_INIT } | |
112 | ||
113 | int todo_list_parse_insn_buffer(struct repository *r, char *buf, | |
114 | struct todo_list *todo_list); | |
616d7740 AG |
115 | int todo_list_write_to_file(struct repository *r, struct todo_list *todo_list, |
116 | const char *file, const char *shortrevisions, | |
117 | const char *shortonto, int num, unsigned flags); | |
5d94d545 | 118 | void todo_list_release(struct todo_list *todo_list); |
6ad656db AG |
119 | const char *todo_item_get_arg(struct todo_list *todo_list, |
120 | struct todo_item *item); | |
5d94d545 | 121 | |
28d6daed PW |
122 | /* Call this to setup defaults before parsing command line options */ |
123 | void sequencer_init_config(struct replay_opts *opts); | |
f11c9580 NTND |
124 | int sequencer_pick_revisions(struct repository *repo, |
125 | struct replay_opts *opts); | |
126 | int sequencer_continue(struct repository *repo, struct replay_opts *opts); | |
005af339 | 127 | int sequencer_rollback(struct repository *repo, struct replay_opts *opts); |
2863584f | 128 | int sequencer_remove_state(struct replay_opts *opts); |
043a4492 | 129 | |
313a48ea LB |
130 | #define TODO_LIST_KEEP_EMPTY (1U << 0) |
131 | #define TODO_LIST_SHORTEN_IDS (1U << 1) | |
d8ae6c84 | 132 | #define TODO_LIST_ABBREVIATE_CMDS (1U << 2) |
1644c73c | 133 | #define TODO_LIST_REBASE_MERGES (1U << 3) |
7543f6f4 JS |
134 | /* |
135 | * When rebasing merges, commits that do have the base commit as ancestor | |
136 | * ("cousins") are *not* rebased onto the new base by default. If those | |
137 | * commits should be rebased onto the new base, this flag needs to be passed. | |
138 | */ | |
139 | #define TODO_LIST_REBASE_COUSINS (1U << 4) | |
616d7740 AG |
140 | #define TODO_LIST_APPEND_TODO_HELP (1U << 5) |
141 | ||
d358fc28 AG |
142 | int sequencer_make_script(struct repository *r, struct strbuf *out, int argc, |
143 | const char **argv, unsigned flags); | |
62db5247 | 144 | |
cbef27d6 | 145 | int transform_todo_file(struct repository *r, unsigned flags); |
1ba204de AG |
146 | void todo_list_add_exec_commands(struct todo_list *todo_list, |
147 | struct string_list *commands); | |
6ca89c6f | 148 | int check_todo_list_from_file(struct repository *r); |
005af339 | 149 | int complete_action(struct repository *r, struct replay_opts *opts, unsigned flags, |
b97e1873 | 150 | const char *shortrevisions, const char *onto_name, |
683153a4 | 151 | const char *onto, const char *orig_head, struct string_list *commands, |
94bcad79 | 152 | unsigned autosquash, struct todo_list *todo_list); |
79d7e883 | 153 | int todo_list_rearrange_squash(struct todo_list *todo_list); |
3546c8d9 | 154 | |
5ed75e2a MV |
155 | extern const char sign_off_header[]; |
156 | ||
66e83d9b JK |
157 | /* |
158 | * Append a signoff to the commit message in "msgbuf". The ignore_footer | |
159 | * parameter specifies the number of bytes at the end of msgbuf that should | |
160 | * not be considered at all. I.e., they are not checked for existing trailers, | |
161 | * and the new signoff will be spliced into the buffer before those bytes. | |
162 | */ | |
163 | void append_signoff(struct strbuf *msgbuf, size_t ignore_footer, unsigned flag); | |
164 | ||
f11c9580 | 165 | void append_conflicts_hint(struct index_state *istate, struct strbuf *msgbuf); |
d0aaa46f PW |
166 | int message_is_empty(const struct strbuf *sb, |
167 | enum commit_msg_cleanup_mode cleanup_mode); | |
168 | int template_untouched(const struct strbuf *sb, const char *template_file, | |
169 | enum commit_msg_cleanup_mode cleanup_mode); | |
0505d604 PW |
170 | int update_head_with_reflog(const struct commit *old_head, |
171 | const struct object_id *new_head, | |
172 | const char *action, const struct strbuf *msg, | |
173 | struct strbuf *err); | |
a87a6f3c PW |
174 | void commit_post_rewrite(const struct commit *current_head, |
175 | const struct object_id *new_head); | |
5ed75e2a | 176 | |
2c58483a AG |
177 | int prepare_branch_to_be_rebased(struct replay_opts *opts, const char *commit); |
178 | ||
e47c6caf PW |
179 | #define SUMMARY_INITIAL_COMMIT (1 << 0) |
180 | #define SUMMARY_SHOW_AUTHOR_DATE (1 << 1) | |
f11c9580 NTND |
181 | void print_commit_summary(struct repository *repo, |
182 | const char *prefix, | |
183 | const struct object_id *oid, | |
e47c6caf | 184 | unsigned int flags); |
bcd33ec2 PW |
185 | |
186 | int read_author_script(const char *path, char **name, char **email, char **date, | |
187 | int allow_missing); | |
26ae337b | 188 | #endif |
65850686 AG |
189 | |
190 | void parse_strategy_opts(struct replay_opts *opts, char *raw_opts); | |
191 | int write_basic_state(struct replay_opts *opts, const char *head_name, | |
192 | const char *onto, const char *orig_head); |