From mboxrd@z Thu Jan 1 00:00:00 1970 From: Karthik Nayak Subject: [RFC/PATCH 5/9] ref-filter: add option to match literal pattern Date: Thu, 25 Jun 2015 17:13:12 +0530 Message-ID: <1435232596-27466-5-git-send-email-karthik.188@gmail.com> References: <1435232596-27466-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 Thu Jun 25 13:44:12 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 1Z85Zj-0006Ya-K6 for gcvg-git-2@plane.gmane.org; Thu, 25 Jun 2015 13:44:11 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751340AbbFYLoI (ORCPT ); Thu, 25 Jun 2015 07:44:08 -0400 Received: from mail-pa0-f50.google.com ([209.85.220.50]:35858 "EHLO mail-pa0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751253AbbFYLoD (ORCPT ); Thu, 25 Jun 2015 07:44:03 -0400 Received: by paceq1 with SMTP id eq1so48457993pac.3 for ; Thu, 25 Jun 2015 04:44:03 -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=yYJ+STT5XiurdSpfo+fidm5yUiAqR1M9Cf1GhtddWFg=; b=uom8bw5Kp5zNL2hHCM/6AH/V+g4ozpbs7pnF8R7UiKRu6eL0VQUO1XaFObpe94VIUY oE8tmt8abLFtPTCBAU1jYuPKl3/H6JXsm1hpNis1xpgqhn6svU/53SADrtrckocI7swY dxITBBO7pTJzQX+GRnWDSLqRNXD2NHHzfezDlPQRSVm/9D9hhm3Oc4VyUwfKelYYK4Ti Wu5DtbzIpfY+zQcyrGT77VGr/FHcyXz9WjgicYCHypv2tXTNX+wH6hGfwLkiniUlLtzz nOmFP+ZLU1d3KXAnzUS4JD0P3XpNsyzlPTDSzONUpADCaRI2Qh2ao2TYYc5A4l5+Tj/N bJWw== X-Received: by 10.67.3.3 with SMTP id bs3mr90288494pad.51.1435232643180; Thu, 25 Jun 2015 04:44:03 -0700 (PDT) Received: from ashley.localdomain ([106.51.130.23]) by mx.google.com with ESMTPSA id xn2sm11575446pbc.44.2015.06.25.04.44.00 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 25 Jun 2015 04:44:02 -0700 (PDT) X-Mailer: git-send-email 2.4.4 In-Reply-To: <1435232596-27466-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: Since 'ref-filter' only has an option to match path names. Add an option for regular pattern matching. Mentored-by: Christian Couder Mentored-by: Matthieu Moy Signed-off-by: Karthik Nayak --- builtin/for-each-ref.c | 1 + ref-filter.c | 30 ++++++++++++++++++++++++------ ref-filter.h | 3 ++- 3 files changed, 27 insertions(+), 7 deletions(-) diff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c index c318e33..01d5363 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 e307fab..1f97910 100644 --- a/ref-filter.c +++ b/ref-filter.c @@ -954,6 +954,20 @@ 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). @@ -977,6 +991,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 0; + 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) see if it points to one of the sha1s * in a sha1_array. @@ -1026,17 +1049,12 @@ static int ref_filter_handler(const char *refname, const struct object_id *oid, struct ref_array_item *ref; struct commit *commit = NULL; - if (flag & REF_BAD_NAME) { - warning("ignoring ref with broken name %s", refname); - return 0; - } - if (flag & REF_ISBROKEN) { warning("ignoring broken ref %s", refname); return 0; } - if (*filter->name_patterns && !match_name_as_path(filter->name_patterns, refname)) + if (!filter_pattern_match(filter, refname)) return 0; if (!match_points_at(&filter->points_at, oid->hash, refname)) diff --git a/ref-filter.h b/ref-filter.h index 6b6fb96..a4809c8 100644 --- a/ref-filter.h +++ b/ref-filter.h @@ -54,7 +54,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.4