From mboxrd@z Thu Jan 1 00:00:00 1970 From: Karthik Nayak Subject: [PATCH v3 5/9] ref-filter: add option to match literal pattern Date: Sun, 19 Jul 2015 00:42:25 +0530 Message-ID: <1437246749-14423-6-git-send-email-Karthik.188@gmail.com> References: <1437246749-14423-1-git-send-email-Karthik.188@gmail.com> Cc: christian.couder@gmail.com, Matthieu.Moy@grenoble-inp.fr, Karthik Nayak To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Sat Jul 18 21:13:00 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 1ZGXXe-0001KS-Py for gcvg-git-2@plane.gmane.org; Sat, 18 Jul 2015 21:12:59 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752956AbbGRTMy (ORCPT ); Sat, 18 Jul 2015 15:12:54 -0400 Received: from mail-pd0-f175.google.com ([209.85.192.175]:36340 "EHLO mail-pd0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752926AbbGRTMx (ORCPT ); Sat, 18 Jul 2015 15:12:53 -0400 Received: by pdjr16 with SMTP id r16so80785254pdj.3 for ; Sat, 18 Jul 2015 12:12:52 -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=oAvHbjOcm56PoZDublbbf2UaXFnKCahNYXGsGD6gifw=; b=cu1b0Pokb4Gwx8b/5tEqP0IisDMSgPZ/mDBEAOrZzz0XX51L87ye4eTb6J1VGItcuz 11hxC3C99kziOZHamYsC5rSxxGxwt7G/W2HW66EIrbHszTc9NgbkVe7B9CW87tGltLY6 7Ygw+VgibcaoIj0vwQAZc6LD73U2UbaGcJ+vvzxekuirElCHOYk5hGShbE9gTwpKX9q6 EOyLtcRIrwMRr8/7q7CsPEa6/P2sn5UAw5zLswXC4lQgc8ke9W3oNvioHg3FoWOFjLYf sNs1Bq+5B/Gz/YWprMeFj/0/eaoMH+syGVdwpbL4SB81TAVlpeHZHNlhy5Pgj1TmptQD RjCA== X-Received: by 10.66.66.65 with SMTP id d1mr42172485pat.22.1437246772853; Sat, 18 Jul 2015 12:12:52 -0700 (PDT) Received: from ashley.localdomain ([106.51.130.23]) by smtp.gmail.com with ESMTPSA id ra10sm15104498pab.19.2015.07.18.12.12.50 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 18 Jul 2015 12:12:51 -0700 (PDT) X-Google-Original-From: Karthik Nayak X-Mailer: git-send-email 2.4.6 In-Reply-To: <1437246749-14423-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 Since 'ref-filter' only has an option to match path names add an option for plain fnmatch pattern-matching. This is to support the pattern matching options which are used in `git tag -l` and `git branch -l` where we can match patterns like `git tag -l foo*` which would match all tags which has a "foo*" pattern. Mentored-by: Christian Couder Mentored-by: Matthieu Moy Signed-off-by: Karthik Nayak --- builtin/for-each-ref.c | 1 + ref-filter.c | 27 +++++++++++++++++++++++++-- ref-filter.h | 3 ++- 3 files changed, 28 insertions(+), 3 deletions(-) diff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c index e4a4f8a..3ad6a64 100644 --- a/builtin/for-each-ref.c +++ b/builtin/for-each-ref.c @@ -68,6 +68,7 @@ int cmd_for_each_ref(int argc, const char **argv, const char *prefix) git_config(git_default_config, NULL); filter.name_patterns = argv; + filter.match_as_path = 1; filter_refs(&array, &filter, FILTER_REFS_ALL | FILTER_REFS_INCLUDE_BROKEN); ref_array_sort(sorting, &array); diff --git a/ref-filter.c b/ref-filter.c index 85c561e..7ff3ded 100644 --- a/ref-filter.c +++ b/ref-filter.c @@ -943,9 +943,23 @@ static int commit_contains(struct ref_filter *filter, struct commit *commit) /* * Return 1 if the refname matches one of the patterns, otherwise 0. + * A pattern can be a literal prefix (e.g. a refname "refs/heads/master" + * matches a pattern "refs/heads/m") or a wildcard (e.g. the same ref + * matches "refs/heads/m*", too). + */ +static int match_pattern(const char **patterns, const char *refname) +{ + for (; *patterns; patterns++) + if (!wildmatch(*patterns, refname, 0, NULL)) + return 1; + return 0; +} + +/* + * Return 1 if the refname matches one of the patterns, otherwise 0. * A pattern can be path prefix (e.g. a refname "refs/heads/master" * matches a pattern "refs/heads/") or a wildcard (e.g. the same ref - * matches "refs/heads/m*",too). + * matches "refs/heads/m*", too). */ static int match_name_as_path(const char **pattern, const char *refname) { @@ -966,6 +980,15 @@ static int match_name_as_path(const char **pattern, const char *refname) return 0; } +static int filter_pattern_match(struct ref_filter *filter, const char *refname) +{ + if (!*filter->name_patterns) + return 1; + if (filter->match_as_path) + return match_name_as_path(filter->name_patterns, refname); + return match_pattern(filter->name_patterns, refname); +} + /* * Given a ref (sha1, refname), check if the ref belongs to the array * of sha1s. If the given ref is a tag, check if the given tag points @@ -1034,7 +1057,7 @@ static int ref_filter_handler(const char *refname, const struct object_id *oid, return 0; } - if (*filter->name_patterns && !match_name_as_path(filter->name_patterns, refname)) + if (!filter_pattern_match(filter, refname)) return 0; if (filter->points_at.nr && !match_points_at(&filter->points_at, oid->hash, refname)) diff --git a/ref-filter.h b/ref-filter.h index 6f1646b..687a077 100644 --- a/ref-filter.h +++ b/ref-filter.h @@ -55,7 +55,8 @@ struct ref_filter { } merge; struct commit *merge_commit; - unsigned int with_commit_tag_algo : 1; + unsigned int with_commit_tag_algo : 1, + match_as_path : 1; unsigned int lines; }; -- 2.4.6