From patchwork Thu Oct 20 13:28:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 43742 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 900B427BBE9; Thu, 20 Oct 2022 18:10:33 +0100 (BST) 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 ED4B127BBEA for ; Thu, 20 Oct 2022 18:10:28 +0100 (BST) Received: from localhost ([::1]:49926 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1olZ3a-00067X-Ia for patchwork@mira.cbaines.net; Thu, 20 Oct 2022 13:10:16 -0400 Received: from [::1] (helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1olYns-0004Ig-Lq for patchwork@mira.cbaines.net; Thu, 20 Oct 2022 12:53:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38726) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1olVbc-00070E-VY for guix-patches@gnu.org; Thu, 20 Oct 2022 09:29:10 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:34357) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1olVbc-0002ph-0a for guix-patches@gnu.org; Thu, 20 Oct 2022 09:29:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1olVbb-0004EL-RV for guix-patches@gnu.org; Thu, 20 Oct 2022 09:29:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58660] [PATCH 1/4] etc: teams: Improve scope display. 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, 20 Oct 2022 13:29:03 +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: zimoun Received: via spool by 58660-submit@debbugs.gnu.org id=B58660.166627251616206 (code B ref 58660); Thu, 20 Oct 2022 13:29:03 +0000 Received: (at 58660) by debbugs.gnu.org; 20 Oct 2022 13:28:36 +0000 Received: from localhost ([127.0.0.1]:33432 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1olVb9-0004DD-Aq for submit@debbugs.gnu.org; Thu, 20 Oct 2022 09:28:36 -0400 Received: from mail-wm1-f52.google.com ([209.85.128.52]:54816) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1olVb2-0004CL-1s for 58660@debbugs.gnu.org; Thu, 20 Oct 2022 09:28:32 -0400 Received: by mail-wm1-f52.google.com with SMTP id iv17so14927511wmb.4 for <58660@debbugs.gnu.org>; Thu, 20 Oct 2022 06:28:28 -0700 (PDT) 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=tlxw45bJgxFmdISskOiVJdcY3N1Hv8dnBrqsrdR4u2o=; b=VfEGZXO68oedg5bbb3BNEVZeL091rRFouqlI1wfMPIt6LuD4CKpDnsG6uEZHj+oy4W EQ0RuXtkWqCTUK5+Dd1v+4QUjRp9MOR9NHv9R6kqBD58pIwkh3Gdg/1uxW1NEhSKfizj ryFqUdIz5QjxkdcJ/HapIICBLBDZgkdzHzdU+H02bgR05/ik6JrtuyB1lB4MiG311UuJ UBG0LUld8r7KuiB//88xHKZ7+pq6zSdeVlGd0e2jOQs7Na57Jo+E2T2z2PkZJNArnc27 N5O/SClEwKPwDMO7+r7rfmXDfcqm+ApiTwyT5197mFkbweQ5OZ7ULtLRidFi4q7R0BIp atzQ== 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=tlxw45bJgxFmdISskOiVJdcY3N1Hv8dnBrqsrdR4u2o=; b=B8CNrdu3ppFlo7iRJB25WXVEFgsec1+L80/wzJpkBbMb+Jfa+F7suuf9MclZDwBrGh qr46qAB/elWaBF4YWDcQVC8v5U2n9ECVppr8IsF1goghDp8Hqihjv6hHouVqbnZrwosh tv/kyaH03Uo/BE6LACjpsMgKQ9ni3CUMuuSbsJr6OM/CDog9BmN4XmlseC8kmKlmCnr4 9m/XihsSBesnmds4KJbuehkWyKNeV0lkuXmLCwWIqZwynI+NRbtHdY2Ymi+oKkAchUyG KW3uGWlLrPNYQ5yNMgN7pnz0ZM6TqkIXgbXz800k2JxMkKljLGk4/tBE5WjscbX87KyZ XmzA== X-Gm-Message-State: ACrzQf208PInykrZ08IQGvXv9mSIPU7fA3SKErQKtjanSwwHh58fxtKB UyI40fjSrUsPyrvQ+sqf7286JcQJJZg= X-Google-Smtp-Source: AMsMyM41MAbGx1dGLzszKJ22ar13X7LMTPyCA11369kuaSvO9bjDEW9+YRsc48wFC+0KijAYgduOTw== X-Received: by 2002:a05:600c:2f08:b0:3c6:befc:9778 with SMTP id r8-20020a05600c2f0800b003c6befc9778mr9229943wmn.101.1666272501179; Thu, 20 Oct 2022 06:28:21 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id q3-20020a1c4303000000b003a8434530bbsm2864668wma.13.2022.10.20.06.28.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Oct 2022 06:28:20 -0700 (PDT) From: zimoun Date: Thu, 20 Oct 2022 15:28:11 +0200 Message-Id: <20221020132814.1549436-1-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.36.0 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" 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 and sort scope files. --- etc/teams.scm.in | 62 ++++++++++++++++++++++++++++++++++-------------- 1 file changed, 44 insertions(+), 18 deletions(-) diff --git a/etc/teams.scm.in b/etc/teams.scm.in index c27ea5271e..394e4d7d46 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. ;;; @@ -37,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? @@ -97,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/python-build-system.scm" @@ -115,7 +135,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" @@ -143,7 +163,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"))) @@ -172,14 +192,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"))) @@ -192,7 +212,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" @@ -206,7 +226,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"))) @@ -238,7 +258,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" @@ -336,9 +356,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 @@ -355,17 +375,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"))) @@ -501,8 +521,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) @@ -553,7 +573,13 @@ (define width* (%text-width)) "") (match (team-scope team) (() "") - (scope (format #f "scope: ~{~s ~}~%" scope)))) + (scope (format #f "scope: ~{~s ~}~%" + (sort + (map (match-lambda + ((? regexp*? rx*) (regexp-pattern* rx*)) + ((? string? str) str)) + scope) + string<=?))))) (list-members team port* "+ ") (newline)) %teams)) From patchwork Thu Oct 20 13:28:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 43740 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 C692F27BBEA; Thu, 20 Oct 2022 17:24:48 +0100 (BST) 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 2FB2B27BBE9 for ; Thu, 20 Oct 2022 17:24:44 +0100 (BST) Received: from localhost ([::1]:47142 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1olYLS-0000I2-DQ for patchwork@mira.cbaines.net; Thu, 20 Oct 2022 12:24:34 -0400 Received: from [::1] (helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1olYL8-0003jb-Sn for patchwork@mira.cbaines.net; Thu, 20 Oct 2022 12:24:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38724) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1olVbc-00070D-VJ for guix-patches@gnu.org; Thu, 20 Oct 2022 09:29:10 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:34356) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1olVbb-0002pC-KB for guix-patches@gnu.org; Thu, 20 Oct 2022 09:29:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1olVbb-0004ED-En for guix-patches@gnu.org; Thu, 20 Oct 2022 09:29:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58660] [PATCH 2/4] etc: teams: List members sorted by name. Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 20 Oct 2022 13:29:03 +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: zimoun Received: via spool by 58660-submit@debbugs.gnu.org id=B58660.166627251516198 (code B ref 58660); Thu, 20 Oct 2022 13:29:03 +0000 Received: (at 58660) by debbugs.gnu.org; 20 Oct 2022 13:28:35 +0000 Received: from localhost ([127.0.0.1]:33430 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1olVb8-0004D6-SR for submit@debbugs.gnu.org; Thu, 20 Oct 2022 09:28:35 -0400 Received: from mail-wr1-f52.google.com ([209.85.221.52]:45621) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1olVb3-0004CO-Jl for 58660@debbugs.gnu.org; Thu, 20 Oct 2022 09:28:30 -0400 Received: by mail-wr1-f52.google.com with SMTP id a10so34376383wrm.12 for <58660@debbugs.gnu.org>; Thu, 20 Oct 2022 06:28:29 -0700 (PDT) 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=txtpoAhiHPjVfxCv/bIZRzmJF02nUPE7rX9gUGzpexg=; b=ZidBVUQJjuCziT+WbQfS8p8VnOlaPkx8axPSVV8wF0/uI41N2QQuHgTd2oqFEHwjbz Ar4jnoF2COS3/qEfps1b7PTTBity2v4Zazz3F/hNJUIQV9LW0R87hBZQ3sm4RtBDB0TA 2VmTx3pIA7A4XB55Muvp2TSZnK0ygHp8+zQi7oCqDLoNrBbvPYYjV7PPvzgrGLbcuoyK t+5RD2Kn4WmYTbz9qaO1HaePuEx/L4NQAxPUTwBi2VtTjGx1B9p3dlwSxgfwkg5kOzHN bsdcitosrAvy7hCS0Z0aK6wgZfSR5zjRLYM5B7fNukq9nbtszzGuwToIC5/BDExEA8s1 eADA== 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=txtpoAhiHPjVfxCv/bIZRzmJF02nUPE7rX9gUGzpexg=; b=szNUxqPaheJQwdlgt64jsliYyjmvnPKgct3uCATWoNzx2YQDrypJDto0zUTC2dMMyY EEdekYiVFMMROBcjt3xu/pp+ZjUcZ/GXsxBS+LOqh4ZQeP/JbEzE/2J8vW6GljgcX9ia kfmOdeaZrSQIpokZI5o4wO6m7J6Aus5FBSuozVlbZj5+scjUv6QAsFzrRScOy6CKYTCq k5oCCl874ualiWR2ZhaScKustnPOEtPwn2VKGUPI5bdnKptE7nqHGp9kYV+/NKG2+bFz Q5CEB4Iiz+gQSHUFB+WF8UHgJAKo83F/yY8Z2i5a4eopd/2MipcbNXSZAuxgP0neTDUF y2Ag== X-Gm-Message-State: ACrzQf2wR+WBFGgmV5YgtKdKsDjs5Y4N1vf+E/w7nWuOI5KJ2yidbrTU lghbFiVskpt76kjeMX99fEa3MihB8RQ= X-Google-Smtp-Source: AMsMyM6BOxjQPAw7ic/JeTxnM+66nGZgCcGQLOXTFCvlZPMRwRec9lHDUd2xiw7Y4f/fKkQBIlpGbg== X-Received: by 2002:a05:6000:8c:b0:22e:45c6:bc4c with SMTP id m12-20020a056000008c00b0022e45c6bc4cmr8495052wrx.555.1666272501927; Thu, 20 Oct 2022 06:28:21 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id q3-20020a1c4303000000b003a8434530bbsm2864668wma.13.2022.10.20.06.28.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Oct 2022 06:28:21 -0700 (PDT) From: zimoun Date: Thu, 20 Oct 2022 15:28:12 +0200 Message-Id: <20221020132814.1549436-2-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20221020132814.1549436-1-zimon.toutoune@gmail.com> References: <20221020132814.1549436-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" X-getmail-retrieved-from-mailbox: Patches * etc/teams.scm.in (list-members): Sort by name. --- etc/teams.scm.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/etc/teams.scm.in b/etc/teams.scm.in index 394e4d7d46..8e18a5d206 100644 --- a/etc/teams.scm.in +++ b/etc/teams.scm.in @@ -548,7 +548,9 @@ (define port* (or port (current-output-port))) prefix (person-name member) (person-email member))) - (team-members team))) + (sort + (team-members team) + (lambda (m1 m2) (string X-Patchwork-Id: 43739 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 7669727BBEA; Thu, 20 Oct 2022 16:45:02 +0100 (BST) 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 C86B527BBE9 for ; Thu, 20 Oct 2022 16:44:57 +0100 (BST) Received: from localhost ([::1]:55690 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1olXiz-00075U-Ue for patchwork@mira.cbaines.net; Thu, 20 Oct 2022 11:44:51 -0400 Received: from [::1] (helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1olXiN-0006Cx-N9 for patchwork@mira.cbaines.net; Thu, 20 Oct 2022 11:44:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38720) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1olVbc-00070B-VJ for guix-patches@gnu.org; Thu, 20 Oct 2022 09:29:10 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:34354) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1olVbb-0002la-4V for guix-patches@gnu.org; Thu, 20 Oct 2022 09:29:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1olVba-0004Dy-JB for guix-patches@gnu.org; Thu, 20 Oct 2022 09:29:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58660] [PATCH 3/4] etc: teams: List teams sorted by id. Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 20 Oct 2022 13: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: zimoun Received: via spool by 58660-submit@debbugs.gnu.org id=B58660.166627251016174 (code B ref 58660); Thu, 20 Oct 2022 13:29:02 +0000 Received: (at 58660) by debbugs.gnu.org; 20 Oct 2022 13:28:30 +0000 Received: from localhost ([127.0.0.1]:33426 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1olVb4-0004Cj-2e for submit@debbugs.gnu.org; Thu, 20 Oct 2022 09:28:30 -0400 Received: from mail-wm1-f50.google.com ([209.85.128.50]:54256) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1olVb2-0004CM-1m for 58660@debbugs.gnu.org; Thu, 20 Oct 2022 09:28:29 -0400 Received: by mail-wm1-f50.google.com with SMTP id e18so14925167wmq.3 for <58660@debbugs.gnu.org>; Thu, 20 Oct 2022 06:28:28 -0700 (PDT) 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=fpTANVt7iRO1tZEI0bMFv8S4UFTE0IakN4Rto/Fya8o=; b=p8LBnTnrP2j+q9owbgi5yjdOYB5hVXlxKiDtVDcIMdLp3JxlfjA56EC7KyPjXfN1P4 5j/m62K2kAxEDMGP67WYvPjrRDcgGU2ZAwsP7a/s/IyxC1ckX4JX1zqDUK4PTM3fnFRB YEQGNRQuDweFno+ysjA6SBb3DX7bClPFVQ0RrcYBSu+tkmiV8sdHvFyaeVRZkAG/sPS9 6NhKcDEDYgqWwR2+IDCXVN2nFT6pEURNxRAYV5unP+a73SGX+z3cgYa88GzkGBuZZNOo BCcloLnu80gJMZNGmeoTGHGVhNR3MUXygRPYtXPoWkTVaUYNp3gkXji23mmKBnBqwaRh /r8w== 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=fpTANVt7iRO1tZEI0bMFv8S4UFTE0IakN4Rto/Fya8o=; b=53Jp/ce7I9/BXn7FbP5qKcVcZqD4wA5sZptUZ2AoGIWpI1v57pYF+Aospl8HtXLZ4R yL7xwGROjETNDkFcEUzksvH9wMBsTrJhnYFWf8A56E0c6MkgUnwaOYSqxAFDe39vVSbV 4baTDIic9NDTmhGt7YvqiFzOsgQrFerpusspI80PIZxCEMD9LqYBoF2OchToPaxcJkmD b1CSS4hbXdodoZdCOxbB4eNBcvwYV0IBF5E7ZYktHmEU9fO5az9BvXdPGOZI3NE+kVEp kO4ZHwW03Uu3wGhAQcsmDVeatfNyszezdww8RpfjlMtArHl8RVlppQ8zTKP3n9I+EJfA KVMA== X-Gm-Message-State: ACrzQf1Wrt/71XkI2wS63RlgP4gvlX4pOc1TQ7p4AIX20pC9fiqzbQF4 eiPetsCTCt9cId+dYOyUp+vZRZcQtCg= X-Google-Smtp-Source: AMsMyM6mthBgbISFuM+LmLMPzf4/ZSvm6ZPlMnrOKEQ1b9NCFQRrhN0Pg6YCDCnnFVF6ysj0vgGYnQ== X-Received: by 2002:a05:600c:548c:b0:3c6:d8dd:2a72 with SMTP id iv12-20020a05600c548c00b003c6d8dd2a72mr27473968wmb.179.1666272502436; Thu, 20 Oct 2022 06:28:22 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id q3-20020a1c4303000000b003a8434530bbsm2864668wma.13.2022.10.20.06.28.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Oct 2022 06:28:22 -0700 (PDT) From: zimoun Date: Thu, 20 Oct 2022 15:28:13 +0200 Message-Id: <20221020132814.1549436-3-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20221020132814.1549436-1-zimon.toutoune@gmail.com> References: <20221020132814.1549436-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" X-getmail-retrieved-from-mailbox: Patches * etc/teams.scm.in (list-teams): Sort teams by id. --- etc/teams.scm.in | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/etc/teams.scm.in b/etc/teams.scm.in index 8e18a5d206..3d4c7319c2 100644 --- a/etc/teams.scm.in +++ b/etc/teams.scm.in @@ -556,8 +556,8 @@ (define (list-teams) "Print all teams, their scope and their members." (define port* (current-output-port)) (define width* (%text-width)) - (hash-for-each - (lambda (key team) + (for-each + (lambda (team) (format port* "\ id: ~a @@ -584,7 +584,11 @@ (define width* (%text-width)) string<=?))))) (list-members team port* "+ ") (newline)) - %teams)) + (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) From patchwork Thu Oct 20 13:28:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 43738 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 8DD0C27BBEA; Thu, 20 Oct 2022 16:43:15 +0100 (BST) 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 453F327BBE9 for ; Thu, 20 Oct 2022 16:43:15 +0100 (BST) Received: from localhost ([::1]:33672 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1olXhK-0007QV-P1 for patchwork@mira.cbaines.net; Thu, 20 Oct 2022 11:43:10 -0400 Received: from [::1] (helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1olXgJ-00034a-Iw for patchwork@mira.cbaines.net; Thu, 20 Oct 2022 11:42:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38722) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1olVbc-00070C-VW for guix-patches@gnu.org; Thu, 20 Oct 2022 09:29:10 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:34355) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1olVbb-0002oj-6n for guix-patches@gnu.org; Thu, 20 Oct 2022 09:29:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1olVbb-0004E6-0x for guix-patches@gnu.org; Thu, 20 Oct 2022 09:29:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58660] [PATCH 4/4] etc: teams: Display an id number. Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 20 Oct 2022 13: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: zimoun Received: via spool by 58660-submit@debbugs.gnu.org id=B58660.166627251516191 (code B ref 58660); Thu, 20 Oct 2022 13:29:02 +0000 Received: (at 58660) by debbugs.gnu.org; 20 Oct 2022 13:28:35 +0000 Received: from localhost ([127.0.0.1]:33428 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1olVb8-0004D4-Iv for submit@debbugs.gnu.org; Thu, 20 Oct 2022 09:28:34 -0400 Received: from mail-wr1-f54.google.com ([209.85.221.54]:36578) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1olVb2-0004CQ-Lx for 58660@debbugs.gnu.org; Thu, 20 Oct 2022 09:28:29 -0400 Received: by mail-wr1-f54.google.com with SMTP id j7so34467724wrr.3 for <58660@debbugs.gnu.org>; Thu, 20 Oct 2022 06:28:28 -0700 (PDT) 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=0cS1SnP5IFiMGkvK0CKr3ei8/rfxSK2fXcub4m5RYNk=; b=ffpzSgIR9HRS1AnaeBNMzMfee24Z5z3SVWzgx2E+rtuAvTyaTiMj338mJ1ojLMqYZt svGZ70Wu6KkaBH2ZSoob1n2oFY25j+OJvSXfHgDSxl/oDh8Z5Q5FLVwN8RPV9PxKX5wi J7zFvyMKer8YN8pNSf00MStTRLA6tFXb740hzDa96TprGqQzgS3gBfSeZscYdxgAJjlm LS5U62wKz+ia+Z4zu4zcAksN/jy67XcidofN2vNoG0CCa+aU14wxqlkoRF32Dbcb5LXk LNccYaxj1oP5Ny+83UznCLdC+CBHEb7Q1o4sI3ce3u4FkYlKZrT1/urqIKWqZgtCZule QZ2A== 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=0cS1SnP5IFiMGkvK0CKr3ei8/rfxSK2fXcub4m5RYNk=; b=MO6tW76SyqOBhFC0B2BlKZtGBrlv/LXvu6UmVc2KyTOeLZYzFeNc7da3cjGRZi5wzy ErFfG8A2PTtcijQsl2PpDo6uiwHB4hpyKM862bc2iNU6twN4G+ab2YiVM5eAJtLe+Lz+ l7OluZu+Vis6KKKTzownKW96wdqzO67MD5nZzZOmL3HPkBEiuhBf0mr4WPxFcLOxCoXC 7Uz3VRLDHXOIMipc+MxZikd+fSLd/M36z5HsV7HC7wih3GbVimc8bstyZox4+UFPiqbc wFFtx6iZbIOcokJZtAYzNIJn1LUpFO1YOYOdoblXx7Zb+V6ZH1mQGcNWg3qE0H20CgXI IqQA== X-Gm-Message-State: ACrzQf1lVHBgT07DkhjNOc1G1vxuYpyseTZpmaX0fJPPvqoy0QcPY/aC iyRMImoeYgzDwbCmfDfTTy9uNOSFiio= X-Google-Smtp-Source: AMsMyM6T2VnwB8JRQfC8HM8l4wwovz0podC2GvfjLFkVyxACD4s833vRh9REjYSv/rqflMzTwl8bqA== X-Received: by 2002:a5d:47c5:0:b0:22e:6573:5621 with SMTP id o5-20020a5d47c5000000b0022e65735621mr8574748wrc.478.1666272502927; Thu, 20 Oct 2022 06:28:22 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id q3-20020a1c4303000000b003a8434530bbsm2864668wma.13.2022.10.20.06.28.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Oct 2022 06:28:22 -0700 (PDT) From: zimoun Date: Thu, 20 Oct 2022 15:28:14 +0200 Message-Id: <20221020132814.1549436-4-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20221020132814.1549436-1-zimon.toutoune@gmail.com> References: <20221020132814.1549436-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" X-getmail-retrieved-from-mailbox: Patches * etc/teams.scm.in (list-teams): Add id number for easing 'recutils' use. --- etc/teams.scm.in | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/etc/teams.scm.in b/etc/teams.scm.in index 3d4c7319c2..790eb17131 100644 --- a/etc/teams.scm.in +++ b/etc/teams.scm.in @@ -556,15 +556,16 @@ (define (list-teams) "Print all teams, their scope and their members." (define port* (current-output-port)) (define width* (%text-width)) - (for-each - (lambda (team) + (fold + (lambda (team id-number) (format port* "\ -id: ~a +id: (~d) ~a name: ~a description: ~a ~amembers: " + id-number (team-id team) (team-name team) (or (and=> (team-description team) @@ -583,7 +584,9 @@ (define width* (%text-width)) scope) string<=?))))) (list-members team port* "+ ") - (newline)) + (newline) + (1+ id-number)) + 0 (sort (hash-map->list (lambda (key value) value) %teams) (lambda (team1 team2)