From patchwork Thu Nov 17 20:28:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 44571 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id C211D27BBED; Thu, 17 Nov 2022 20:29:48 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1C44527BBE9 for ; Thu, 17 Nov 2022 20:29:48 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ovlVQ-0006yu-JW; Thu, 17 Nov 2022 15:29:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ovlVP-0006xp-4K for guix-patches@gnu.org; Thu, 17 Nov 2022 15:29:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ovlVO-0007OQ-RY for guix-patches@gnu.org; Thu, 17 Nov 2022 15:29:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ovlVO-0003Tb-N5 for guix-patches@gnu.org; Thu, 17 Nov 2022 15:29:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#58660] [PATCH v2 1/3] etc: teams: Add 'show' subcommand. References: <20221020132140.1546684-1-zimon.toutoune@gmail.com> In-Reply-To: <20221020132140.1546684-1-zimon.toutoune@gmail.com> Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 17 Nov 2022 20:29:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58660 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 58660@debbugs.gnu.org Cc: othacehe@gnu.org, zimoun Received: via spool by 58660-submit@debbugs.gnu.org id=B58660.166871692613318 (code B ref 58660); Thu, 17 Nov 2022 20:29:02 +0000 Received: (at 58660) by debbugs.gnu.org; 17 Nov 2022 20:28:46 +0000 Received: from localhost ([127.0.0.1]:34512 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ovlV8-0003Sd-C0 for submit@debbugs.gnu.org; Thu, 17 Nov 2022 15:28:46 -0500 Received: from mail-wr1-f45.google.com ([209.85.221.45]:38504) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ovlUy-0003Rp-0P for 58660@debbugs.gnu.org; Thu, 17 Nov 2022 15:28:39 -0500 Received: by mail-wr1-f45.google.com with SMTP id a14so5789826wru.5 for <58660@debbugs.gnu.org>; Thu, 17 Nov 2022 12:28:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=1TBGtpEon9i47Yc+e1ZYKnqP6pBoVIwId79PKdM859A=; b=Mbj+1wprKrRFgwwe2Cki6gTRi6PK+qIWdWQ5ECl8T6iWBt3nLvdN1mSNMqMgoAbpUr +NUGSzDiK6rfLTh0Zz0Wt0FSb2XU749avqnvlCCph3y1eLK48lHc6atFvAlX8SEQV2Ul EMBZjtnzISci52rasMh4ZBbt7c9NIgbIGYBrNMxjD2zKGtNFKp0GORRNVVPpir90gurH NSxWHyCIbt+OgXUn/O9y3TXV+mJPL8urc5CjYRSlHCxzzhs5EdCwJIXQUGwTusSPxGQ/ CMzIbCJY+0+cMugR8XpeltWeiVKHopj4Nus4lFEKxbfyXa01SD+BpvkrL+InUrVjoG4J L56w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=1TBGtpEon9i47Yc+e1ZYKnqP6pBoVIwId79PKdM859A=; b=UEPRoxOOgaQEwS6m7yMQbvJiSBYCY3a/VAct5jb4G/HMFes8WezpckwEvodOQ/8G/E dh1qcNJUADbYr3podh4uC4q/lkkExOI/MzpetcwIQLW7ttlolFB+b1j3bjVDzgzRSo6w npQPV2lhlkl0ZIwafr/aqFXPxUsZbxkotQ2S8WNSreEpXSXpLmI5Bpnti1Y+OISa7I2C g8hes5l3OFvwS3YpqRr0WCF6PtrJtXbyXPB4N5lfZdHjJaOh++ZAvkssX7u4kL1ttp0W qjLF2FxMCZHnnAQgOjGFBuFbJGuS6sS4NEhtqfV6oqmpNXArFbHItnbw8CYf5yFvV8EG LY/A== X-Gm-Message-State: ANoB5plnV6kVN48Cyp4rzEjLQPI5YI+fZWViMLcCvng/P6Xl52tzawjU b+2KrdL0nn2Ltwi8N19ngGvLWZnMDg4= X-Google-Smtp-Source: AA0mqf4QUkpdx4sdL6chZHUqYVvRhOlSzhF+4rwlhNX6ZjWTkeqB/Axr7iMh71LkSdL+xzq2VqyTug== X-Received: by 2002:a5d:4c4a:0:b0:236:6101:7b7d with SMTP id n10-20020a5d4c4a000000b0023661017b7dmr2453282wrt.484.1668716908964; Thu, 17 Nov 2022 12:28:28 -0800 (PST) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id p6-20020a1c5446000000b003b47e75b401sm6539516wmi.37.2022.11.17.12.28.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Nov 2022 12:28:28 -0800 (PST) From: zimoun Date: Thu, 17 Nov 2022 21:28:18 +0100 Message-Id: <20221117202820.2054593-1-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * etc/teams.scm.in: Add 'show' subcommand. --- etc/teams.scm.in | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/etc/teams.scm.in b/etc/teams.scm.in index c458b14e3b..e4e0dc209d 100644 --- a/etc/teams.scm.in +++ b/etc/teams.scm.in @@ -5,6 +5,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2022 Ricardo Wurmus ;;; Copyright © 2022 Mathieu Othacehe +;;; Copyright © 2022 Simon Tournier ;;; ;;; This file is part of GNU Guix. ;;; @@ -538,7 +539,7 @@ (define port* (or port (current-output-port))) (team-members team) (lambda (m1 m2) (stringlist (lambda (key value) value) %teams) - (lambda (team1 team2) - (stringstring (team-id team1)) - (symbol->string (team-id team2))))))) + (if team-names + (map find-team team-names) + (sort + (hash-map->list (lambda (key value) value) %teams) + (lambda (team1 team2) + (stringstring (team-id team1)) + (symbol->string (team-id team2)))))))) (define (diff-revisions rev-start rev-end) @@ -611,6 +614,8 @@ (define (main . args) (lambda (team-name) (list-members (find-team team-name))) team-names)) + (("show" . team-names) + (list-teams team-names)) (anything (format (current-error-port) "Usage: etc/teams.scm [] @@ -619,6 +624,7 @@ (define (main . args) cc get git send-email flags for cc-ing cc-members cc teams related to files changed between revisions list-teams list teams and their members - list-members list members belonging to ~%")))) + list-members list members belonging to + show display properties~%")))) (apply main (cdr (command-line))) From patchwork Thu Nov 17 20:28:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 44569 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id F286A27BBEC; Thu, 17 Nov 2022 20:29:11 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 551A727BBE9 for ; Thu, 17 Nov 2022 20:29:08 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ovlVQ-0006yI-3L; Thu, 17 Nov 2022 15:29:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ovlVO-0006xM-EK for guix-patches@gnu.org; Thu, 17 Nov 2022 15:29:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ovlVO-0007O9-5k for guix-patches@gnu.org; Thu, 17 Nov 2022 15:29:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ovlVN-0003TM-SO for guix-patches@gnu.org; Thu, 17 Nov 2022 15:29:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#58660] [PATCH v2 2/3] etc: teams: Sort and itemize 'scope' field. Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 17 Nov 2022 20:29:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58660 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 58660@debbugs.gnu.org Cc: othacehe@gnu.org, zimoun Received: via spool by 58660-submit@debbugs.gnu.org id=B58660.166871692013290 (code B ref 58660); Thu, 17 Nov 2022 20:29:01 +0000 Received: (at 58660) by debbugs.gnu.org; 17 Nov 2022 20:28:40 +0000 Received: from localhost ([127.0.0.1]:34507 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ovlV1-0003SI-IU for submit@debbugs.gnu.org; Thu, 17 Nov 2022 15:28:39 -0500 Received: from mail-wr1-f52.google.com ([209.85.221.52]:45962) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ovlUy-0003Ro-0I for 58660@debbugs.gnu.org; Thu, 17 Nov 2022 15:28:37 -0500 Received: by mail-wr1-f52.google.com with SMTP id y16so5720503wrt.12 for <58660@debbugs.gnu.org>; Thu, 17 Nov 2022 12:28:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=3oqvUIfpC2exuC52wfPnoj1ILyx+qkaxpugPTVTd6lU=; b=SAYbl9a7L95zxvAcxhsJ4WGRfAZNJsZ3Fh9+QfWDQhkqvUy02jkVzxOE+ARn/P+qGC 9Qy9hm24OHxzOqo+atXg+Vq89nUIxY9Fmyx30o+/H/S6RQ/zKh71p3tH1hovCrYZ7PI+ olM+Pcvw9kB6TL5gMOlEqp254ow1cXIunC2zVDUksQ090tviIu0J1P5mJ4kPZ3S30vLe 9N10bBKB0rukRn5SeYQKRqg98DupG8EWA69EYItGdjSYF2jbR4XMMhw63ufIKfagCqU3 xA0vJabuksFwESHgSIj8GEalqYuHFssZ3rCjU1DkHqxSdPpRyPl4+BsDVNR6m+vmxNdc Q7kQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3oqvUIfpC2exuC52wfPnoj1ILyx+qkaxpugPTVTd6lU=; b=FJIn03pJG07eBs9Phu8WE9p93mlLQXRnl7DKVnU9nT78DEdhJPnU3RxZT+eR11vgWd F2R9rsoJWqVJ+vydIbG2ntWVkziIQWe/jTgyGy641huI4m9sN0jkf/FNm+Y+sIW2YAFg 2x1fzpVl6UfWCg7Eiaic6MGXrLAlF02xqfpels7wKkiADKc6JQ0Jbv2i6IB+tOTPu0O8 PaVnY+qu/orQZ9VFzYHEvIa4KrXnlBiixcAnvkt+dEJtDuYCc1bZ+nL3zVN1EMKsuc3b wxEE1RRnLbRrX3sk9uSAY7Uwpao+apS85DpXgDe/irkF8zCueoU/bU8Rs5rb5c4m7eN9 h5sQ== X-Gm-Message-State: ANoB5plIp7uIQ3RUaYlDWgMCAXsoSHmmU34gPVrgQApajy/M+LM7vOIV nbft9WbLXMvYPF/ElrgfyA3lob1FFvA= X-Google-Smtp-Source: AA0mqf7Ui1ITtO63apIM/+zaJEOsSanOw3ByaeWSPEUuVGFi2pXduinkbjmdM5HNCVwHwk2+l0eMiw== X-Received: by 2002:adf:ce0b:0:b0:235:a4a5:8e91 with SMTP id p11-20020adfce0b000000b00235a4a58e91mr2578728wrn.404.1668716909851; Thu, 17 Nov 2022 12:28:29 -0800 (PST) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id p6-20020a1c5446000000b003b47e75b401sm6539516wmi.37.2022.11.17.12.28.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Nov 2022 12:28:29 -0800 (PST) From: zimoun Date: Thu, 17 Nov 2022 21:28:19 +0100 Message-Id: <20221117202820.2054593-2-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221117202820.2054593-1-zimon.toutoune@gmail.com> References: <20221117202820.2054593-1-zimon.toutoune@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * etc/teams.scm.in (list-teams): Sort and itemize the 'scope' field. --- etc/teams.scm.in | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/etc/teams.scm.in b/etc/teams.scm.in index e4e0dc209d..3f90e0e6f2 100644 --- a/etc/teams.scm.in +++ b/etc/teams.scm.in @@ -562,7 +562,14 @@ (define width* (%text-width)) "") (match (team-scope team) (() "") - (scope (format #f "scope: ~{~s ~}~%" scope)))) + (scope-files + (fold + (lambda (str fmt) + (string-append fmt str)) + (format #f "scope:~%") + (sort + (map (lambda (scope) (format #f "+ ~a~%" scope)) scope-files) + string<=?))))) (list-members team port* "+ ") (newline)) (if team-names From patchwork Thu Nov 17 20:28:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 44570 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id EA9C727BBEC; Thu, 17 Nov 2022 20:29:25 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 74B3D27BBE9 for ; Thu, 17 Nov 2022 20:29:23 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ovlVQ-0006yg-CB; Thu, 17 Nov 2022 15:29:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ovlVO-0006xX-Mv for guix-patches@gnu.org; Thu, 17 Nov 2022 15:29:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ovlVO-0007OE-DR for guix-patches@gnu.org; Thu, 17 Nov 2022 15:29:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ovlVO-0003TT-9O for guix-patches@gnu.org; Thu, 17 Nov 2022 15:29:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#58660] [PATCH v2 3/3] etc: teams: Improve display of regular expression in 'scope' field. Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 17 Nov 2022 20:29:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58660 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 58660@debbugs.gnu.org Cc: othacehe@gnu.org, zimoun Received: via spool by 58660-submit@debbugs.gnu.org id=B58660.166871692613310 (code B ref 58660); Thu, 17 Nov 2022 20:29:02 +0000 Received: (at 58660) by debbugs.gnu.org; 17 Nov 2022 20:28:46 +0000 Received: from localhost ([127.0.0.1]:34510 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ovlV3-0003SW-Qe for submit@debbugs.gnu.org; Thu, 17 Nov 2022 15:28:46 -0500 Received: from mail-wr1-f46.google.com ([209.85.221.46]:47000) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ovlUy-0003Rq-92 for 58660@debbugs.gnu.org; Thu, 17 Nov 2022 15:28:38 -0500 Received: by mail-wr1-f46.google.com with SMTP id d9so5728878wrm.13 for <58660@debbugs.gnu.org>; Thu, 17 Nov 2022 12:28:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=SBu6/VncbabV8y7Zd9kk9WioD6SVms8n859TA92vlFE=; b=ETlQFvKpx4/Fx15LoR5Kl1xenmJuoAEw08LE4hcc8Dkbth/Aq5c11ePeNtEZFFn4sp M6UgH9ofKg2Ydxi0qosRL2GzmcTyu/bmD9Y20bw1GzqOGJwNhLnAZzAnhLMBIMir8oxU BjFfGLBtG4bttI7QHQhFUeSZ5sHt0/tB+6qMHHYSgOq2rWA5bpoMMy/hcQWfir/FV8Oe QRIt7ePE0Yqrw3AfR3gqKb6PRhdrzK6PH+jtnR1rR9RgDwT/B50qjz3AZsYv0fNoDy8O O5DMg/kyswYG8TQW6rnuiBjzKOs2vAgScaj4PLUA3mrHNKPZGtlxfbe7745cvJ8WLJvZ 3FVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=SBu6/VncbabV8y7Zd9kk9WioD6SVms8n859TA92vlFE=; b=0GIE+8r5k0Mt8xyDt6OJxD+A1CkZ8dX7FUII3MvrdijeXmA9URTsfGG6wioJD8r9wP VDC6Sz7rtuymvLtJSp8qYA6X8UiBafNUh+CG5YFSLm4f7W2Hl0ebojSO+LWdCMj7sZY/ y3xMvYp5Eb5/ix9T4soRmLcKoNNtFXqGtMsc2zV06gs4tSWz7TfjpDdUsvJxT92XGPnH sLGGt2OsBpJgFA7OTLJw93yVxqTTyjAMJBppi5edL8GYb3151ne86Cn7KZK2IRJIizJU vvVuxYy0HVYcJ8aWSkbaonNImwB8GPDTH3bRVwk5wdpad96uzO7Pose6fI4xKmBk/Vwi 09Nw== X-Gm-Message-State: ANoB5plv1Nq39/3P7Izt/Euh1gQCB77X779AdBkohgfY73lMaAZ1f33U dK5GohL6DLZT6JTteUHqHkYLEqyBqRA= X-Google-Smtp-Source: AA0mqf49QoJ9Ie/7cXTXuArclTDNgBIgRDIPJ8aY+n60fh1o6loWq50274XOa3QWcbi26uRKv7hSCw== X-Received: by 2002:adf:b606:0:b0:22e:2efe:3176 with SMTP id f6-20020adfb606000000b0022e2efe3176mr2469122wre.241.1668716910586; Thu, 17 Nov 2022 12:28:30 -0800 (PST) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id p6-20020a1c5446000000b003b47e75b401sm6539516wmi.37.2022.11.17.12.28.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Nov 2022 12:28:30 -0800 (PST) From: zimoun Date: Thu, 17 Nov 2022 21:28:20 +0100 Message-Id: <20221117202820.2054593-3-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221117202820.2054593-1-zimon.toutoune@gmail.com> References: <20221117202820.2054593-1-zimon.toutoune@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * etc/teams.scm.in (): New record type. (make-regexp*, regexp-exec*): New procedures. (python, haskell, julia, java, emacs, rust, core, translations, installer, home): Use it. (find-team-by-scope): Use it. (list-teams): Use it. --- etc/teams.scm.in | 59 +++++++++++++++++++++++++++++++++--------------- 1 file changed, 41 insertions(+), 18 deletions(-) diff --git a/etc/teams.scm.in b/etc/teams.scm.in index 3f90e0e6f2..3bdf91597f 100644 --- a/etc/teams.scm.in +++ b/etc/teams.scm.in @@ -38,6 +38,25 @@ (guix ui) (git)) +;;; Work around regexp implementation. +;;; This record allows to track the regexp pattern and then display it. +(define-record-type + (regexp* pat flag) + regexp*? + (pat regexp-pattern*) + (flag regexp-flag*)) + +(define* (make-regexp* pat #:optional flag) + (regexp* pat flag)) + +(define (regexp-exec* rx* str) + (let ((rx (make-regexp + (regexp-pattern* rx*) + (or (regexp-flag* rx*) + regexp/extended)))) + (regexp-exec rx str))) + + (define-record-type (make-team id name description members scope) team? @@ -98,7 +117,7 @@ (define-team python (list "gnu/packages/django.scm" "gnu/packages/jupyter.scm" ;; Match haskell.scm and haskell-*.scm. - (make-regexp "^gnu/packages/python(-.+|)\\.scm$") + (make-regexp* "^gnu/packages/python(-.+|)\\.scm$") "gnu/packages/sphinx.scm" "gnu/packages/tryton.scm" "guix/build/pyproject-build-system.scm" @@ -118,7 +137,7 @@ (define-team haskell #:scope (list "gnu/packages/dhall.scm" ;; Match haskell.scm and haskell-*.scm. - (make-regexp "^gnu/packages/haskell(-.+|)\\.scm$") + (make-regexp* "^gnu/packages/haskell(-.+|)\\.scm$") "gnu/packages/purescript.scm" "guix/build/haskell-build-system.scm" "guix/build-system/haskell.scm" @@ -146,7 +165,7 @@ (define-team julia #:name "Julia team" #:description "The Julia language, Julia packages, and the julia-build-system." - #:scope (list (make-regexp "^gnu/packages/julia(-.+|)\\.scm$") + #:scope (list (make-regexp* "^gnu/packages/julia(-.+|)\\.scm$") "guix/build/julia-build-system.scm" "guix/build-system/julia.scm"))) @@ -175,14 +194,14 @@ (define-team java and the maven-build-system." #:scope (list ;; Match java.scm and java-*.scm. - (make-regexp "^gnu/packages/java(-.+|)\\.scm$") + (make-regexp* "^gnu/packages/java(-.+|)\\.scm$") ;; Match maven.scm and maven-*.scm - (make-regexp "^gnu/packages/maven(-.+|)\\.scm$") + (make-regexp* "^gnu/packages/maven(-.+|)\\.scm$") "guix/build/ant-build-system.scm" "guix/build/java-utils.scm" "guix/build/maven-build-system.scm" ;; The maven directory - (make-regexp "^guix/build/maven/") + (make-regexp* "^guix/build/maven/") "guix/build-system/ant.scm" "guix/build-system/maven.scm"))) @@ -195,7 +214,7 @@ (define-team emacs #:name "Emacs team" #:description "The extensible, customizable text editor and its ecosystem." - #:scope (list (make-regexp "^gnu/packages/emacs(-.+|)\\.scm$") + #:scope (list (make-regexp* "^gnu/packages/emacs(-.+|)\\.scm$") "guix/build/emacs-build-system.scm" "guix/build/emacs-utils.scm" "guix/build-system/emacs.scm" @@ -209,7 +228,7 @@ (define-team lisp #:description "Common Lisp and similar languages, Common Lisp packages and the asdf-build-system." - #:scope (list (make-regexp "^gnu/packages/lisp(-.+|)\\.scm$") + #:scope (list (make-regexp* "^gnu/packages/lisp(-.+|)\\.scm$") "guix/build/asdf-build-system.scm" "guix/build/lisp-utils.scm" "guix/build-system/asdf.scm"))) @@ -241,7 +260,7 @@ (define-team embedded-bootstrap (define-team rust (team 'rust #:name "Rust" - #:scope (list (make-regexp "^gnu/packages/(crates|rust)(-.+|)\\.scm$") + #:scope (list (make-regexp* "^gnu/packages/(crates|rust)(-.+|)\\.scm$") "guix/build/cargo-build-system.scm" "guix/build/cargo-utils.scm" "guix/build-system/cargo.scm" @@ -339,9 +358,9 @@ (define-team core "guix/upstream.scm" "guix/utils.scm" "guix/workers.scm" - (make-regexp "^guix/platforms/") - (make-regexp "^guix/scripts/") - (make-regexp "^guix/store/")))) + (make-regexp* "^guix/platforms/") + (make-regexp* "^guix/scripts/") + (make-regexp* "^guix/store/")))) (define-team games (team 'games @@ -358,17 +377,17 @@ (define-team translations (team 'translations #:name "Translations" #:scope (list "etc/news.scm" - (make-regexp "^po/")))) + (make-regexp* "^po/")))) (define-team installer (team 'installer #:name "Installer script and system installer" - #:scope (list (make-regexp "^gnu/installer(\\.scm$|/)")))) + #:scope (list (make-regexp* "^gnu/installer(\\.scm$|/)")))) (define-team home (team 'home #:name "Team for \"Guix Home\"" - #:scope (list (make-regexp "^(gnu|guix/scripts)/home(\\.scm$|/)") + #:scope (list (make-regexp* "^(gnu|guix/scripts)/home(\\.scm$|/)") "tests/guix-home.sh" "tests/home-import.scm" "tests/home-services.scm"))) @@ -508,8 +527,8 @@ (define (find-team-by-scope files) (any (match-lambda ((? string? scope) (string=? scope file)) - ((? regexp? scope) - (regexp-exec scope file))) + ((? regexp*? scope) + (regexp-exec* scope file))) (team-scope team))) files) (cons team acc) @@ -568,7 +587,11 @@ (define width* (%text-width)) (string-append fmt str)) (format #f "scope:~%") (sort - (map (lambda (scope) (format #f "+ ~a~%" scope)) scope-files) + (map (compose (cut format #f "+ ~a~%" <>) + (match-lambda + ((? regexp*? rx*) (regexp-pattern* rx*)) + ((? string? str) str))) + scope-files) string<=?))))) (list-members team port* "+ ") (newline))