git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Karthik Nayak <karthik.188@gmail.com>
To: git@vger.kernel.org
Cc: christian.couder@gmail.com, Matthieu.Moy@grenoble-inp.fr,
	Karthik Nayak <karthik.188@gmail.com>
Subject: [RFC/PATCH 2/9] ref-filter: implement '--points-at' option
Date: Sun,  7 Jun 2015 01:34:05 +0530	[thread overview]
Message-ID: <1433621052-5588-2-git-send-email-karthik.188@gmail.com> (raw)
In-Reply-To: <1433621052-5588-1-git-send-email-karthik.188@gmail.com>

In 'tag -l' we have '--points-at' option which lets users
list only tags which point to a particular commit, Implement
this option in 'ref-filter.{c,h}' so that the other commands
can benefit from this.

Based-on-patch-by: Jeff King <peff@peff.net>
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>
---
 ref-filter.c | 26 ++++++++++++++++++++++++++
 ref-filter.h |  1 +
 2 files changed, 27 insertions(+)

diff --git a/ref-filter.c b/ref-filter.c
index 745d3b3..456b0fa 100644
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -841,6 +841,29 @@ static int match_name_as_path(const char **pattern, const char *refname)
 	return 0;
 }
 
+/*
+ * Given a ref (sha1, refname) see if it points to a one of the sha1s
+ * in a sha1_array.
+ */
+static int match_points_at(struct sha1_array *points_at, const unsigned char *sha1,
+			   const char *refname)
+{
+	struct object *obj;
+
+	if (!points_at || !points_at->nr)
+		return 1;
+
+	if (sha1_array_lookup(points_at, sha1) >= 0)
+		return 1;
+
+	obj = parse_object_or_die(sha1, refname);
+	if (obj->type == OBJ_TAG &&
+	    sha1_array_lookup(points_at, ((struct tag *)obj)->tagged->sha1) >= 0)
+		return 1;
+
+	return 0;
+}
+
 /* Allocate space for a new ref_array_item and copy the objectname and flag to it */
 static struct ref_array_item *new_ref_array_item(const char *refname,
 						 const unsigned char *objectname,
@@ -874,6 +897,9 @@ int ref_filter_handler(const char *refname, const struct object_id *oid, int fla
 	if (*filter->name_patterns && !match_name_as_path(filter->name_patterns, refname))
 		return 0;
 
+	if (!match_points_at(&filter->points_at, oid->hash, refname))
+		return 0;
+
 	/*
 	 * We do not open the object yet; sort may only need refname
 	 * to do its job and the resulting list may yet to be pruned
diff --git a/ref-filter.h b/ref-filter.h
index 041a39a..a8980e7 100644
--- a/ref-filter.h
+++ b/ref-filter.h
@@ -39,6 +39,7 @@ struct ref_array {
 
 struct ref_filter {
 	const char **name_patterns;
+	struct sha1_array points_at;
 };
 
 struct ref_filter_cbdata {
-- 
2.4.2

  reply	other threads:[~2015-06-06 20:04 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-06-06 20:03 [RFC/PATCH 0/9] add options to ref-filter Karthik Nayak
2015-06-06 20:04 ` [RFC/PATCH 1/9] tag: libify parse_opt_points_at() Karthik Nayak
2015-06-06 20:04   ` Karthik Nayak [this message]
2015-06-08 17:31     ` [RFC/PATCH 2/9] ref-filter: implement '--points-at' option Matthieu Moy
2015-06-08 18:50       ` Karthik Nayak
2015-06-08 18:00     ` Matthieu Moy
2015-06-08 18:54       ` Karthik Nayak
2015-06-06 20:04   ` [RFC/PATCH 3/9] for-each-ref: add " Karthik Nayak
2015-06-08 17:35     ` Matthieu Moy
2015-06-08 18:51       ` Karthik Nayak
2015-06-08 19:12     ` Junio C Hamano
2015-06-09 12:01       ` Karthik Nayak
2015-06-09 19:07         ` Junio C Hamano
2015-06-10  6:55           ` Karthik Nayak
2015-06-10  7:39           ` Matthieu Moy
2015-06-10 11:31             ` Karthik Nayak
2015-06-06 20:04   ` [RFC/PATCH 4/9] parse-options: add parse_opt_merge_filter() Karthik Nayak
2015-06-08 17:58     ` Matthieu Moy
2015-06-08 18:54       ` Karthik Nayak
2015-06-08 19:20     ` Junio C Hamano
2015-06-09 12:36       ` Karthik Nayak
2015-06-06 20:04   ` [RFC/PATCH 5/9] ref-filter: implement '--merged' and '--no-merged' options Karthik Nayak
2015-06-08 17:51     ` Matthieu Moy
2015-06-08 18:53       ` Karthik Nayak
2015-06-06 20:04   ` [RFC/PATCH 6/9] for-each-ref: add " Karthik Nayak
2015-06-08 17:53     ` Matthieu Moy
2015-06-08 18:54       ` Karthik Nayak
2015-06-06 20:04   ` [RFC/PATCH 7/9] parse-options.h: add macros for '--contains' option Karthik Nayak
2015-06-08 19:32     ` Junio C Hamano
2015-06-09 12:49       ` Karthik Nayak
2015-06-06 20:04   ` [RFC/PATCH 8/9] ref-filter: add " Karthik Nayak
2015-06-06 20:04   ` [RFC/PATCH 9/9] for-each-ref: " Karthik Nayak
2015-06-08 19:00   ` [RFC/PATCH 1/9] tag: libify parse_opt_points_at() Junio C Hamano
2015-06-09 11:50     ` Karthik Nayak
2015-06-07 13:10 ` [RFC/PATCH 0/9] add options to ref-filter Christian Couder
2015-06-08 15:00   ` Karthik Nayak
2015-06-08 19:34 ` 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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1433621052-5588-2-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 \
    /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.
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 NNTP newsgroup(s).