sequencer.c: remove implicit dependency on the_index
[git/git.git] / builtin / rebase--interactive.c
CommitLineData
53bbcfbd
AG
1#include "builtin.h"
2#include "cache.h"
3#include "config.h"
4#include "parse-options.h"
5#include "sequencer.h"
6#include "rebase-interactive.h"
7#include "argv-array.h"
8#include "refs.h"
9#include "rerere.h"
10#include "run-command.h"
11
12static GIT_PATH_FUNC(path_state_dir, "rebase-merge/")
13static GIT_PATH_FUNC(path_squash_onto, "rebase-merge/squash-onto")
14static GIT_PATH_FUNC(path_interactive, "rebase-merge/interactive")
15
16static int get_revision_ranges(const char *upstream, const char *onto,
17 const char **head_hash,
18 char **revisions, char **shortrevisions)
19{
20 const char *base_rev = upstream ? upstream : onto, *shorthead;
21 struct object_id orig_head;
22
23 if (get_oid("HEAD", &orig_head))
24 return error(_("no HEAD?"));
25
26 *head_hash = find_unique_abbrev(&orig_head, GIT_MAX_HEXSZ);
27 *revisions = xstrfmt("%s...%s", base_rev, *head_hash);
28
29 shorthead = find_unique_abbrev(&orig_head, DEFAULT_ABBREV);
30
31 if (upstream) {
32 const char *shortrev;
33 struct object_id rev_oid;
34
35 get_oid(base_rev, &rev_oid);
36 shortrev = find_unique_abbrev(&rev_oid, DEFAULT_ABBREV);
37
38 *shortrevisions = xstrfmt("%s..%s", shortrev, shorthead);
39 } else
40 *shortrevisions = xstrdup(shorthead);
41
42 return 0;
43}
44
45static int init_basic_state(struct replay_opts *opts, const char *head_name,
46 const char *onto, const char *orig_head)
47{
48 FILE *interactive;
49
50 if (!is_directory(path_state_dir()) && mkdir_in_gitdir(path_state_dir()))
51 return error_errno(_("could not create temporary %s"), path_state_dir());
52
53 delete_reflog("REBASE_HEAD");
54
55 interactive = fopen(path_interactive(), "w");
56 if (!interactive)
57 return error_errno(_("could not mark as interactive"));
58 fclose(interactive);
59
60 return write_basic_state(opts, head_name, onto, orig_head);
61}
62
63static int do_interactive_rebase(struct replay_opts *opts, unsigned flags,
64 const char *switch_to, const char *upstream,
65 const char *onto, const char *onto_name,
66 const char *squash_onto, const char *head_name,
67 const char *restrict_revision, char *raw_strategies,
68 const char *cmd, unsigned autosquash)
69{
70 int ret;
71 const char *head_hash = NULL;
72 char *revisions = NULL, *shortrevisions = NULL;
73 struct argv_array make_script_args = ARGV_ARRAY_INIT;
74 FILE *todo_list;
75
76 if (prepare_branch_to_be_rebased(opts, switch_to))
77 return -1;
78
79 if (get_revision_ranges(upstream, onto, &head_hash,
80 &revisions, &shortrevisions))
81 return -1;
82
83 if (raw_strategies)
84 parse_strategy_opts(opts, raw_strategies);
85
86 if (init_basic_state(opts, head_name, onto, head_hash)) {
87 free(revisions);
88 free(shortrevisions);
89
90 return -1;
91 }
92
93 if (!upstream && squash_onto)
94 write_file(path_squash_onto(), "%s\n", squash_onto);
95
96 todo_list = fopen(rebase_path_todo(), "w");
97 if (!todo_list) {
98 free(revisions);
99 free(shortrevisions);
100
101 return error_errno(_("could not open %s"), rebase_path_todo());
102 }
103
104 argv_array_pushl(&make_script_args, "", revisions, NULL);
105 if (restrict_revision)
106 argv_array_push(&make_script_args, restrict_revision);
107
f11c9580 108 ret = sequencer_make_script(the_repository, todo_list,
53bbcfbd
AG
109 make_script_args.argc, make_script_args.argv,
110 flags);
111 fclose(todo_list);
112
113 if (ret)
114 error(_("could not generate todo list"));
115 else {
116 discard_cache();
117 ret = complete_action(opts, flags, shortrevisions, onto_name, onto,
118 head_hash, cmd, autosquash);
119 }
120
121 free(revisions);
122 free(shortrevisions);
123 argv_array_clear(&make_script_args);
124
125 return ret;
126}
127
128static const char * const builtin_rebase_interactive_usage[] = {
129 N_("git rebase--interactive [<options>]"),
130 NULL
131};
132
133int cmd_rebase__interactive(int argc, const char **argv, const char *prefix)
134{
135 struct replay_opts opts = REPLAY_OPTS_INIT;
136 unsigned flags = 0, keep_empty = 0, rebase_merges = 0, autosquash = 0;
0af129b2 137 int abbreviate_commands = 0, rebase_cousins = -1, ret = 0;
53bbcfbd
AG
138 const char *onto = NULL, *onto_name = NULL, *restrict_revision = NULL,
139 *squash_onto = NULL, *upstream = NULL, *head_name = NULL,
140 *switch_to = NULL, *cmd = NULL;
141 char *raw_strategies = NULL;
0af129b2 142 enum {
34b47315
AG
143 NONE = 0, CONTINUE, SKIP, EDIT_TODO, SHOW_CURRENT_PATCH,
144 SHORTEN_OIDS, EXPAND_OIDS, CHECK_TODO_LIST, REARRANGE_SQUASH, ADD_EXEC
0af129b2 145 } command = 0;
53bbcfbd
AG
146 struct option options[] = {
147 OPT_BOOL(0, "ff", &opts.allow_ff, N_("allow fast-forward")),
148 OPT_BOOL(0, "keep-empty", &keep_empty, N_("keep empty commits")),
149 OPT_BOOL(0, "allow-empty-message", &opts.allow_empty_message,
150 N_("allow commits with empty messages")),
151 OPT_BOOL(0, "rebase-merges", &rebase_merges, N_("rebase merge commits")),
152 OPT_BOOL(0, "rebase-cousins", &rebase_cousins,
153 N_("keep original branch points of cousins")),
154 OPT_BOOL(0, "autosquash", &autosquash,
155 N_("move commits that begin with squash!/fixup!")),
156 OPT_BOOL(0, "signoff", &opts.signoff, N_("sign commits")),
157 OPT__VERBOSE(&opts.verbose, N_("be verbose")),
0af129b2
AG
158 OPT_CMDMODE(0, "continue", &command, N_("continue rebase"),
159 CONTINUE),
160 OPT_CMDMODE(0, "skip", &command, N_("skip commit"), SKIP),
161 OPT_CMDMODE(0, "edit-todo", &command, N_("edit the todo list"),
162 EDIT_TODO),
163 OPT_CMDMODE(0, "show-current-patch", &command, N_("show the current patch"),
164 SHOW_CURRENT_PATCH),
34b47315
AG
165 OPT_CMDMODE(0, "shorten-ids", &command,
166 N_("shorten commit ids in the todo list"), SHORTEN_OIDS),
167 OPT_CMDMODE(0, "expand-ids", &command,
168 N_("expand commit ids in the todo list"), EXPAND_OIDS),
169 OPT_CMDMODE(0, "check-todo-list", &command,
170 N_("check the todo list"), CHECK_TODO_LIST),
171 OPT_CMDMODE(0, "rearrange-squash", &command,
172 N_("rearrange fixup/squash lines"), REARRANGE_SQUASH),
173 OPT_CMDMODE(0, "add-exec-commands", &command,
174 N_("insert exec commands in todo list"), ADD_EXEC),
53bbcfbd
AG
175 OPT_STRING(0, "onto", &onto, N_("onto"), N_("onto")),
176 OPT_STRING(0, "restrict-revision", &restrict_revision,
177 N_("restrict-revision"), N_("restrict revision")),
178 OPT_STRING(0, "squash-onto", &squash_onto, N_("squash-onto"),
179 N_("squash onto")),
180 OPT_STRING(0, "upstream", &upstream, N_("upstream"),
181 N_("the upstream commit")),
182 OPT_STRING(0, "head-name", &head_name, N_("head-name"), N_("head name")),
183 { OPTION_STRING, 'S', "gpg-sign", &opts.gpg_sign, N_("key-id"),
184 N_("GPG-sign commits"),
185 PARSE_OPT_OPTARG, NULL, (intptr_t) "" },
186 OPT_STRING(0, "strategy", &opts.strategy, N_("strategy"),
187 N_("rebase strategy")),
188 OPT_STRING(0, "strategy-opts", &raw_strategies, N_("strategy-opts"),
189 N_("strategy options")),
190 OPT_STRING(0, "switch-to", &switch_to, N_("switch-to"),
191 N_("the branch or commit to checkout")),
192 OPT_STRING(0, "onto-name", &onto_name, N_("onto-name"), N_("onto name")),
193 OPT_STRING(0, "cmd", &cmd, N_("cmd"), N_("the command to run")),
194 OPT_RERERE_AUTOUPDATE(&opts.allow_rerere_auto),
195 OPT_END()
196 };
197
198 sequencer_init_config(&opts);
199 git_config_get_bool("rebase.abbreviatecommands", &abbreviate_commands);
200
201 opts.action = REPLAY_INTERACTIVE_REBASE;
202 opts.allow_ff = 1;
203 opts.allow_empty = 1;
204
205 if (argc == 1)
206 usage_with_options(builtin_rebase_interactive_usage, options);
207
208 argc = parse_options(argc, argv, NULL, options,
209 builtin_rebase_interactive_usage, PARSE_OPT_KEEP_ARGV0);
210
211 opts.gpg_sign = xstrdup_or_null(opts.gpg_sign);
212
213 flags |= keep_empty ? TODO_LIST_KEEP_EMPTY : 0;
214 flags |= abbreviate_commands ? TODO_LIST_ABBREVIATE_CMDS : 0;
215 flags |= rebase_merges ? TODO_LIST_REBASE_MERGES : 0;
216 flags |= rebase_cousins > 0 ? TODO_LIST_REBASE_COUSINS : 0;
34b47315 217 flags |= command == SHORTEN_OIDS ? TODO_LIST_SHORTEN_IDS : 0;
53bbcfbd
AG
218
219 if (rebase_cousins >= 0 && !rebase_merges)
220 warning(_("--[no-]rebase-cousins has no effect without "
221 "--rebase-merges"));
222
0af129b2
AG
223 switch (command) {
224 case NONE:
225 if (!onto && !upstream)
226 die(_("a base commit must be provided with --upstream or --onto"));
227
228 ret = do_interactive_rebase(&opts, flags, switch_to, upstream, onto,
229 onto_name, squash_onto, head_name, restrict_revision,
230 raw_strategies, cmd, autosquash);
231 break;
232 case SKIP: {
233 struct string_list merge_rr = STRING_LIST_INIT_DUP;
234
235 rerere_clear(&merge_rr);
236 /* fallthrough */
237 case CONTINUE:
f11c9580 238 ret = sequencer_continue(the_repository, &opts);
0af129b2
AG
239 break;
240 }
241 case EDIT_TODO:
242 ret = edit_todo_list(flags);
243 break;
244 case SHOW_CURRENT_PATCH: {
245 struct child_process cmd = CHILD_PROCESS_INIT;
246
247 cmd.git_cmd = 1;
248 argv_array_pushl(&cmd.args, "show", "REBASE_HEAD", "--", NULL);
249 ret = run_command(&cmd);
250
251 break;
252 }
34b47315
AG
253 case SHORTEN_OIDS:
254 case EXPAND_OIDS:
255 ret = transform_todos(flags);
256 break;
257 case CHECK_TODO_LIST:
258 ret = check_todo_list();
259 break;
260 case REARRANGE_SQUASH:
261 ret = rearrange_squash();
262 break;
263 case ADD_EXEC:
264 ret = sequencer_add_exec_commands(cmd);
265 break;
0af129b2
AG
266 default:
267 BUG("invalid command '%d'", command);
268 }
53bbcfbd 269
0af129b2 270 return !!ret;
53bbcfbd 271}