Show changes to 4 files +192 −18
builtin/rebase--interactive.c, builtin/rebase.c, sequencer.c, sequencer.h
diff --git a/builtin/rebase--interactive.c b/builtin/rebase--interactive.c
index 4535523bf5..9285d05443 100644
--- a/builtin/rebase--interactive.c
+++ b/builtin/rebase--interactive.c
@@ -140,6 +140,34 @@ static int get_revision_ranges(const char *upstream, const char *onto,
return 0;
}
+static int resolve_commit_list(const struct string_list *str,
+ struct commit_list **revs)
+{
+ struct object_id oid;
+ int i;
+ for (i = 0; i < str->nr; i++) {
+ struct commit *r;
+ const char * ref = str->items[i].string;
+ if (get_oid(ref, &oid))
+ return error(_("cannot resolve %s"), ref);
+
+ r = lookup_commit_reference(the_repository, &oid);
+ if (!r)
+ return error(_("%s is not a commit"), ref);
+
+ commit_list_insert(r, revs);
+ str->items[i].util = &(*revs)->item->object.oid;
+ }
+ return 0;
+}
+
+static int resolve_edits_commit_list(struct sequence_edits *edits)
+{
+ return resolve_commit_list(&edits->drop, &edits->revs) ||
+ resolve_commit_list(&edits->edit, &edits->revs) ||
+ resolve_commit_list(&edits->reword, &edits->revs);
+}
+
static int init_basic_state(struct replay_opts *opts, const char *head_name,
const char *onto, const char *orig_head)
{
@@ -163,6 +191,7 @@ static int do_interactive_rebase(struct replay_opts *opts, unsigned flags,
const char *onto, const char *onto_name,
const char *squash_onto, const char *head_name,
const char *restrict_revision, char *raw_strategies,
+ struct sequence_edits *edits,
struct string_list *commands, unsigned autosquash)
{
int ret;
@@ -197,7 +226,7 @@ static int do_interactive_rebase(struct replay_opts *opts, unsigned flags,
ret = sequencer_make_script(the_repository, &todo_list.buf,
make_script_args.argc, make_script_args.argv,
- flags);
+ edits, flags);
if (ret)
error(_("could not generate todo list"));
@@ -233,6 +262,7 @@ int cmd_rebase__interactive(int argc, const char **argv, const char *prefix)
*squash_onto = NULL, *upstream = NULL, *head_name = NULL,
*switch_to = NULL, *cmd = NULL;
struct string_list commands = STRING_LIST_INIT_DUP;
+ struct sequence_edits edits = SEQUENCE_EDITS_INIT;
char *raw_strategies = NULL;
enum {
NONE = 0, CONTINUE, SKIP, EDIT_TODO, SHOW_CURRENT_PATCH,
@@ -272,6 +302,15 @@ int cmd_rebase__interactive(int argc, const char **argv, const char *prefix)
N_("restrict-revision"), N_("restrict revision")),
OPT_STRING(0, "squash-onto", &squash_onto, N_("squash-onto"),
N_("squash onto")),
+ OPT_STRING_LIST(0, "drop", &edits.drop, N_("revision"),
+ N_("drop the mentioned ref from the "
+ "todo list")),
+ OPT_STRING_LIST(0, "edit", &edits.edit, N_("revision"),
+ N_("edit the mentioned ref instead of "
+ "picking it")),
+ OPT_STRING_LIST(0, "reword", &edits.reword, N_("revision"),
+ N_("reword the mentioned ref instead of "
+ "picking it")),
OPT_STRING(0, "upstream", &upstream, N_("upstream"),
N_("the upstream commit")),
OPT_STRING(0, "head-name", &head_name, N_("head-name"), N_("head name")),
@@ -325,6 +364,8 @@ int cmd_rebase__interactive(int argc, const char **argv, const char *prefix)
string_list_remove_empty_items(&commands, 0);
}
+ resolve_edits_commit_list(&edits);
+
switch (command) {
case NONE:
if (!onto && !upstream)
@@ -332,7 +373,7 @@ int cmd_rebase__interactive(int argc, const char **argv, const char *prefix)
ret = do_interactive_rebase(&opts, flags, switch_to, upstream, onto,
onto_name, squash_onto, head_name, restrict_revision,
- raw_strategies, &commands, autosquash);
+ raw_strategies, &edits, &commands, autosquash);
break;
case SKIP: {
struct string_list merge_rr = STRING_LIST_INIT_DUP;
@@ -373,5 +414,6 @@ int cmd_rebase__interactive(int argc, const char **argv, const char *prefix)
}
string_list_clear(&commands, 0);
+ free_sequence_edits(&edits);
return !!ret;
}
diff --git a/builtin/rebase.c b/builtin/rebase.c
index 2e41ad5644..a8101630cf 100644
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -78,6 +78,7 @@ struct rebase_options {
char *gpg_sign_opt;
int autostash;
char *cmd;
+ char *edit_switches;
int allow_empty_message;
int rebase_merges, rebase_cousins;
char *strategy, *strategy_opts;
@@ -694,6 +695,8 @@ static int run_specific_rebase(struct rebase_options *opts)
opts->switch_to);
if (opts->cmd)
argv_array_pushf(&child.args, "--cmd=%s", opts->cmd);
+ if (opts->edit_switches)
+ argv_array_split(&child.args, opts->edit_switches);
if (opts->allow_empty_message)
argv_array_push(&child.args, "--allow-empty-message");
if (opts->allow_rerere_autoupdate > 0)
@@ -711,6 +714,9 @@ static int run_specific_rebase(struct rebase_options *opts)
goto finished_rebase;
}
+ if (opts->edit_switches)
+ BUG("Unexpected rebase type with switches %d", opts->type);
+
if (opts->type == REBASE_AM) {
status = run_am(opts);
goto finished_rebase;
@@ -988,6 +994,28 @@ static int check_exec_cmd(const char *cmd)
return 0;
}
+static void forward_switches(struct rebase_options *options,
+ const char *sw_name,
+ struct string_list *values)
+{
+ int i;
+ struct strbuf buf = STRBUF_INIT;
+
+ if (!values->nr)
+ return;
+
+ imply_interactive(options, sw_name);
+
+ if (!!options->edit_switches)
+ strbuf_addf(&buf, "%s ", options->edit_switches);
+
+ for (i = 0; i < values->nr; i++)
+ strbuf_addf(&buf, "%s %s ", sw_name, values->items[i].string);
+ strbuf_rtrim(&buf);
+ options->edit_switches = xstrdup(buf.buf);
+
+ strbuf_release(&buf);
+}
int cmd_rebase(int argc, const char **argv, const char *prefix)
{
@@ -1025,6 +1053,9 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
NULL };
const char *gpg_sign = NULL;
struct string_list exec = STRING_LIST_INIT_NODUP;
+ struct string_list reword = STRING_LIST_INIT_NODUP;
+ struct string_list edit = STRING_LIST_INIT_NODUP;
+ struct string_list drop = STRING_LIST_INIT_NODUP;
const char *rebase_merges = NULL;
int fork_point = -1;
struct string_list strategy_options = STRING_LIST_INIT_NODUP;
@@ -1107,6 +1138,15 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
OPT_STRING_LIST('x', "exec", &exec, N_("exec"),
N_("add exec lines after each commit of the "
"editable list")),
+ OPT_STRING_LIST(0, "drop", &drop, N_("revision"),
+ N_("drop the mentioned ref from the "
+ "todo list")),
+ OPT_STRING_LIST(0, "edit", &edit, N_("revision"),
+ N_("edit the mentioned ref instead of "
+ "picking it")),
+ OPT_STRING_LIST(0, "reword", &reword, N_("revision"),
+ N_("reword the mentioned ref instead of "
+ "picking it")),
OPT_BOOL(0, "allow-empty-message",
&options.allow_empty_message,
N_("allow rebasing commits with empty messages")),
@@ -1364,6 +1404,10 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
options.cmd = xstrdup(buf.buf);
}
+ forward_switches(&options, "--drop", &drop);
+ forward_switches(&options, "--edit", &edit);
+ forward_switches(&options, "--reword", &reword);
+
if (rebase_merges) {
if (!*rebase_merges)
; /* default mode; do nothing */
diff --git a/sequencer.c b/sequencer.c
index 546f281898..d7384d987c 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -4259,9 +4259,81 @@ static const char *label_oid(struct object_id *oid, const char *label,
return string_entry->string;
}
+void free_sequence_edits(struct sequence_edits *edits)
+{
+ string_list_clear(&edits->drop, 0);
+ string_list_clear(&edits->edit, 0);
+ string_list_clear(&edits->reword, 0);
+ free_commit_list(edits->revs);
+}
+
+/* Find an unmatched oid in the util pointer of our edit refs. If it's found
+ reset util to NULL and return 1. */
+static int consume_oid(const struct object_id *oid,
+ const struct string_list *refs)
+{
+ int i;
+ for (i = 0; i < refs->nr; i++)
+ if (refs->items[i].util && oideq(oid, refs->items[i].util)) {
+ refs->items[i].util = NULL;
+ return 1;
+ }
+ return 0;
+}
+
+static int check_unused_refs(const struct string_list *refs)
+{
+ int i;
+ for (i = 0; i < refs->nr; i++)
+ if (refs->items[i].util)
+ return error(_("did not find '%s' in todo list"),
+ refs->items[i].string);
+ return 0;
+}
+
+static int check_unused_edits(const struct sequence_edits *edits)
+{
+ return check_unused_refs(&edits->drop) ||
+ check_unused_refs(&edits->edit) ||
+ check_unused_refs(&edits->reword);
+}
+
+static void add_todo_cmd(struct strbuf *buf, enum todo_command cmd,
+ unsigned flags)
+{
+ if (flags & TODO_LIST_ABBREVIATE_CMDS)
+ strbuf_addch(buf, command_to_char(cmd));
+ else
+ strbuf_addstr(buf, command_to_string(cmd));
+}
+
+static void add_todo_cmd_oid(struct strbuf *buf, enum todo_command cmd,
+ unsigned flags, const struct object_id *oid)
+{
+ add_todo_cmd(buf, cmd, flags);
+ strbuf_addf(buf, " %s ", oid_to_hex(oid));
+}
+
+static void add_edit_todo_inst(struct strbuf *buf, const struct object_id *oid,
+ const struct sequence_edits *edits,
+ unsigned flags)
+{
+ enum todo_command cmd = TODO_PICK;
+
+ if (consume_oid(oid, &edits->drop))
+ cmd = TODO_DROP;
+ else if (consume_oid(oid, &edits->edit))
+ cmd = TODO_EDIT;
+ else if (consume_oid(oid, &edits->reword))
+ cmd = TODO_REWORD;
+
+ add_todo_cmd_oid(buf, cmd, flags, oid);
+}
+
static int make_script_with_merges(struct pretty_print_context *pp,
- struct rev_info *revs, struct strbuf *out,
- unsigned flags)
+ struct rev_info *revs,
+ const struct sequence_edits *edits,
+ struct strbuf *out, unsigned flags)
{
int keep_empty = flags & TODO_LIST_KEEP_EMPTY;
int rebase_cousins = flags & TODO_LIST_REBASE_COUSINS;
@@ -4277,8 +4349,7 @@ static int make_script_with_merges(struct pretty_print_context *pp,
struct label_state state = { OIDMAP_INIT, { NULL }, STRBUF_INIT };
int abbr = flags & TODO_LIST_ABBREVIATE_CMDS;
- const char *cmd_pick = abbr ? "p" : "pick",
- *cmd_label = abbr ? "l" : "label",
+ const char *cmd_label = abbr ? "l" : "label",
*cmd_reset = abbr ? "t" : "reset",
*cmd_merge = abbr ? "m" : "merge";
@@ -4322,9 +4393,9 @@ static int make_script_with_merges(struct pretty_print_context *pp,
strbuf_reset(&buf);
if (!keep_empty && is_empty)
strbuf_addf(&buf, "%c ", comment_line_char);
- strbuf_addf(&buf, "%s %s %s", cmd_pick,
- oid_to_hex(&commit->object.oid),
- oneline.buf);
+ add_edit_todo_inst(&buf, &commit->object.oid, edits,
+ flags);
+ strbuf_addbuf(&buf, &oneline);
FLEX_ALLOC_STR(entry, string, buf.buf);
oidcpy(&entry->entry.oid, &commit->object.oid);
@@ -4481,18 +4552,18 @@ static int make_script_with_merges(struct pretty_print_context *pp,
hashmap_free(&state.labels, 1);
strbuf_release(&state.buf);
- return 0;
+ return check_unused_edits(edits);
}
int sequencer_make_script(struct repository *r, struct strbuf *out, int argc,
- const char **argv, unsigned flags)
+ const char **argv, const struct sequence_edits *edits,
+ unsigned flags)
{
char *format = NULL;
struct pretty_print_context pp = {0};
struct rev_info revs;
struct commit *commit;
int keep_empty = flags & TODO_LIST_KEEP_EMPTY;
- const char *insn = flags & TODO_LIST_ABBREVIATE_CMDS ? "p" : "pick";
int rebase_merges = flags & TODO_LIST_REBASE_MERGES;
repo_init_revisions(r, &revs, NULL);
@@ -4524,7 +4595,7 @@ int sequencer_make_script(struct repository *r, struct strbuf *out, int argc,
return error(_("make_script: error preparing revisions"));
if (rebase_merges)
- return make_script_with_merges(&pp, &revs, out, flags);
+ return make_script_with_merges(&pp, &revs, edits, out, flags);
while ((commit = get_revision(&revs))) {
int is_empty = is_original_commit_empty(commit);
@@ -4533,12 +4604,11 @@ int sequencer_make_script(struct repository *r, struct strbuf *out, int argc,
continue;
if (!keep_empty && is_empty)
strbuf_addf(out, "%c ", comment_line_char);
- strbuf_addf(out, "%s %s ", insn,
- oid_to_hex(&commit->object.oid));
+ add_edit_todo_inst(out, &commit->object.oid, edits, flags);
pretty_print_commit(&pp, commit, out);
strbuf_addch(out, '\n');
}
- return 0;
+ return check_unused_edits(edits);
}
/*
diff --git a/sequencer.h b/sequencer.h
index a515ee4457..7887509fea 100644
--- a/sequencer.h
+++ b/sequencer.h
@@ -130,6 +130,24 @@ int sequencer_continue(struct repository *repo, struct replay_opts *opts);
int sequencer_rollback(struct repository *repo, struct replay_opts *opts);
int sequencer_remove_state(struct replay_opts *opts);
+/*
+ * The string_lists here contain the edit refs from the command-line. Each
+ * string_list_item's util pointer is pointed to the struct object_id * of
+ * the ref's oid by resolve_oids(), and util is set back to NULL when the
+ * ref is consumed during the todo-list generation. After the todo-list is
+ * generated, any !!util strings were not encountered.
+ */
+struct sequence_edits {
+ struct commit_list *revs;
+ struct string_list drop;
+ struct string_list edit;
+ struct string_list reword;
+};
+#define SEQUENCE_EDITS_INIT { NULL, STRING_LIST_INIT_NODUP, \
+ STRING_LIST_INIT_NODUP, STRING_LIST_INIT_NODUP }
+void free_sequence_edits(struct sequence_edits *edits);
+
+
#define TODO_LIST_KEEP_EMPTY (1U << 0)
#define TODO_LIST_SHORTEN_IDS (1U << 1)
#define TODO_LIST_ABBREVIATE_CMDS (1U << 2)
@@ -143,7 +161,8 @@ int sequencer_remove_state(struct replay_opts *opts);
#define TODO_LIST_APPEND_TODO_HELP (1U << 5)
int sequencer_make_script(struct repository *r, struct strbuf *out, int argc,
- const char **argv, unsigned flags);
+ const char **argv, const struct sequence_edits *edits,
+ unsigned flags);
void todo_list_add_exec_commands(struct todo_list *todo_list,
struct string_list *commands);
--
2.20.1
Phil Hord
