From mboxrd@z Thu Jan 1 00:00:00 1970 From: Karthik Nayak Subject: [PATCH v6 04/10] ref-filter: support printing N lines from tag annotation Date: Tue, 28 Jul 2015 12:03:25 +0530 Message-ID: <1438065211-3777-4-git-send-email-Karthik.188@gmail.com> References: <1438065211-3777-1-git-send-email-Karthik.188@gmail.com> Cc: christian.couder@gmail.com, Matthieu.Moy@grenoble-inp.fr, gitster@pobox.com, Karthik Nayak To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Tue Jul 28 08:33:45 2015 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 1ZJySO-0005hG-St for gcvg-git-2@plane.gmane.org; Tue, 28 Jul 2015 08:33:45 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754745AbbG1Gdj (ORCPT ); Tue, 28 Jul 2015 02:33:39 -0400 Received: from mail-pa0-f53.google.com ([209.85.220.53]:35233 "EHLO mail-pa0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754638AbbG1Gdi (ORCPT ); Tue, 28 Jul 2015 02:33:38 -0400 Received: by pabkd10 with SMTP id kd10so64696128pab.2 for ; Mon, 27 Jul 2015 23:33:38 -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=Q8+acG5YQmJISNzhWb3t67UTK+roB+z3Dn81Lk6ROaM=; b=NZblIh9rQjSsvi/kQWPB5dD51SkrIbgfJUYSfBngwJMpDYwLa9lagDvR0EOkyekaTC yUMZ4odfDbO2PiidFocDkemd9nGwMgStGWo816+h1NCDyVBdPdbgFbY+H1pukEzeeNvK tFlUsDqQcLasPeA1jR3V8/Sa0MxjOl3+wYEIKPgehDRiX3AVsD6q8sx7txudoIouRLJz Kq5gM3JM4nttfdKxio74JdP7YZdudw/A6/+d2NdvHX6I9nNUkwXPGCm2ebpf4x3qplK9 AsC1asZmscjHT5XikRMCNqFKDr/PFiQc6bg0ifYgYmsTsmZjNAeb02rZSrc/yPSJAfER TVww== X-Received: by 10.66.168.229 with SMTP id zz5mr74471912pab.41.1438065218153; Mon, 27 Jul 2015 23:33:38 -0700 (PDT) Received: from ashley.localdomain ([106.51.130.23]) by smtp.gmail.com with ESMTPSA id p9sm32976792pds.92.2015.07.27.23.33.35 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 27 Jul 2015 23:33:37 -0700 (PDT) X-Google-Original-From: Karthik Nayak X-Mailer: git-send-email 2.4.6 In-Reply-To: <1438065211-3777-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: From: Karthik Nayak In 'tag.c' we can print N lines from the annotation of the tag using the '-n' option. Copy code from 'tag.c' to 'ref-filter' and modify 'ref-filter' to support printing of N lines from the annotation of tags. Mentored-by: Christian Couder Mentored-by: Matthieu Moy Signed-off-by: Karthik Nayak --- builtin/for-each-ref.c | 2 +- builtin/tag.c | 4 ++++ ref-filter.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++- ref-filter.h | 9 +++++++-- 4 files changed, 62 insertions(+), 4 deletions(-) diff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c index 40f343b..e4a4f8a 100644 --- a/builtin/for-each-ref.c +++ b/builtin/for-each-ref.c @@ -74,7 +74,7 @@ int cmd_for_each_ref(int argc, const char **argv, const char *prefix) if (!maxcount || array.nr < maxcount) maxcount = array.nr; for (i = 0; i < maxcount; i++) - show_ref_array_item(array.items[i], format, quote_style); + show_ref_array_item(array.items[i], format, quote_style, 0); ref_array_clear(&array); return 0; } diff --git a/builtin/tag.c b/builtin/tag.c index 471d6b1..0fc7557 100644 --- a/builtin/tag.c +++ b/builtin/tag.c @@ -185,6 +185,10 @@ static enum contains_result contains(struct commit *candidate, return contains_test(candidate, want); } +/* + * Currently duplicated in ref-filter, will eventually be removed as + * we port tag.c to use ref-filter APIs. + */ static void show_tag_lines(const struct object_id *oid, int lines) { int i; diff --git a/ref-filter.c b/ref-filter.c index 515655b..9bdfef0 100644 --- a/ref-filter.c +++ b/ref-filter.c @@ -1311,7 +1311,51 @@ static void reset_formatting_state(struct ref_formatting_state *state) state->quote_style = quote_style; } -void show_ref_array_item(struct ref_array_item *info, const char *format, int quote_style) +/* + * If 'lines' is greater than 0, print that many lines from the given + * object_id 'oid'. + */ +static void show_tag_lines(const struct object_id *oid, int lines) +{ + int i; + unsigned long size; + enum object_type type; + char *buf, *sp, *eol; + size_t len; + + buf = read_sha1_file(oid->hash, &type, &size); + if (!buf) + die_errno("unable to read object %s", oid_to_hex(oid)); + if (type != OBJ_COMMIT && type != OBJ_TAG) + goto free_return; + if (!size) + die("an empty %s object %s?", + typename(type), oid_to_hex(oid)); + + /* skip header */ + sp = strstr(buf, "\n\n"); + if (!sp) + goto free_return; + + /* only take up to "lines" lines, and strip the signature from a tag */ + if (type == OBJ_TAG) + size = parse_signature(buf, size); + for (i = 0, sp += 2; i < lines && sp < buf + size; i++) { + if (i) + printf("\n "); + eol = memchr(sp, '\n', size - (sp - buf)); + len = eol ? eol - sp : size - (sp - buf); + fwrite(sp, len, 1, stdout); + if (!eol) + break; + sp = eol + 1; + } +free_return: + free(buf); +} + +void show_ref_array_item(struct ref_array_item *info, const char *format, + int quote_style, unsigned int lines) { const char *cp, *sp, *ep; struct ref_formatting_state state; @@ -1346,6 +1390,11 @@ void show_ref_array_item(struct ref_array_item *info, const char *format, int qu resetv.s = color; print_value(&resetv, &state); } + if (lines > 0) { + struct object_id oid; + hashcpy(oid.hash, info->objectname); + show_tag_lines(&oid, lines); + } putchar('\n'); } diff --git a/ref-filter.h b/ref-filter.h index 1956f67..3e05fa0 100644 --- a/ref-filter.h +++ b/ref-filter.h @@ -62,6 +62,7 @@ struct ref_filter { struct commit *merge_commit; unsigned int with_commit_tag_algo : 1; + unsigned int lines; }; struct ref_filter_cbdata { @@ -93,8 +94,12 @@ int parse_ref_filter_atom(const char *atom, const char *ep); int verify_ref_format(const char *format); /* Sort the given ref_array as per the ref_sorting provided */ void ref_array_sort(struct ref_sorting *sort, struct ref_array *array); -/* Print the ref using the given format and quote_style */ -void show_ref_array_item(struct ref_array_item *info, const char *format, int quote_style); +/* + * Print the ref using the given format and quote_style. If 'lines' > 0, + * print that many lines of the the given ref. + */ +void show_ref_array_item(struct ref_array_item *info, const char *format, + int quote_style, unsigned int lines); /* Callback function for parsing the sort option */ int parse_opt_ref_sorting(const struct option *opt, const char *arg, int unset); /* Default sort option based on refname */ -- 2.4.6