From: Junio C Hamano <gitster@pobox•com>
To: Ingo Molnar <mingo@elte•hu>
Cc: Bruce Stephens <bruce.stephens@isode•com>, git@vger•kernel.org
Subject: [PATCH 2/3] git-status: show the remote tracking statistics
Date: Wed, 02 Jul 2008 00:52:16 -0700 [thread overview]
Message-ID: <7vod5gen9r.fsf@gitster.siamese.dyndns.org> (raw)
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
next prev parent reply other threads:[~2008-07-02 7:53 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-01 9:13 [OT] Your branch is ahead of the tracked remote branch 'origin/master' by 50 commits Ingo Molnar
2008-07-01 9:26 ` Bruce Stephens
2008-07-01 10:14 ` Ingo Molnar
2008-07-01 11:41 ` SZEDER Gábor
2008-07-01 12:47 ` Jakub Narebski
2008-07-01 19:16 ` Junio C Hamano
2008-07-02 7:50 ` [PATCH 0/3] Making remote tracking statistics available to other tools Junio C Hamano
2008-07-03 16:26 ` Olivier Marin
2008-07-03 19:07 ` Junio C Hamano
2008-07-03 19:25 ` Olivier Marin
2008-07-02 7:51 ` [PATCH 1/3] Refactor "tracking statistics" code used by "git checkout" Junio C Hamano
2008-07-02 7:52 ` Junio C Hamano [this message]
2008-07-02 7:52 ` [PATCH 3/3] git-branch -v: show the remote tracking statistics Junio C Hamano
2008-07-02 8:23 ` Johannes Sixt
2008-07-02 8:33 ` Karl Hasselström
2008-07-02 14:44 ` Brian Gernhardt
2008-07-02 8:42 ` Junio C Hamano
2008-07-02 15:44 ` Johannes Schindelin
2008-07-01 12:44 ` [OT] Your branch is ahead of the tracked remote branch 'origin/master' by 50 commits Jakub Narebski
2008-07-01 9:32 ` Junio C Hamano
2008-07-01 10:07 ` Ingo Molnar
2008-07-01 11:16 ` Miklos Vajna
2008-07-01 11:22 ` Ingo Molnar
2008-07-01 11:41 ` Miklos Vajna
2008-07-01 23:55 ` Junio C Hamano
2008-07-04 8:35 ` Pedro Melo
2008-07-01 12:46 ` Mikael Magnusson
2008-07-01 18:01 ` Björn Steinbrink
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vod5gen9r.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox$(echo .)com \
--cc=bruce.stephens@isode$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox