undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wt-status: move wt_status_get_state() out to wt_status_print()

Browse Source 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nguyễn Thái Ngọc Duy 2013-03-13 18:42:51 +07:00 committed by Junio C Hamano
parent b9691db4f9
commit 3b691cccb0
1 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
wt-status.c
View File

@ -1031,32 +1031,30 @@ void wt_status_get_state(struct wt_status_state *state)
} }
} }
static void wt_status_print_state(struct wt_status *s) static void wt_status_print_state(struct wt_status *s,
struct wt_status_state *state)
{ {
const char *state_color = color(WT_STATUS_HEADER, s); const char *state_color = color(WT_STATUS_HEADER, s);
struct wt_status_state state; if (state->merge_in_progress)
show_merge_in_progress(s, state, state_color);
memset(&state, 0, sizeof(state)); else if (state->am_in_progress)
wt_status_get_state(&state); show_am_in_progress(s, state, state_color);
else if (state->rebase_in_progress || state->rebase_interactive_in_progress)
if (state.merge_in_progress) show_rebase_in_progress(s, state, state_color);
show_merge_in_progress(s, &state, state_color); else if (state->cherry_pick_in_progress)
else if (state.am_in_progress) show_cherry_pick_in_progress(s, state, state_color);
show_am_in_progress(s, &state, state_color); if (state->bisect_in_progress)
else if (state.rebase_in_progress || state.rebase_interactive_in_progress) show_bisect_in_progress(s, state, state_color);
show_rebase_in_progress(s, &state, state_color);
else if (state.cherry_pick_in_progress)
show_cherry_pick_in_progress(s, &state, state_color);
if (state.bisect_in_progress)
show_bisect_in_progress(s, &state, state_color);
free(state.branch);
free(state.onto);
} }
void wt_status_print(struct wt_status *s) void wt_status_print(struct wt_status *s)
{ {
const char *branch_color = color(WT_STATUS_ONBRANCH, s); const char *branch_color = color(WT_STATUS_ONBRANCH, s);
const char *branch_status_color = color(WT_STATUS_HEADER, s); const char *branch_status_color = color(WT_STATUS_HEADER, s);
struct wt_status_state state;
memset(&state, 0, sizeof(state));
wt_status_get_state(&state);
if (s->branch) { if (s->branch) {
const char *on_what = _("On branch "); const char *on_what = _("On branch ");
@ -1075,7 +1073,10 @@ void wt_status_print(struct wt_status *s)
wt_status_print_tracking(s); wt_status_print_tracking(s);
} }
wt_status_print_state(s); wt_status_print_state(s, &state);
free(state.branch);
free(state.onto);
if (s->is_initial) { if (s->is_initial) {
status_printf_ln(s, color(WT_STATUS_HEADER, s), ""); status_printf_ln(s, color(WT_STATUS_HEADER, s), "");
status_printf_ln(s, color(WT_STATUS_HEADER, s), _("Initial commit")); status_printf_ln(s, color(WT_STATUS_HEADER, s), _("Initial commit"));