From mboxrd@z Thu Jan 1 00:00:00 1970 From: Karthik Nayak Subject: [PATCH v9 07/11] ref-filter: add option to match literal pattern Date: Tue, 4 Aug 2015 18:13:04 +0530 Message-ID: <1438692188-14367-7-git-send-email-Karthik.188@gmail.com> References: <1438692188-14367-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 Aug 04 14:43:50 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 1ZMbZN-0004Qm-KF for gcvg-git-2@plane.gmane.org; Tue, 04 Aug 2015 14:43:50 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756248AbbHDMnd (ORCPT ); Tue, 4 Aug 2015 08:43:33 -0400 Received: from mail-pd0-f169.google.com ([209.85.192.169]:35151 "EHLO mail-pd0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756214AbbHDMn3 (ORCPT ); Tue, 4 Aug 2015 08:43:29 -0400 Received: by pdrg1 with SMTP id g1so4135960pdr.2 for ; Tue, 04 Aug 2015 05:43: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=QOoa0zMRVsXIrX4aQ6FquN1i/2OIaf1VHWqbvyKsrZM=; b=f1lQXAoaikBQy05RnHMqI7i/lBJe3KWiXm9csTnjzEkQWmWgnxoQbN5yr+x6cAT/Ul CUdeY8oAlWuRmfSoW8/tRBZgsRAi9bm61pnNQLDMGfgfMw2xt2wpgOBGH/ZaErTljpVd B5dkv40G7mBzNKg5IfWFmeyTl65PzzACjemtB7KTgR5z0h4F1mZDGXR0r27UUwdjgDwD pUwWfOe9nVCMpsztObB0xVOdEcdM/x5b9SuMJGipj2byHgK/x4D/EX9KX1YAFzsLMg1J dC0MA7c6a3W0YHfJNIcBKp1gySXYnkqZy53m3anizDAI9IWl18s8R08ZcsFJLUx7CiMp 0AYg== X-Received: by 10.70.118.199 with SMTP id ko7mr7025358pdb.48.1438692209200; Tue, 04 Aug 2015 05:43:29 -0700 (PDT) Received: from ashley.localdomain ([106.51.130.23]) by smtp.gmail.com with ESMTPSA id m2sm1359951pdr.64.2015.08.04.05.43.26 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 04 Aug 2015 05:43:28 -0700 (PDT) X-Google-Original-From: Karthik Nayak X-Mailer: git-send-email 2.5.0 In-Reply-To: <1438692188-14367-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 | 39 ++++++++++++++++++++++++++++++++++++--- ref-filter.h | 3 ++- 3 files changed, 39 insertions(+), 4 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 d244a81..de84dd4 100644 --- a/ref-filter.c +++ b/ref-filter.c @@ -956,9 +956,32 @@ 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/mas") or a wildcard (e.g. the same ref + * matches "refs/heads/mas*", too). + */ +static int match_pattern(const char **patterns, const char *refname) +{ + /* + * When no '--format' option is given we need to skip the prefix + * for matching refs of tags and branches. + */ + (void)(skip_prefix(refname, "refs/tags/", &refname) || + skip_prefix(refname, "refs/heads/", &refname) || + skip_prefix(refname, "refs/remotes/", &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 a pattern "refs/heads/" but not "refs/heads/m") or a + * wildcard (e.g. the same ref matches "refs/heads/m*", too). */ static int match_name_as_path(const char **pattern, const char *refname) { @@ -979,6 +1002,16 @@ static int match_name_as_path(const char **pattern, const char *refname) return 0; } +/* Return 1 if the refname matches one of the patterns, otherwise 0. */ +static int filter_pattern_match(struct ref_filter *filter, const char *refname) +{ + if (!*filter->name_patterns) + return 1; /* No pattern always matches */ + 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 @@ -1047,7 +1080,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 449b0d9..5be3e35 100644 --- a/ref-filter.h +++ b/ref-filter.h @@ -74,7 +74,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.5.0