From unknown Mon Aug 18 14:25:49 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#47464 <47464@debbugs.gnu.org> To: bug#47464 <47464@debbugs.gnu.org> Subject: Status: [PATCH 0/8] scripts: Allow option hint for various subcommands. Reply-To: bug#47464 <47464@debbugs.gnu.org> Date: Mon, 18 Aug 2025 21:25:49 +0000 retitle 47464 [PATCH 0/8] scripts: Allow option hint for various subcommand= s. reassign 47464 guix-patches submitter 47464 zimoun severity 47464 normal tag 47464 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Mon Mar 29 06:16:59 2021 Received: (at submit) by debbugs.gnu.org; 29 Mar 2021 10:16:59 +0000 Received: from localhost ([127.0.0.1]:47891 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lQox8-0008Fx-QW for submit@debbugs.gnu.org; Mon, 29 Mar 2021 06:16:59 -0400 Received: from lists.gnu.org ([209.51.188.17]:60782) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lQox7-0008Fp-WA for submit@debbugs.gnu.org; Mon, 29 Mar 2021 06:16:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33912) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lQox7-0006b0-Qf for guix-patches@gnu.org; Mon, 29 Mar 2021 06:16:57 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:42671) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lQox6-0002ep-6W for guix-patches@gnu.org; Mon, 29 Mar 2021 06:16:57 -0400 Received: by mail-wr1-x42b.google.com with SMTP id x13so12236237wrs.9 for ; Mon, 29 Mar 2021 03:16:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=one6RK/qDytY94qQ9J3EjPrykN24H5mezinMV1cl14A=; b=m6dXWk4QHGiywZ7SYy0D6bfi9OLvCCwsBa+gXmmdK3aZ3Lv6soygHZ1bm2IouPZnfe 4SYZhO5Tb8sROwHyoBBUjJdtgfknoq+34GHXy62fEFZ1ScCT4NpSy/TohPy4MCZk899V TnecYN16Nizm/IYXwcnNcwc6aE5RXL8wv+otdpyGxw/x0QCOkMQtxOReAvtbGxnM/ap2 g+K6me23xxQ2Jz9BdThp9Chmbf6Nk4XeFXCyJzK/QYNfr+p4d7OTcJTKkZEIZY5Hb+xZ ZVky8WlLzuisGa+zjUmfQguwF0yqF1+QWYMO14r3WUcW2COhngQU66PTWDzYL+SM0LSQ 5PjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=one6RK/qDytY94qQ9J3EjPrykN24H5mezinMV1cl14A=; b=GZo+XP9sOmFL/Ar/h6SJzGi4hw5XhgbHfmoCeVN+u9gg8lTjDJkKoCvAqkBCUhZ3iR vTYN98mEoUggXU5vh9uiFzfAZv4kH29NQ5EKM8UPETJrBD97+KmQH4f9p7BWU9wTbl0s NmIWWkroSIf1kQX7Z21BZiP0AIhC/vt5AAgIik87t+3sCnpFk0gNJ/8BL/oUcZBFeoXt dO0hlbm864n1RojbMBBkfm3CJQ+5vTrSOtDaqYXAHISna+yB0v3RFzD6v/EtU2ykzMZj ybF9ztslrkmJ0eQoQrxq42CWo3+W/tLAVp5fnfsDggLLWYr+OJ+K4AWOzmg6CeNFRheA TRVA== X-Gm-Message-State: AOAM531WZtMvRldHTCg/teQYCXAq73LjKY3xtrBdXVKegP6sybgRE7HD kVDCA20aSfevBYf9HFpgHu12zDO++j4= X-Google-Smtp-Source: ABdhPJw74wVBch9ir+QUQVIwQvtW+RHJ/N0i2Cpxkh3F4bmPEqUh+jBA2leeD1PsJANdQFeFt6qqTQ== X-Received: by 2002:adf:fd91:: with SMTP id d17mr27951034wrr.0.1617013014144; Mon, 29 Mar 2021 03:16:54 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.110]) by smtp.gmail.com with ESMTPSA id g16sm29210039wrs.76.2021.03.29.03.16.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Mar 2021 03:16:53 -0700 (PDT) From: zimoun To: guix-patches@gnu.org Subject: [PATCH 0/8] scripts: Allow option hint for various subcommands. Date: Mon, 29 Mar 2021 12:16:38 +0200 Message-Id: <20210329101638.53217-1-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.30.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=zimon.toutoune@gmail.com; helo=mail-wr1-x42b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: zimoun X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) Hi, The patch set replaces all the 'args-fold*' by 'parse-command-line'. Doing so, all the option typos are hinted. It could be only one commit (squashing) but it appeared me easier in case something is wrong; I expect nothing! :-) I have checked trying various combinations. Note that "tests/guix-describe.sh" is SKIP because the test does not work when using worktree. Well, a double-check is really welcome. :-) All the remaining subcommands---authenticate, container, git, import, offload and substitute---needs a rewriting of how they parse the command line arguments. Cheers, simon zimoun (8): scripts: describe: Replace 'args-fold*' by 'parse-command-line'. scripts: discover: Replace 'args-fold*' by 'parse-command-line'. scripts: download: Replace 'args-fold*' by 'parse-command-line'. scripts: edit: Replace 'args-fold*' by 'parse-command-line'. scripts: publish: Replace 'args-fold*' by 'parse-command-line'. scripts: repl: Replace 'args-fold*' by 'parse-command-line'. scripts: search: Replace 'args-fold*' by 'parse-command-line'. scripts: show: Replace 'args-fold*' by 'parse-command-line'. guix/scripts/describe.scm | 10 ++++------ guix/scripts/discover.scm | 12 ++++++------ guix/scripts/download.scm | 17 ++++++++--------- guix/scripts/edit.scm | 10 ++++------ guix/scripts/publish.scm | 12 ++++++------ guix/scripts/repl.scm | 11 +++++------ guix/scripts/search.scm | 9 ++++----- guix/scripts/show.scm | 10 ++++------ 8 files changed, 41 insertions(+), 50 deletions(-) base-commit: 6e7ba45357078b31a369b23f8a9f38302dfcbb10 -- 2.30.1 From debbugs-submit-bounces@debbugs.gnu.org Mon Mar 29 06:18:22 2021 Received: (at 47464) by debbugs.gnu.org; 29 Mar 2021 10:18:22 +0000 Received: from localhost ([127.0.0.1]:47899 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lQoyT-0008Iv-7h for submit@debbugs.gnu.org; Mon, 29 Mar 2021 06:18:21 -0400 Received: from mail-wr1-f44.google.com ([209.85.221.44]:42595) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lQoyR-0008IW-OW for 47464@debbugs.gnu.org; Mon, 29 Mar 2021 06:18:20 -0400 Received: by mail-wr1-f44.google.com with SMTP id x13so12240713wrs.9 for <47464@debbugs.gnu.org>; Mon, 29 Mar 2021 03:18:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=uySKhY582ajIOiamQ1YzfkXJQxwIMjijdkf2Q2EK6y0=; b=mT11Eh8D2x1xgwGi/DjQ0MVMpUeBDlVzyFf0Vv67zv9B1xE91jpo9GSk4qrsglu99K Iq6jrPfgc8du5WocwpA8IEFjZAl64kpZktNkJw1J3TOTqE+RuH3ge8dw/TXHZIlFy++Q IPiUNR1MmVp10P+UIhfrYi2ceH/+ZNZE5wsU3zSW7bLFI2ROucyxCiOXC/DrywRdKru+ hXZ5beOGonqrOSwOEWChWM0vGLsW4HxPubXZZLjKz+ZZRQPRvmRqqa69PUv5rzr/3XGL dK+vCXHgSVgHOPvsgQgJz5Xa9Bq7BelHtbbEUiXw/8EDVdKHTxcgi3qtlMmaxjLGCQwk /D1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=uySKhY582ajIOiamQ1YzfkXJQxwIMjijdkf2Q2EK6y0=; b=BOsn7Dv7YExkN1+BjmnjXRmBgMsQ47tsj7aV3YycIp2PUTmoqA6CEpr2FsIr4Qfqfx Z5+l0FewfQwWAFnkpPzL7ZDnOdXKCUABG6xlaDl6y49tZw8L8hJJf0A4mB6w3/YisQ7S HuvN7kSIr8Obx0cG6/cqWMqvb9pFR3v7uUF4b0MNmEU0Pi8CVCaAEPlY3s5vQ5jtqplN ZzqQYHX5UrZfOLCw2/7zG3eKbnMHQisTSwUfeOpt19nAJ2bfeNMHCThuCNnoQJGV2t9Y eyGVuRcN6NhLggaBDONyNYNxm5il9bdFWJnwa8xB+m2CLpBsi+fQ1hQQvt+ITi58IuBq 7UuA== X-Gm-Message-State: AOAM532LakcCF3h4xQJ+9AhqncRwJUEKF/eJ7CygpE2lve0tfc1V0qI3 gzh1A+qIjMmtABQTUvcNExAvJI1tXH0= X-Google-Smtp-Source: ABdhPJwOw8jJUJlNEWzPa6JDTJuYbqUX0hTWZU/im7guhT+MNyBk/uyHPiBuLtUeRM847sRKmAZRKQ== X-Received: by 2002:adf:8b4e:: with SMTP id v14mr27357737wra.103.1617013093955; Mon, 29 Mar 2021 03:18:13 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.110]) by smtp.gmail.com with ESMTPSA id 135sm25291792wma.44.2021.03.29.03.18.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Mar 2021 03:18:13 -0700 (PDT) From: zimoun To: 47464@debbugs.gnu.org Subject: [PATCH 1/8] scripts: describe: Replace 'args-fold*' by 'parse-command-line'. Date: Mon, 29 Mar 2021 12:17:59 +0200 Message-Id: <20210329101806.54004-1-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.30.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 47464 Cc: zimoun X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * guix/scripts/describe.scm (define-command): Replace 'args-fold*' by 'parse-command-line'. --- guix/scripts/describe.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/guix/scripts/describe.scm b/guix/scripts/describe.scm index be2279d254..b5f6249176 100644 --- a/guix/scripts/describe.scm +++ b/guix/scripts/describe.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2018, 2019, 2020, 2021 Ludovic Courtès ;;; Copyright © 2018 Oleg Pykhalov ;;; Copyright © 2020 Ekaitz Zarraga +;;; Copyright © 2021 Simon Tournier ;;; ;;; This file is part of GNU Guix. ;;; @@ -286,12 +287,9 @@ text. The hyperlink links to a web view of COMMIT, when available." (define-command (guix-describe . args) (synopsis "describe the channel revisions currently used") - (let* ((opts (args-fold* args %options - (lambda (opt name arg result) - (leave (G_ "~A: unrecognized option~%") - name)) - cons - %default-options)) + (let* ((opts (parse-command-line args %options (list %default-options) + #:build-options? #f + #:argument-handler cons)) (format (assq-ref opts 'format)) (profile (or (assq-ref opts 'profile) (current-profile)))) (with-error-handling -- 2.30.1 From debbugs-submit-bounces@debbugs.gnu.org Mon Mar 29 06:18:22 2021 Received: (at 47464) by debbugs.gnu.org; 29 Mar 2021 10:18:23 +0000 Received: from localhost ([127.0.0.1]:47903 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lQoyU-0008J9-1L for submit@debbugs.gnu.org; Mon, 29 Mar 2021 06:18:22 -0400 Received: from mail-wr1-f47.google.com ([209.85.221.47]:38469) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lQoyS-0008IZ-By for 47464@debbugs.gnu.org; Mon, 29 Mar 2021 06:18:20 -0400 Received: by mail-wr1-f47.google.com with SMTP id z2so12261051wrl.5 for <47464@debbugs.gnu.org>; Mon, 29 Mar 2021 03:18:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=WMJItAO62WcgOht21ZJa0fOHMrkc+rz+OtoZQg9uO2g=; b=XlRxK/Gsmm22ABfP3Ox3ybnUnDHWoQwm8UzJMmwuWkE4xkmaDOZ6J1JmtBHQQVyrz3 7zArnR0QJ9+4DLx+zG7cn36fJvRl8IMTj8vO7n1iKYAfzyKufSyyRz2etbQlHi4gwVv6 Uwic+yhvACx6zJPnRDB9KlEDps5XCdnTCVHfna9Evi1z7viQyjXdJiBVRzN4IXr3UbaG rYPCeYmyHhaJLY7iLtq1Fs3gJwjqIeEZ3Phi9ibrnmP7bIXoKQhbkai5r5HqXEMYM9t8 sGnO4RrcBgrdgIltcu58EVDCFj8IqHzKv4nlV348VLQc3kDHL/6UL2BijHB7ympfA/zq pGZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=WMJItAO62WcgOht21ZJa0fOHMrkc+rz+OtoZQg9uO2g=; b=XBqevuRdfDS65CvgQxsbHmPivkzqVFF1a+AxpEUH0ML1SNslqPEBg5bOlxYmobInaC Pxi9nhjDT3ikQmeCFeyLwvE5OG0+RaEyBTJ3PbDBcdNrgcyLPOXrXhtgEktx/Bu4RNaD eEB2e0Rxmu4zhziExnP754vliFfI98SmU9xzhLVS2K3iQNNwXVaVN5Tou+xOa35c7INr 6Q9uRku7o8T0khq+PWkIEcjmZ0TmEZaKdDb8eHMZdoRnMszzjyyXuCeGw7LsD2Oaj4n8 50T7gIazxEcSGtNsC+gNAAPEMn8MGBBQsmksMS/eMDWDDIBJla5r2K4cybtJ4949PpJF bV/w== X-Gm-Message-State: AOAM530H/yMJ3G76FT6cTL99bwCUdl9IvEbV3brbIBhWyJ74JMxvAVce 22jDCkR9UTmXrEsb8XRXrlHNDP7hg1c= X-Google-Smtp-Source: ABdhPJywU1qoQT55HidSikJ6Pm1YgekFbcNAlqsLd5KirpOMizxYp9WoIuJxhFUdhtE3LabEuLfJKw== X-Received: by 2002:adf:c70b:: with SMTP id k11mr28299654wrg.165.1617013094862; Mon, 29 Mar 2021 03:18:14 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.110]) by smtp.gmail.com with ESMTPSA id 135sm25291792wma.44.2021.03.29.03.18.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Mar 2021 03:18:14 -0700 (PDT) From: zimoun To: 47464@debbugs.gnu.org Subject: [PATCH 3/8] scripts: download: Replace 'args-fold*' by 'parse-command-line'. Date: Mon, 29 Mar 2021 12:18:01 +0200 Message-Id: <20210329101806.54004-3-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210329101806.54004-1-zimon.toutoune@gmail.com> References: <20210329101806.54004-1-zimon.toutoune@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 47464 Cc: zimoun X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * guix/scripts/download.scm (define-command): Replace 'args-fold*' by 'parse-command-line'. --- guix/scripts/download.scm | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/guix/scripts/download.scm b/guix/scripts/download.scm index ce8dd8b02c..5a91390358 100644 --- a/guix/scripts/download.scm +++ b/guix/scripts/download.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012, 2013, 2015, 2016, 2017, 2020 Ludovic Courtès +;;; Copyright © 2021 Simon Tournier ;;; ;;; This file is part of GNU Guix. ;;; @@ -162,15 +163,13 @@ and 'base16' ('hex' and 'hexadecimal' can be used as well).\n")) (define (parse-options) ;; Return the alist of option values. - (args-fold* args %options - (lambda (opt name arg result) - (leave (G_ "~A: unrecognized option~%") name)) - (lambda (arg result) - (when (assq 'argument result) - (leave (G_ "~A: extraneous argument~%") arg)) - - (alist-cons 'argument arg result)) - %default-options)) + (parse-command-line args %options (list %default-options) + #:build-options? #f + #:argument-handler + (lambda (arg result) + (when (assq 'argument result) + (leave (G_ "~A: extraneous argument~%") arg)) + (alist-cons 'argument arg result)))) (with-error-handling (let* ((opts (parse-options)) -- 2.30.1 From debbugs-submit-bounces@debbugs.gnu.org Mon Mar 29 06:18:31 2021 Received: (at 47464) by debbugs.gnu.org; 29 Mar 2021 10:18:31 +0000 Received: from localhost ([127.0.0.1]:47907 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lQoyb-0008Jn-UB for submit@debbugs.gnu.org; Mon, 29 Mar 2021 06:18:30 -0400 Received: from mail-wr1-f52.google.com ([209.85.221.52]:35551) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lQoyS-0008Ia-Pz for 47464@debbugs.gnu.org; Mon, 29 Mar 2021 06:18:21 -0400 Received: by mail-wr1-f52.google.com with SMTP id j18so12267783wra.2 for <47464@debbugs.gnu.org>; Mon, 29 Mar 2021 03:18:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8v341+EHxxi+k3WdjfIHURxKm/O3/7PHLXMJvPUn9ao=; b=TWavfS/eVzlvuYM4TTqZ9zFOUvWxZJe8Kgzf40hOLWOw1+uG4npMV6qlxe+h2M5y7F jZkwWPcbL4hDoe0jLjAl8r9bwGS0PSz/7ilghphOF+6sHTaQfgt/Cea3sNQ1uwgutJ36 +E1OqeMetl90ubMA1dAca2ukOEE5YHiwdhKG0DFLPkN36Z/4oaQ0tjZDYYBFrqaQ1c61 FNuaoMawhePLjjFdfcAfom/rRgJCQ5WoRVUcRQZJAI+xVdY2ZuhLSQfm+hnqnOTvAIDW m2PXx61V03O3HJ+2AMtRAZDCK1eq9RYSFtaJTWOABtduXOhjeyoeUp2Orw7iq2xIi0bK 968Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8v341+EHxxi+k3WdjfIHURxKm/O3/7PHLXMJvPUn9ao=; b=NVlTiXrTC2VvcyOceaZwf8PgoVvPcY0Mt0eYN9I4K0WDc7fHGo1aGWU8c5RSsw9zrx 450aVW2hoA/lpaeOH18dDNezQTFM7L5XH4RJeOrRki5u67lzighBNM8rr3VMt5jhj3Z7 +r0oR6vidbwWVPy7BRXO6jB6GIgkdq4VPLksgVaYNpyotL4cgfhBywOcy/DgAowvmI2H 8fiAYu0FSzvXsuC75Y2523jrhhfM9JdnFHT9572ZeLzVYRQ0wz5lRJSbQIlDgw/vKbWs Aqrz/8u2PnUDT6SBJXbHo/kCNotDIdWcB4b0b3/Cb458LunXQ0lcPbpEmCYO8kivjoMB Wt3w== X-Gm-Message-State: AOAM531tgjupoeGEx2YxU0Tt2yGDwTBLgJdDkZW6uSMnyIoozDORzruL 3+wMSa35/1zAUFAr99hxDGjaearxAkY= X-Google-Smtp-Source: ABdhPJyUY/e7hayUL7G7Eq59Fyvr7OZlFnTYJ1VLkkBIYt+PNllMVLmuvMcfI4YORS6mpoJScd/nJg== X-Received: by 2002:a5d:5083:: with SMTP id a3mr28073628wrt.38.1617013095286; Mon, 29 Mar 2021 03:18:15 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.110]) by smtp.gmail.com with ESMTPSA id 135sm25291792wma.44.2021.03.29.03.18.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Mar 2021 03:18:15 -0700 (PDT) From: zimoun To: 47464@debbugs.gnu.org Subject: [PATCH 4/8] scripts: edit: Replace 'args-fold*' by 'parse-command-line'. Date: Mon, 29 Mar 2021 12:18:02 +0200 Message-Id: <20210329101806.54004-4-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210329101806.54004-1-zimon.toutoune@gmail.com> References: <20210329101806.54004-1-zimon.toutoune@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 47464 Cc: zimoun X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * guix/scripts/edit.scm (define-command): Replace 'args-fold*' by 'parse-command-line'. --- guix/scripts/edit.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/guix/scripts/edit.scm b/guix/scripts/edit.scm index 49c9d945b6..b4c0507591 100644 --- a/guix/scripts/edit.scm +++ b/guix/scripts/edit.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015, 2016, 2019, 2020 Ludovic Courtès ;;; Copyright © 2015 Mathieu Lirzin -;;; Copyright © 2020 Simon Tournier +;;; Copyright © 2020, 2021 Simon Tournier ;;; ;;; This file is part of GNU Guix. ;;; @@ -84,11 +84,9 @@ line." (define (parse-arguments) ;; Return the list of package names. - (args-fold* args %options - (lambda (opt name arg result) - (leave (G_ "~A: unrecognized option~%") name)) - cons - '())) + (parse-command-line args %options (list (list)) + #:build-options? #f + #:argument-handler cons)) (with-error-handling (let* ((specs (reverse (parse-arguments))) -- 2.30.1 From debbugs-submit-bounces@debbugs.gnu.org Mon Mar 29 06:18:31 2021 Received: (at 47464) by debbugs.gnu.org; 29 Mar 2021 10:18:31 +0000 Received: from localhost ([127.0.0.1]:47909 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lQoyc-0008Jq-Vu for submit@debbugs.gnu.org; Mon, 29 Mar 2021 06:18:31 -0400 Received: from mail-wr1-f43.google.com ([209.85.221.43]:34594) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lQoyR-0008IY-Uk for 47464@debbugs.gnu.org; Mon, 29 Mar 2021 06:18:21 -0400 Received: by mail-wr1-f43.google.com with SMTP id j7so12289557wrd.1 for <47464@debbugs.gnu.org>; Mon, 29 Mar 2021 03:18:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4pnSw7IctYJsCOiJHUlF31q5Gdz6Z6kBPHoEZjIkNoU=; b=DjPKNWrEZpHrm1OSSE4IZtjsAZQsYcDLquA0DbRdz4/h+1Be6bRmVjns8r7zU2Xt7T M34o5Bw14VIcTXZ/BNB07D5qdEKfm8T+J6LosZ90gNzr215elCfkEaDwCOoiEj8WtAgD e3rV/iCOId0GHN+fA2L51RqUPbUEx1F/9FMHpvH7nI+Bgx682v9OMrgRk11NHe+WU7kO 3ZktEfhNLzDqsqIWfNpHfsUQ0azMGYjdYtmS7ix/5SaRUl2WDaGuTijd6NI4kdZIuAuZ oGn4cR4LoBj/G60C1MXule3r7tCqnCtjZxD9ugdH03lr01rszSE8hj3r6K2oKrWyM4vP Xx9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4pnSw7IctYJsCOiJHUlF31q5Gdz6Z6kBPHoEZjIkNoU=; b=P+BvZNpYSrSIL1YnQoA+yQ3qvuAjWygJBOPVvuxpyvfpNtccU6Lfv+N9/2hK4W+Wxo V6IzHA3fZiFx39Qb28ulo57uGouTaGD2LaxkGJbwlKRdq58P1UOGWBJaMrSPI20umbFw O8hai+O93zci2v1tRnKic6eE9pBrIAGQFAC8mafy16YI5+7nsPT0JXCc2APQLEVUO72Z /9YSFUUPpu9n7/Dzx3p/ooJcnZMIpAbsqOU8rtv+H8rsN+cf3HBbqQcZtKczW0C9lSTj WR32SYBBE97foRjjAN2C1/UH0xP/JOeDDTZZVk6Vf7i4EcZlax5ihPnCL4v2itJTLEjM KHRA== X-Gm-Message-State: AOAM532GRSMsmq5usDwB+J3t/Vf3+2j0A/6xIHMpD+lxEm4q61scUb+r t8ASw+y5wM+7Zbr3wCKeer9fJEHsi1c= X-Google-Smtp-Source: ABdhPJzkydzSXi7W6cfOnURaqhRkyfGFQ3NY7JA30DBZgB6KFWtZ5N8sx338XtU//bDiqyMjhSybnw== X-Received: by 2002:adf:d1cd:: with SMTP id b13mr27549966wrd.47.1617013094396; Mon, 29 Mar 2021 03:18:14 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.110]) by smtp.gmail.com with ESMTPSA id 135sm25291792wma.44.2021.03.29.03.18.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Mar 2021 03:18:14 -0700 (PDT) From: zimoun To: 47464@debbugs.gnu.org Subject: [PATCH 2/8] scripts: discover: Replace 'args-fold*' by 'parse-command-line'. Date: Mon, 29 Mar 2021 12:18:00 +0200 Message-Id: <20210329101806.54004-2-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210329101806.54004-1-zimon.toutoune@gmail.com> References: <20210329101806.54004-1-zimon.toutoune@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 47464 Cc: zimoun X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * guix/scripts/discover.scm (define-command): Replace 'args-fold*' by 'parse-command-line'. --- guix/scripts/discover.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/guix/scripts/discover.scm b/guix/scripts/discover.scm index 6aade81ed1..be1eaa6e95 100644 --- a/guix/scripts/discover.scm +++ b/guix/scripts/discover.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2020 Mathieu Othacehe +;;; Copyright © 2021 Simon Tournier ;;; ;;; This file is part of GNU Guix. ;;; @@ -127,12 +128,11 @@ to synchronize with the writer." (synopsis "discover Guix related services using Avahi") (with-error-handling - (let* ((opts (args-fold* args %options - (lambda (opt name arg result) - (leave (G_ "~A: unrecognized option~%") name)) - (lambda (arg result) - (leave (G_ "~A: extraneous argument~%") arg)) - %default-options)) + (let* ((opts (parse-command-line args %options (list %default-options) + #:build-options? #f + #:argument-handler + (lambda (arg result) + (leave (G_ "~A: extraneous argument~%") arg)))) (cache (assoc-ref opts 'cache)) (publish-file (publish-file cache))) (parameterize ((%publish-file publish-file)) -- 2.30.1 From debbugs-submit-bounces@debbugs.gnu.org Mon Mar 29 06:18:31 2021 Received: (at 47464) by debbugs.gnu.org; 29 Mar 2021 10:18:31 +0000 Received: from localhost ([127.0.0.1]:47911 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lQoyd-0008Jy-9T for submit@debbugs.gnu.org; Mon, 29 Mar 2021 06:18:31 -0400 Received: from mail-wr1-f46.google.com ([209.85.221.46]:41945) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lQoyT-0008Ic-9h for 47464@debbugs.gnu.org; Mon, 29 Mar 2021 06:18:22 -0400 Received: by mail-wr1-f46.google.com with SMTP id b9so12235537wrt.8 for <47464@debbugs.gnu.org>; Mon, 29 Mar 2021 03:18:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=jACp6WVdik7pp5UW1CETJgM495WjLkuhCm5/rwSK0Dg=; b=nMmHNTR77eajRGoNRSyWx4QfNr3OdVts8IJBMBGSknsAUm8BlchusNo4zEMVcCK+/o qAheMwc/pKofhVoQ3cFvGhsC/IxD5hJzi0yB2cqCcBJv01Xa3VEFc2lLUuPzDgFOMcdR vWuX8IZbl1rXqmyHfyP55vLZ+AiOhLFCkcL6b/voqM/AgQJ63BmPD0/vA3r4sSZRhBVM ao+nj1LyfaDsCU+Av3odJXQmTA1BJVskaAwRd+rigTIQUTTyc4+coZPTRK7C5WpqwYba jEtAUfE+n7hQXbEF+gFjrXehZSoNGGcxGCa4qLcRmWvXVGZM44e1BI2I4GIj2owJnxbn +ysA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=jACp6WVdik7pp5UW1CETJgM495WjLkuhCm5/rwSK0Dg=; b=U6PIzBl8jLfTc8+GJ2DtxlQlnox1iWbtFLjeJIUQB3UWm+L8wL2Q3rRxak8HkSB3P9 Rk5t7Mkyz7OpwqTmLvSMhdy6Nece0a6sXPE3+e2rwDwPU4WHb4am35sfoQgb9DS/cxTA BDWzvVFDPwj1o9uHZRWxBtJeh7fYJ/gO5rc0pTBDbpUebrwK6CaUbvz7Np6TzQQFqGKp JHClZ6jUrTmS7e40ztsIKUtGz7jrDNHeU41aLMRyYzxaea3iAbpo1RduooQ6zyL4/XJt 6yXx2DsKwH0qu013MTbuCpd66CFchuRdM/BKtKYvo/R9l/D0jHo220q2BEGqmWAX+Hhm U8Ig== X-Gm-Message-State: AOAM533Y+BEBqDB6b9GNsyZRVynBc+Aj/1ZIWZSmTaFvZWAnO710xGIJ VqFkDGm4emsFHxYnP4gfhMMhwPiHvxg= X-Google-Smtp-Source: ABdhPJyeLUXISiNEbuX7F353gcoEV+ZbsAZbRvXQCEyJz+F+3cJkfQmOOCqhXRgT6IuzNQLBXDkwuA== X-Received: by 2002:adf:f948:: with SMTP id q8mr28030686wrr.296.1617013095784; Mon, 29 Mar 2021 03:18:15 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.110]) by smtp.gmail.com with ESMTPSA id 135sm25291792wma.44.2021.03.29.03.18.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Mar 2021 03:18:15 -0700 (PDT) From: zimoun To: 47464@debbugs.gnu.org Subject: [PATCH 5/8] scripts: publish: Replace 'args-fold*' by 'parse-command-line'. Date: Mon, 29 Mar 2021 12:18:03 +0200 Message-Id: <20210329101806.54004-5-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210329101806.54004-1-zimon.toutoune@gmail.com> References: <20210329101806.54004-1-zimon.toutoune@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 47464 Cc: zimoun X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * guix/scripts/publish.scm (define-command): Replace 'args-fold*' by 'parse-command-line'. --- guix/scripts/publish.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/guix/scripts/publish.scm b/guix/scripts/publish.scm index fa85088ed0..39bb224cad 100644 --- a/guix/scripts/publish.scm +++ b/guix/scripts/publish.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2020 by Amar M. Singh ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2020 Maxim Cournoyer +;;; Copyright © 2021 Simon Tournier ;;; ;;; This file is part of GNU Guix. ;;; @@ -1117,12 +1118,11 @@ methods, return the applicable compression." (synopsis "publish build results over HTTP") (with-error-handling - (let* ((opts (args-fold* args %options - (lambda (opt name arg result) - (leave (G_ "~A: unrecognized option~%") name)) - (lambda (arg result) - (leave (G_ "~A: extraneous argument~%") arg)) - %default-options)) + (let* ((opts (parse-command-line args %options (list %default-options) + #:build-options? #f + #:argument-handler + (lambda (arg result) + (leave (G_ "~A: extraneous argument~%") arg)))) (advertise? (assoc-ref opts 'advertise?)) (user (assoc-ref opts 'user)) (port (assoc-ref opts 'port)) -- 2.30.1 From debbugs-submit-bounces@debbugs.gnu.org Mon Mar 29 06:18:32 2021 Received: (at 47464) by debbugs.gnu.org; 29 Mar 2021 10:18:32 +0000 Received: from localhost ([127.0.0.1]:47913 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lQoyd-0008K5-Lw for submit@debbugs.gnu.org; Mon, 29 Mar 2021 06:18:32 -0400 Received: from mail-wr1-f51.google.com ([209.85.221.51]:34606) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lQoyT-0008Id-Ql for 47464@debbugs.gnu.org; Mon, 29 Mar 2021 06:18:22 -0400 Received: by mail-wr1-f51.google.com with SMTP id j7so12289640wrd.1 for <47464@debbugs.gnu.org>; Mon, 29 Mar 2021 03:18:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=i92BeYp5dlKfUCj1SjM/A/+nEeRsk/lR0aFtiaxZHZs=; b=aqUuZLY3hjqt0+XYZmeRKKqFJCpqrURX62vMKENFPxCWnZ8PLRXps4f8GmnDXu9Ubo KgA6hz8beqhmH5ZvoiNO/g/leLByrr/TCFqKt8idjNm8t/SIFqqLtanVwhxGfuT7huVr Glt8mownVuypapPTjy9eZiGkctROHrDoduLqxEyM5Q6lJcs4LRU8aHWyVYqW9cWBJfRi bP3ocE6kqDJ/YCaQfgFt6zdRkAEmQCCYIS4+2PBgkht8DhieDbg/A1NKDATJRPzG6jzO FagVtMsHr14a+GURxjenuutRcuBpd+G018SWLQ3w1ZJrYrTw54EqR9dWag+8jYpF6rJ8 7ncA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=i92BeYp5dlKfUCj1SjM/A/+nEeRsk/lR0aFtiaxZHZs=; b=ZTUqvsJBA0vJ4+bRNQ577MMCnbJmtxSFP5ugiVPXM4MCuoDMLiaXZjubgjG49/F1tG L+CBreyp5XBZJDaYS3DPBgaLuDlqra17wPrsAPkrNiQS2P6iqqm2YXCfU7KnGkwL3vcA Itr3/i4ED7UC5qDHeJF2Od5m0taoqRAsq+15icLpDOTtDRux9Gfm8kHJAE1ta10+/6m1 E1bftBwGHesF8BMrGZuOVVwuZJYZ8uZ3Z8jEGPG4zOKCxx3VxDjawX5N1Gf6LlZdR4zH oIdLYbiKi8eeypVgZGC3xRiKszwJYvtXacKAiH/9OrVjkNs088nmkKgsVi/jso15N2vt F0aQ== X-Gm-Message-State: AOAM531imw433GcKiyXq9xrwFFNL/m9l/qXeDkDmuvl14taJrDyhFM9S ONDNHP+j2gUVvVoTwuQLlv5OOfo17N8= X-Google-Smtp-Source: ABdhPJxV0qdjJOOr5qn43F4p0dBnr399BVPhQShvpdXolDgyBsHb6VZPsGghb528rbeF5Jtz8vSiVg== X-Received: by 2002:a5d:6c6a:: with SMTP id r10mr27845566wrz.42.1617013096333; Mon, 29 Mar 2021 03:18:16 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.110]) by smtp.gmail.com with ESMTPSA id 135sm25291792wma.44.2021.03.29.03.18.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Mar 2021 03:18:15 -0700 (PDT) From: zimoun To: 47464@debbugs.gnu.org Subject: [PATCH 6/8] scripts: repl: Replace 'args-fold*' by 'parse-command-line'. Date: Mon, 29 Mar 2021 12:18:04 +0200 Message-Id: <20210329101806.54004-6-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210329101806.54004-1-zimon.toutoune@gmail.com> References: <20210329101806.54004-1-zimon.toutoune@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 47464 Cc: zimoun X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * guix/scripts/repl.scm (define-command): Replace 'args-fold*' by 'parse-command-line'. --- guix/scripts/repl.scm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/guix/scripts/repl.scm b/guix/scripts/repl.scm index 9f20803efc..50d18c7760 100644 --- a/guix/scripts/repl.scm +++ b/guix/scripts/repl.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018, 2019, 2020 Ludovic Courtès -;;; Copyright © 2020 Simon Tournier +;;; Copyright © 2020, 2021 Simon Tournier ;;; Copyright © 2020 Konrad Hinsen ;;; ;;; This file is part of GNU Guix. @@ -143,14 +143,13 @@ call THUNK." (synopsis "read-eval-print loop (REPL) for interactive programming") (define opts - (args-fold* args %options - (lambda (opt name arg result) - (leave (G_ "~A: unrecognized option~%") name)) + (parse-command-line args %options (list %default-options) + #:build-options? #f + #:argument-handler (lambda (arg result) (append `((script . ,arg) (ignore-dot-guile? . #t)) - result)) - %default-options)) + result)))) (define user-config (and=> (getenv "HOME") -- 2.30.1 From debbugs-submit-bounces@debbugs.gnu.org Mon Mar 29 06:18:32 2021 Received: (at 47464) by debbugs.gnu.org; 29 Mar 2021 10:18:32 +0000 Received: from localhost ([127.0.0.1]:47915 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lQoye-0008KE-4F for submit@debbugs.gnu.org; Mon, 29 Mar 2021 06:18:32 -0400 Received: from mail-wr1-f41.google.com ([209.85.221.41]:37449) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lQoyU-0008If-8M for 47464@debbugs.gnu.org; Mon, 29 Mar 2021 06:18:22 -0400 Received: by mail-wr1-f41.google.com with SMTP id x16so12250529wrn.4 for <47464@debbugs.gnu.org>; Mon, 29 Mar 2021 03:18:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bUCKUsBcKKwSXvAaa7Y6H8+p+39h3xwgBnCnFc0JwZE=; b=U02m8/mB5oIZ4LqNrxeidTYqXojsMVhbtBXAF/rAD/hoIXC7DUk1xLYiG3qrUNFQHB xlCwykEUtxduVube6UWs8LbKzlNMVHIOR1mIPgdW+oe57SYHwqzwee6zDRRHkcbqPzco g5M1hBrobmxaRMc9dCwqbHRqluOvGnAWvp0Jd7PwFfJULDKfT0QHve4au4ph7aAR5FeB ru9wfbi3O00ko1KAxVizouTmyfBH9VQURyb++NxQcHSoZ70S3PSm7G5hZeML6AVWvj5N dg08lI88juCQ2aMZv5MVNuohR6T0B9fHeLIJ45whQsaYHXT0wOwxvhq+u/XNwzTd3HfF pKVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=bUCKUsBcKKwSXvAaa7Y6H8+p+39h3xwgBnCnFc0JwZE=; b=P/VudlG1wumySbOq6J/1vv5tNp7fF1HMCMw2HamY3A7s3ubw0Rul1Xf6plqFojjeG+ IA6V6r+Toia3FoR9zP1gXKhdGrlpq6LIGkyWiMQ2W0clneYnJ/NxH674/q2qLYnhJyRU 8yVemJDQ3KTXRHBbLQcg36ZPQlMkf9XTVQLbg1FLS3n/hRpzfQDQEEBaQp0DDak0nbWR 4cqo/6QtJXZNLdkpWP3u52YB7DQxDHne3jkJTANFbJ2rrON2aWGcCs/Fg3mLrSmGKoS1 oYnuk5RQsUbLwOYvpyIoefp+rvuXXakH2uT9VVU5g4TP2I8qA/G7sGOVpKEtzDt7G+vB RMrg== X-Gm-Message-State: AOAM533T+bqh0ZYHG8+c7SKWVMLpiHGiTK54oMko1XbVTJ9ptHDWy3Ej LQa4XnVgk+CD82u9DBxEw9AJLk8Bbdo= X-Google-Smtp-Source: ABdhPJx3RomO7Fx0cdxsJsmo8rwylgULGPW4Nq93mRK8dp6YYPR6Dt1MTfC9NOtSvoljwTvxH8oCdw== X-Received: by 2002:adf:ea8b:: with SMTP id s11mr28682566wrm.413.1617013096742; Mon, 29 Mar 2021 03:18:16 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.110]) by smtp.gmail.com with ESMTPSA id 135sm25291792wma.44.2021.03.29.03.18.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Mar 2021 03:18:16 -0700 (PDT) From: zimoun To: 47464@debbugs.gnu.org Subject: [PATCH 7/8] scripts: search: Replace 'args-fold*' by 'parse-command-line'. Date: Mon, 29 Mar 2021 12:18:05 +0200 Message-Id: <20210329101806.54004-7-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210329101806.54004-1-zimon.toutoune@gmail.com> References: <20210329101806.54004-1-zimon.toutoune@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 47464 Cc: zimoun X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * guix/scripts/search.scm (define-command): Replace 'args-fold*' by 'parse-command-line'. --- guix/scripts/search.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/guix/scripts/search.scm b/guix/scripts/search.scm index 0c9e6af07b..27b9da5278 100644 --- a/guix/scripts/search.scm +++ b/guix/scripts/search.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019, 2020 Ludovic Courtès +;;; Copyright © 2021 Simon Tournier ;;; ;;; This file is part of GNU Guix. ;;; @@ -66,11 +67,9 @@ This is an alias for 'guix package -s'.\n")) result)) (define opts - (args-fold* args %options - (lambda (opt name arg . rest) - (leave (G_ "~A: unrecognized option~%") name)) - handle-argument - '())) + (parse-command-line args %options (list (list)) + #:build-options? #f + #:argument-handler handle-argument)) (unless (assoc-ref opts 'query) (leave (G_ "missing arguments: no regular expressions to search for~%"))) -- 2.30.1 From debbugs-submit-bounces@debbugs.gnu.org Mon Mar 29 06:18:32 2021 Received: (at 47464) by debbugs.gnu.org; 29 Mar 2021 10:18:32 +0000 Received: from localhost ([127.0.0.1]:47917 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lQoye-0008KM-Gs for submit@debbugs.gnu.org; Mon, 29 Mar 2021 06:18:32 -0400 Received: from mail-wr1-f53.google.com ([209.85.221.53]:46689) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lQoyU-0008Ig-ND for 47464@debbugs.gnu.org; Mon, 29 Mar 2021 06:18:23 -0400 Received: by mail-wr1-f53.google.com with SMTP id v4so12219460wrp.13 for <47464@debbugs.gnu.org>; Mon, 29 Mar 2021 03:18:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=mrANYjHGVYi7YBCcZSQ9njXZAdYmv1Bkmh1aTjEaByM=; b=CyDNbeLPPU+G4QreFElcH4HJnBep10cwGIe/QFABEjcpPWULYvgPDCPbicuBEg8sW0 mHRXarM+Dg3R741/xMHw/8YjEsA/9ZKmEvjGVq3zIrhPCplzMk2Hz4OZ4WjWqrx+SWdf U6SAWcEkBKZjXB5cCn2kGuz8gI4eYNC+n0rlKp64Q6TlH75dATsBoz4KyM3uJeZveA3z V6UL8bYyJRqxu5clDsl3jiLfNBor6I2SZj543vXsVN+vBwmO6ycl4aNykgTGWkYgqtvd vFRN1DPGrdML5wz1jBOF9b3hvUoN1keazNdezU7AhAlThBE2FhtW8vvtwsm7IXpk4eBo 7mQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=mrANYjHGVYi7YBCcZSQ9njXZAdYmv1Bkmh1aTjEaByM=; b=jsTNnqmg4o9IdmEdJHgD1YxDAQxC+gUjz+zruu3EFy1RvmNx66iQLgA13RFzqmMC/H Vvrc8xrPfeEaGMc9UDAfpMz+RZonzaF0jxPlACvTMwFIX+O0xs2BPgoSmEDgNjC+pwHI L/mK6U+65+fMRabqow5q76cV1TUy3UBX+iuK5CHwt2EUDzM15t4cj5Ef2zVH5BXgtry2 0Mr2lPIB8O/m/l+6rTEF/7zVKiCeE1NHhGDu8PPm01BYlHgOT7LF3yPCsgOi3hRuIe9t MG8UIizSsvQBysQHqEQzYApJXqCIRapDNB3CoplpMzrKfWdo7+Ih9uXFUL2Bd/VJwjOv v/KA== X-Gm-Message-State: AOAM530OBgflbenR26j3Tuh0FIykMioN4roaV948eOofA9VnGAFw+Nzh nJCCLOMZzCusUp3bLSlPf1s9dvFQb8o= X-Google-Smtp-Source: ABdhPJy3Dqblf64TlX0QpVj3owY4k6NvH51Nvwc1GAWYXf2iSNEeGtlt9MNruIS7bq/Ajw3Km/YEzA== X-Received: by 2002:a5d:698e:: with SMTP id g14mr27067949wru.127.1617013097157; Mon, 29 Mar 2021 03:18:17 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.110]) by smtp.gmail.com with ESMTPSA id 135sm25291792wma.44.2021.03.29.03.18.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Mar 2021 03:18:16 -0700 (PDT) From: zimoun To: 47464@debbugs.gnu.org Subject: [PATCH 8/8] scripts: show: Replace 'args-fold*' by 'parse-command-line'. Date: Mon, 29 Mar 2021 12:18:06 +0200 Message-Id: <20210329101806.54004-8-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210329101806.54004-1-zimon.toutoune@gmail.com> References: <20210329101806.54004-1-zimon.toutoune@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 47464 Cc: zimoun X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * guix/scripts/show.scm (define-command): Replace 'args-fold*' by 'parse-command-line'. --- guix/scripts/show.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/guix/scripts/show.scm b/guix/scripts/show.scm index 535d03c1a6..c747eedd21 100644 --- a/guix/scripts/show.scm +++ b/guix/scripts/show.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2019 Simon Tournier +;;; Copyright © 2019, 2021 Simon Tournier ;;; ;;; This file is part of GNU Guix. ;;; @@ -66,11 +66,9 @@ This is an alias for 'guix package --show='.\n")) result)) (define opts - (args-fold* args %options - (lambda (opt name arg . rest) - (leave (G_ "~A: unrecognized option~%") name)) - handle-argument - '())) + (parse-command-line args %options (list (list)) + #:build-options? #f + #:argument-handler handle-argument)) (unless (assoc-ref opts 'query) (leave (G_ "missing arguments: no package to show~%"))) -- 2.30.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 01 08:57:37 2021 Received: (at 47464-done) by debbugs.gnu.org; 1 Apr 2021 12:57:37 +0000 Received: from localhost ([127.0.0.1]:56562 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lRwtE-0000wM-QS for submit@debbugs.gnu.org; Thu, 01 Apr 2021 08:57:37 -0400 Received: from eggs.gnu.org ([209.51.188.92]:36650) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lRwtD-0000w8-4L for 47464-done@debbugs.gnu.org; Thu, 01 Apr 2021 08:57:35 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:53956) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lRwt7-0003zx-Sg; Thu, 01 Apr 2021 08:57:29 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=55172 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1lRwt7-0006Uf-BO; Thu, 01 Apr 2021 08:57:29 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: zimoun Subject: Re: bug#47464: [PATCH 0/8] scripts: Allow option hint for various subcommands. References: <20210329101638.53217-1-zimon.toutoune@gmail.com> Date: Thu, 01 Apr 2021 14:57:27 +0200 In-Reply-To: <20210329101638.53217-1-zimon.toutoune@gmail.com> (zimoun's message of "Mon, 29 Mar 2021 12:16:38 +0200") Message-ID: <87k0pm88nc.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47464-done Cc: 47464-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Hi! zimoun skribis: > The patch set replaces all the 'args-fold*' by 'parse-command-line'. Doi= ng > so, all the option typos are hinted. Yay! > It could be only one commit (squashing) but it appeared me easier in case > something is wrong; I expect nothing! :-) > > I have checked trying various combinations. Note that > "tests/guix-describe.sh" is SKIP because the test does not work when using > worktree. > > Well, a double-check is really welcome. :-) All the tests pass, LGTM! > All the remaining subcommands---authenticate, container, git, import, off= load > and substitute---needs a rewriting of how they parse the command line > arguments. Future work. Applied, thanks! Ludo=E2=80=99. From unknown Mon Aug 18 14:25:49 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Fri, 30 Apr 2021 11:24:07 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator