Re: [PATCH v2 08/34] sequencer (rebase -i): implement the short commands

2016-12-15 Thread Junio C Hamano
Johannes Schindelin  writes:

> 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 
> ---

Sensible.


[PATCH v2 08/34] sequencer (rebase -i): implement the short commands

2016-12-13 Thread Johannes Schindelin
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 
---
 sequencer.c | 36 ++--
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/sequencer.c b/sequencer.c
index 271c21581d..e443f4765d 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -710,20 +710,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);
 }
 
@@ -1125,12 +1128,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], )) {
+   for (i = 0; i < ARRAY_SIZE(todo_command_info); i++)
+   if (skip_prefix(bol, todo_command_info[i].str, )) {
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) {
@@ -1325,7 +1333,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))
-- 
2.11.0.rc3.windows.1