From mboxrd@z Thu Jan 1 00:00:00 1970 From: Karthik Nayak Subject: [PATCH v3 08/16] ref-filter: add support for %(upstream:track,nobracket) Date: Wed, 30 Mar 2016 15:09:52 +0530 Message-ID: <1459330800-12525-9-git-send-email-Karthik.188@gmail.com> References: <1459330800-12525-1-git-send-email-Karthik.188@gmail.com> Cc: gitster@pobox.com, jacob.keller@gmail.com, Karthik Nayak , Karthik Nayak To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Wed Mar 30 11:40:49 2016 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1alCcI-0001nn-Lk for gcvg-git-2@plane.gmane.org; Wed, 30 Mar 2016 11:40:47 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752248AbcC3Jke (ORCPT ); Wed, 30 Mar 2016 05:40:34 -0400 Received: from mail-pf0-f171.google.com ([209.85.192.171]:32938 "EHLO mail-pf0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752158AbcC3Jka (ORCPT ); Wed, 30 Mar 2016 05:40:30 -0400 Received: by mail-pf0-f171.google.com with SMTP id 4so38029270pfd.0 for ; Wed, 30 Mar 2016 02:40:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=zlfZaVcGUzDgygpPangqo1HPsQKblhgw5vVeT1hq7kU=; b=KauAyiL3dz3qGxUCzOi7JoK9ktnCLN8KLeY5bbRC6X3ZseBqKeJ1NoAxnuweLS9gXF SHV2pDeGF6NK9jxD1lgXheqtioa8+Bq63N/pQubSBe4QTDTa3y4YzDfio6qbmMDXQS3B a0Ph5Oj9HLzVlNQdu1T9DzlApbwGpqlpNdD9gbeDdSFyQr40rcl5zEC4PSojCrSn98fd nE+/5puDMYepWK5X0hQdZYoy/12QLB7uipdvRQ6h5Fyn2YypbHIBip+j/7CdSySHKsxc qZaU0JwBb2WDtmh8gaEDca2D2t/ZSz26NvdU7bUvOjKXq2juVA+lhlFMaFv7iWS9ygx8 mYUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=zlfZaVcGUzDgygpPangqo1HPsQKblhgw5vVeT1hq7kU=; b=CAq65tER0sBnp8rOuHDZPPG7FonTFtDznKxw/hMwyLUmdsjK/b41jW9VJ/j3dSwWGQ BjbL0/QqronIaCfOzT1lI+QbrYuQfJbjMsnQBOHXqHVm3EnWlGMsvuS9m0hzSiuuFo24 9Cke96FCVQFWLuVOLJWBxLrQSqmcbwNrW904+ud2jBqE824AWNAf2KYYYuT3FR1YuZGD 6ctSoznWmZMoTsGwdN5CrIlBzOEmbO3B7trOuF2FmHHHEah0ReYQWZfySOL8S08SHLP/ IH2QP2gkLqPbZzYtj2QrMxGuCzievP1P2DRr5lJ/VX1n5YeaERIZL+yOKhzqnZjmdxtV OwlQ== X-Gm-Message-State: AD7BkJK7KAZDLZA+Esmf5nszH7XfwdpzbIjFTz0nsTB7qbsfTSagCSUwT7r/gupN/wQnVg== X-Received: by 10.98.72.149 with SMTP id q21mr11487024pfi.148.1459330829105; Wed, 30 Mar 2016 02:40:29 -0700 (PDT) Received: from localhost.localdomain ([106.51.243.45]) by smtp.gmail.com with ESMTPSA id r65sm4402606pfa.27.2016.03.30.02.40.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 30 Mar 2016 02:40:28 -0700 (PDT) X-Google-Original-From: Karthik Nayak X-Mailer: git-send-email 2.7.4 In-Reply-To: <1459330800-12525-1-git-send-email-Karthik.188@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Add support for %(upstream:track,nobracket) which will print the tracking information without the brackets (i.e. "ahead N, behind M"). This is needed when we port branch.c to use ref-filter's printing APIs. Add test and documentation for the same. Mentored-by: Christian Couder Mentored-by: Matthieu Moy Signed-off-by: Karthik Nayak --- Documentation/git-for-each-ref.txt | 8 +++-- ref-filter.c | 67 +++++++++++++++++++++++++------------- t/t6300-for-each-ref.sh | 2 ++ 3 files changed, 51 insertions(+), 26 deletions(-) diff --git a/Documentation/git-for-each-ref.txt b/Documentation/git-for-each-ref.txt index 85ac2a8..be763c4 100644 --- a/Documentation/git-for-each-ref.txt +++ b/Documentation/git-for-each-ref.txt @@ -118,9 +118,11 @@ upstream:: `refname` above. Additionally respects `:track` to show "[ahead N, behind M]" and `:trackshort` to show the terse version: ">" (ahead), "<" (behind), "<>" (ahead and behind), - or "=" (in sync). Has no effect if the ref does not have - tracking information associated with it. `:track` also prints - "[gone]" whenever unknown upstream ref is encountered. + or "=" (in sync). `:track` also prints "[gone]" whenever + unknown upstream ref is encountered. Append `:track,nobracket` + to show tracking information without brackets (i.e "ahead N, + behind M"). Has no effect if the ref does not have tracking + information associated with it. push:: The name of a local ref which represents the `@{push}` location diff --git a/ref-filter.c b/ref-filter.c index 4d7e0c0..8c97cdb 100644 --- a/ref-filter.c +++ b/ref-filter.c @@ -46,8 +46,10 @@ static struct used_atom { union { char color[COLOR_MAXLEN]; struct align align; - enum { RR_NORMAL, RR_SHORTEN, RR_TRACK, RR_TRACKSHORT } - remote_ref; + struct { + enum { RR_NORMAL, RR_SHORTEN, RR_TRACK, RR_TRACKSHORT } option; + unsigned int nobracket: 1; + } remote_ref; struct { enum { C_BARE, C_BODY, C_BODY_DEP, C_LINES, C_SIG, C_SUB } option; unsigned int nlines; @@ -75,16 +77,33 @@ static void color_atom_parser(struct used_atom *atom, const char *color_value) static void remote_ref_atom_parser(struct used_atom *atom, const char *arg) { - if (!arg) - atom->u.remote_ref = RR_NORMAL; - else if (!strcmp(arg, "short")) - atom->u.remote_ref = RR_SHORTEN; - else if (!strcmp(arg, "track")) - atom->u.remote_ref = RR_TRACK; - else if (!strcmp(arg, "trackshort")) - atom->u.remote_ref = RR_TRACKSHORT; - else - die(_("unrecognized format: %%(%s)"), atom->name); + struct string_list params = STRING_LIST_INIT_DUP; + int i; + + if (!arg) { + atom->u.remote_ref.option = RR_NORMAL; + return; + } + + atom->u.remote_ref.nobracket = 0; + string_list_split(¶ms, arg, ',', -1); + + for (i = 0; i < params.nr; i++) { + const char *s = params.items[i].string; + + if (!strcmp(s, "short")) + atom->u.remote_ref.option = RR_SHORTEN; + else if (!strcmp(s, "track")) + atom->u.remote_ref.option = RR_TRACK; + else if (!strcmp(s, "trackshort")) + atom->u.remote_ref.option = RR_TRACKSHORT; + else if (!strcmp(s, "nobracket")) + atom->u.remote_ref.nobracket = 1; + else + die(_("unrecognized format: %%(%s)"), atom->name); + } + + string_list_clear(¶ms, 0); } static void body_atom_parser(struct used_atom *atom, const char *arg) @@ -1045,25 +1064,27 @@ static void fill_remote_ref_details(struct used_atom *atom, const char *refname, struct branch *branch, const char **s) { int num_ours, num_theirs; - if (atom->u.remote_ref == RR_SHORTEN) + if (atom->u.remote_ref.option == RR_SHORTEN) *s = shorten_unambiguous_ref(refname, warn_ambiguous_refs); - else if (atom->u.remote_ref == RR_TRACK) { + else if (atom->u.remote_ref.option == RR_TRACK) { if (stat_tracking_info(branch, &num_ours, &num_theirs, NULL)) { - *s = "[gone]"; - return; - } - - if (!num_ours && !num_theirs) + *s = xstrdup("gone"); + } else if (!num_ours && !num_theirs) *s = ""; else if (!num_ours) - *s = xstrfmt("[behind %d]", num_theirs); + *s = xstrfmt("behind %d", num_theirs); else if (!num_theirs) - *s = xstrfmt("[ahead %d]", num_ours); + *s = xstrfmt("ahead %d", num_ours); else - *s = xstrfmt("[ahead %d, behind %d]", + *s = xstrfmt("ahead %d, behind %d", num_ours, num_theirs); - } else if (atom->u.remote_ref == RR_TRACKSHORT) { + if (!atom->u.remote_ref.nobracket && *s[0]) { + const char *to_free = *s; + *s = xstrfmt("[%s]", *s); + free((void *)to_free); + } + } else if (atom->u.remote_ref.option == RR_TRACKSHORT) { if (stat_tracking_info(branch, &num_ours, &num_theirs, NULL)) return; diff --git a/t/t6300-for-each-ref.sh b/t/t6300-for-each-ref.sh index a92b36f..2c5f177 100755 --- a/t/t6300-for-each-ref.sh +++ b/t/t6300-for-each-ref.sh @@ -372,6 +372,8 @@ test_expect_success 'setup for upstream:track[short]' ' test_atom head upstream:track '[ahead 1]' test_atom head upstream:trackshort '>' +test_atom head upstream:track,nobracket 'ahead 1' +test_atom head upstream:nobracket,track 'ahead 1' test_atom head push:track '[ahead 1]' test_atom head push:trackshort '>' -- 2.7.4