mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-28 08:06:23 +02:00
Code

sequencer (rebase -i): implement the short commands 

For users' convenience, most rebase commands can be abbreviated, e.g.
'p' instead of 'pick' and 'x' instead of 'exec'. Let's teach the
sequencer to handle those abbreviated commands just fine.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Johannes Schindelin 2017-01-02 16:27:15 +01:00 committed by Junio C Hamano
parent 6e98de72c0
commit 414697a9d8
1 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
sequencer.c
View File

@ -678,20 +678,23 @@ enum todo_command {
TODO_NOOP
};
static const char *todo_command_strings[] = {
"pick",
"revert",
"edit",
"fixup",
"squash",
"exec",
"noop"
static struct {
char c;
const char *str;
} todo_command_info[] = {
{ 'p', "pick" },
{ 0, "revert" },
{ 'e', "edit" },
{ 'f', "fixup" },
{ 's', "squash" },
{ 'x', "exec" },
{ 0, "noop" }
};
static const char *command_to_string(const enum todo_command command)
{
if ((size_t)command < ARRAY_SIZE(todo_command_strings))
return todo_command_strings[command];
if ((size_t)command < ARRAY_SIZE(todo_command_info))
return todo_command_info[command].str;
die("Unknown command: %d", command);
}
@ -1087,12 +1090,16 @@ static int parse_insn_line(struct todo_item *item, const char *bol, char *eol)
return 0;
}
for (i = 0; i < ARRAY_SIZE(todo_command_strings); i++)
if (skip_prefix(bol, todo_command_strings[i], &bol)) {
for (i = 0; i < ARRAY_SIZE(todo_command_info); i++)
if (skip_prefix(bol, todo_command_info[i].str, &bol)) {
item->command = i;
break;
} else if (bol[1] == ' ' && *bol == todo_command_info[i].c) {
bol++;
item->command = i;
break;
}
if (i >= ARRAY_SIZE(todo_command_strings))
if (i >= ARRAY_SIZE(todo_command_info))
return -1;
if (item->command == TODO_NOOP) {
@ -1287,7 +1294,7 @@ static int walk_revs_populate_todo(struct todo_list *todo_list,
{
enum todo_command command = opts->action == REPLAY_PICK ?
TODO_PICK : TODO_REVERT;
const char *command_string = todo_command_strings[command];
const char *command_string = todo_command_info[command].str;
struct commit *commit;
if (prepare_revs(opts))