global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-28 11:32:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

sequencer (rebase -i): implement the short commands

Browse Source 
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>
This commit is contained in:
Johannes Schindelin
2016-04-13 14:08:09 +02:00
parent b2c7c683f2
commit d036424d43
1 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
sequencer.c
View File

@@ -713,20 +713,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 (command < ARRAY_SIZE(todo_command_strings))
return todo_command_strings[command];
if (command < ARRAY_SIZE(todo_command_info))
return todo_command_info[command].str;
die("Unknown command: %d", command);
}
@@ -1119,12 +1122,17 @@ 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;
}
if (i >= ARRAY_SIZE(todo_command_strings))
else if (bol[1] == ' ' && *bol == todo_command_info[i].c) {
bol++;
item->command = i;
break;
}
if (i >= ARRAY_SIZE(todo_command_info))
return -1;
if (item->command == TODO_NOOP) {
@@ -1309,7 +1317,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))