Browse Source

trace2:data: add subverb for rebase

Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Jeff Hostetler 6 years ago committed by Junio C Hamano
parent
commit
b3a5d5a80c
  1. 17
      builtin/rebase.c

17
builtin/rebase.c

@ -1027,6 +1027,14 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) @@ -1027,6 +1027,14 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
ACTION_EDIT_TODO,
ACTION_SHOW_CURRENT_PATCH,
} action = NO_ACTION;
static const char *action_names[] = { N_("undefined"),
N_("continue"),
N_("skip"),
N_("abort"),
N_("quit"),
N_("edit_todo"),
N_("show_current_patch"),
NULL };
const char *gpg_sign = NULL;
struct string_list exec = STRING_LIST_INIT_NODUP;
const char *rebase_merges = NULL;
@ -1212,6 +1220,15 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) @@ -1212,6 +1220,15 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
die(_("The --edit-todo action can only be used during "
"interactive rebase."));

if (trace2_is_enabled()) {
if (is_interactive(&options))
trace2_cmd_mode("interactive");
else if (exec.nr)
trace2_cmd_mode("interactive-exec");
else
trace2_cmd_mode(action_names[action]);
}

switch (action) {
case ACTION_CONTINUE: {
struct object_id head;

Loading…
Cancel
Save