From: Karthik Nayak <karthik.188@gmail.com>
To: git@vger.kernel.org
Cc: christian.couder@gmail.com, Matthieu.Moy@grenoble-inp.fr,
gitster@pobox.com, Karthik Nayak <karthik.188@gmail.com>
Subject: [RFC/PATCH 3/9] ref-filter: support printing N lines from tag annotation
Date: Thu, 25 Jun 2015 17:13:10 +0530 [thread overview]
Message-ID: <1435232596-27466-3-git-send-email-karthik.188@gmail.com> (raw)
In-Reply-To: <1435232596-27466-1-git-send-email-karthik.188@gmail.com>
In 'tag.c' we can print N lines from the annotation of the tag
using the '-n<num>' 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 <christian.couder@gmail.com>
Mentored-by: Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Signed-off-by: Karthik Nayak <karthik.188@gmail.com>
---
builtin/for-each-ref.c | 2 +-
builtin/tag.c | 4 ++++
ref-filter.c | 48 +++++++++++++++++++++++++++++++++++++++++++++++-
ref-filter.h | 3 ++-
4 files changed, 54 insertions(+), 3 deletions(-)
diff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c
index 5868c48..c318e33 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 767162e..9f300e0 100644
--- a/builtin/tag.c
+++ b/builtin/tag.c
@@ -180,6 +180,10 @@ static enum contains_result contains(struct commit *candidate,
return contains_test(candidate, want);
}
+/*
+ * Currently dupplicated 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 97432d1..57a5cfb 100644
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -1262,7 +1262,48 @@ static void emit(const char *cp, const char *ep)
}
}
-void show_ref_array_item(struct ref_array_item *info, const char *format, int quote_style)
+/* Print 'lines' no of lines of a given 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;
@@ -1288,6 +1329,11 @@ void show_ref_array_item(struct ref_array_item *info, const char *format, int qu
resetv.s = color;
print_value(&resetv, quote_style);
}
+ 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 dd28d17..6b6fb96 100644
--- a/ref-filter.h
+++ b/ref-filter.h
@@ -55,6 +55,7 @@ struct ref_filter {
struct commit *merge_commit;
unsigned int with_commit_tag_algo: 1;
+ unsigned int lines;
};
struct ref_filter_cbdata {
@@ -87,7 +88,7 @@ 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);
+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.4
next prev parent reply other threads:[~2015-06-25 11:43 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-25 9:55 [RFC/PATCH 0/9] port tag.c to use ref-filter library Karthik Nayak
2015-06-25 11:43 ` [RFC/PATCH 1/9] ref-filter: add %(refname:lalignX) option Karthik Nayak
2015-06-25 11:43 ` [RFC/PATCH 2/9] ref-filter: add option to filter only tags Karthik Nayak
2015-06-25 11:43 ` Karthik Nayak [this message]
2015-06-25 11:43 ` [RFC/PATCH 4/9] ref-filter: add support to sort by version Karthik Nayak
2015-07-12 9:09 ` Duy Nguyen
2015-07-12 13:37 ` Karthik Nayak
2015-06-25 11:43 ` [RFC/PATCH 5/9] ref-filter: add option to match literal pattern Karthik Nayak
2015-06-26 21:15 ` Karthik Nayak
2015-06-29 18:20 ` Junio C Hamano
2015-06-30 13:36 ` Karthik Nayak
2015-06-25 11:43 ` [RFC/PATCH 6/9] tag.c: use 'ref-filter' data structures Karthik Nayak
2015-06-25 11:43 ` [RFC/PATCH 7/9] tag.c: use 'ref-filter' APIs Karthik Nayak
2015-06-25 11:43 ` [RFC/PATCH 8/9] tag.c: implement '--format' option Karthik Nayak
2015-06-25 13:03 ` Karthik Nayak
2015-06-25 11:43 ` [RFC/PATCH 9/9] tag.c: implement '--merged' and '--no-merged' options Karthik Nayak
2015-06-27 20:02 ` [RFC/PATCH 1/9] ref-filter: add %(refname:lalignX) option Christian Couder
2015-06-28 4:53 ` Christian Couder
2015-06-28 6:59 ` Karthik Nayak
2015-06-27 23:43 ` Duy Nguyen
2015-06-28 7:39 ` Junio C Hamano
2015-06-28 9:13 ` Karthik Nayak
2015-06-29 4:44 ` Junio C Hamano
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1435232596-27466-3-git-send-email-karthik.188@gmail.com \
--to=karthik.188@gmail.com \
--cc=Matthieu.Moy@grenoble-inp.fr \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).