[PATCH 2/3] git-status: show the remote tracking statistics
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Jul 2, 2008, 07:52 UTC
- Message-ID
- <7vod5gen9r.fsf@gitster.siamese.dyndns.org>
- In-Reply-To
- <7vlk0lmn32.fsf@gitster.siamese.dyndns.org>
This teaches "git status" to show the same remote tracking statistics "git checkout" gives at the beginning of the output.
Now the necessary low-level machinery is properly factored out, we can do this quite cleanly.
Signed-off-by: Junio C Hamano <gitster@pobox.com> --- wt-status.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/wt-status.c b/wt-status.c index 28c9e63..eeb106e 100644 --- a/wt-status.c +++ b/wt-status.c @@ -9,6 +9,7 @@ #include "diffcore.h" #include "quote.h" #include "run-command.h" +#include "remote.h" int wt_status_relative_paths = 1; int wt_status_use_color = -1; @@ -315,6 +316,25 @@ static void wt_status_print_verbose(struct wt_status *s) run_diff_index(&rev, 1); } +static void wt_status_print_tracking(struct wt_status *s) +{ + struct strbuf sb = STRBUF_INIT; + const char *cp, *ep; + struct branch *branch; + + assert(s->branch && !s->is_initial); + if (prefixcmp(s->branch, "refs/heads/")) + return; + branch = branch_get(s->branch + 11); + if (!format_tracking_info(branch, &sb)) + return; + + for (cp = sb.buf; (ep = strchr(cp, '\n')) != NULL; cp = ep + 1) + color_fprintf_ln(s->fp, color(WT_STATUS_HEADER), + "# %.*s", (int)(ep - cp), cp); + color_fprintf_ln(s->fp, color(WT_STATUS_HEADER), "#"); +} + void wt_status_print(struct wt_status *s) { unsigned char sha1[20]; @@ -333,6 +353,8 @@ void wt_status_print(struct wt_status *s) } color_fprintf(s->fp, color(WT_STATUS_HEADER), "# "); color_fprintf_ln(s->fp, branch_color, "%s%s", on_what, branch_name); + if (!s->is_initial) + wt_status_print_tracking(s); } if (s->is_initial) {
-- 1.5.6.1.156.ge903b