From patchwork Sun Feb 26 20:56:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 47405 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 AD74516BD5; Sun, 26 Feb 2023 21:05:31 +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=-1.8 required=5.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS 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 BBFF816884 for ; Sun, 26 Feb 2023 21:05:28 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pWOCe-0007tM-Ee; Sun, 26 Feb 2023 16:05: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 1pWOCc-0007t0-JJ for guix-patches@gnu.org; Sun, 26 Feb 2023 16:05: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 1pWOCc-0000Mf-A0 for guix-patches@gnu.org; Sun, 26 Feb 2023 16:05:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pWOCb-0004Gw-TW for guix-patches@gnu.org; Sun, 26 Feb 2023 16:05:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61825] [PATCH] etc: Default to variables in tempel's git-reference... et al. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 26 Feb 2023 21:05:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 61825 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61825@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.167744548516383 (code B ref -1); Sun, 26 Feb 2023 21:05:01 +0000 Received: (at submit) by debbugs.gnu.org; 26 Feb 2023 21:04:45 +0000 Received: from localhost ([127.0.0.1]:45146 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pWOCL-0004GA-5O for submit@debbugs.gnu.org; Sun, 26 Feb 2023 16:04:45 -0500 Received: from lists.gnu.org ([209.51.188.17]:49322) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pWOCH-0004Fv-OM for submit@debbugs.gnu.org; Sun, 26 Feb 2023 16:04:43 -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 1pWOCH-0007ro-Fx for guix-patches@gnu.org; Sun, 26 Feb 2023 16:04:41 -0500 Received: from mail-ed1-x541.google.com ([2a00:1450:4864:20::541]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pWOCF-0000Lp-VK for guix-patches@gnu.org; Sun, 26 Feb 2023 16:04:41 -0500 Received: by mail-ed1-x541.google.com with SMTP id eg37so17956547edb.12 for ; Sun, 26 Feb 2023 13:04:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:message-id:to:subject:date:from:from:to:cc:subject :date:message-id:reply-to; bh=7NwtAisOU4/EZ3fBW9sfszM8M5kbLVV08VHI6qICj0g=; b=qUwR6WZ8ANb0q85mXHdBK2UD5H5X/9p2MhD5C03uVHTSCgnw1JA4Nt7IuXxsqDhGjx khxvHD2w7VenQZd6qQmeEQcTrTA7s1BPWko3HGliaX7IMogPWpiGheTa1El62sNtxf48 sUYfW641/epENojnPYO1cLU1Yqp3rkkChalwR6CnOdzb9t86+2uwCwdCZ0K3BtzyISpP ZCfKYdasr2QpMvZM3CnUSl2kE3kU84QpUjGSfxNgk5M+sR9nd91ZagVBee4SzCfrjZDt AF7RxItCfXkXLR83xsDv38+xPRtYJfcgnrlLLd+0MpLYxlFxdhf6LxiPcxBxMo7f84Lq UGcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:message-id:to:subject:date:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=7NwtAisOU4/EZ3fBW9sfszM8M5kbLVV08VHI6qICj0g=; b=xUYcvMrcinNtVTSU4jytkh/vVVu9ZllRyEMmrOM//d2Xp182NWALVjDJmH/XLOx1dU sGSmUZGFzweVBuoAmroUtIEL4OEwJf6RCeDwEa3ykGqhvphcdbLid2+hI5HYuOomaDI1 yk7H4T20w1tvk5S7NQ8jygxTLLkizb86v9Doe6Yz7dtdA/qKhW4qciQuUs1NcTC9jo+F lP+RkB9twa6rwmpxAUXM5/KqexBdLFSt+G7yGzo876LhJhpLNK47E5YsbjyqA5bAObeZ 0rBvRkx1UZ4Y2ItxNj7ZQHacUiPNjuPorO6SM5m0ZDP8YPNxXMuaa6StwGJftyLL07b2 Qm4g== X-Gm-Message-State: AO0yUKWUvZL+hmJGY/X3uu44Us0JlMjGhSNObtSZSXS+gsCyUta1mnly 9YfzA4IBwjZgsGPx436PNm23rWNGY3tEeA== X-Google-Smtp-Source: AK7set/W/ZpP70iWn/io5b6nUwEvT5OejvQpSUhixtLNmODmoQsl8BY/m8LD0OgQInqA9rO2cskYiQ== X-Received: by 2002:aa7:c913:0:b0:4af:51dd:224e with SMTP id b19-20020aa7c913000000b004af51dd224emr18998456edt.4.1677445478181; Sun, 26 Feb 2023 13:04:38 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id r22-20020a50aad6000000b004af6a7e9131sm2322247edc.64.2023.02.26.13.04.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Feb 2023 13:04:37 -0800 (PST) From: Liliana Marie Prikler Date: Sun, 26 Feb 2023 21:56:33 +0100 Message-ID: <4ea107af9cb1e87412d22d44b44f2134394cc951.camel@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::541; envelope-from=liliana.prikler@gmail.com; helo=mail-ed1-x541.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-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 Since we encourage using variables rather than magic hashes in the commit fields, e.g. (commit version) and (commit commit), the default for tempel to use quoted strings is rather off. Thus, let the placeholder reflect actual usage. * etc/snippets/tempel/scheme-mode (git-reference...)[commit]: Use field name as placeholder and don't quote value. (svn-reference..., bzr-reference...)[revision]: Likewise. (hg-reference...)[changeset]: Likewise. --- etc/snippets/tempel/scheme-mode | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/etc/snippets/tempel/scheme-mode b/etc/snippets/tempel/scheme-mode index 54cb8e40a9..ef73a1e595 100644 --- a/etc/snippets/tempel/scheme-mode +++ b/etc/snippets/tempel/scheme-mode @@ -56,12 +56,12 @@ scheme-mode (git-reference... "(git-reference" n> "(url \"" p "\")" - n> "(commit \"" p "\"))") + n> "(commit " (p "commit") "))") (svn-reference... "(svn-reference" n> "(url \"" p "\")" - n> "(revision \"" p "\"))") + n> "(revision " (p "revision") "))") (cvs-reference... "(cvs-reference" @@ -72,12 +72,12 @@ scheme-mode (hg-reference... "(hg-reference" n> "(url \"" p "\")" - n> "(changeset \"" p "\"))") + n> "(changeset " (p "changeset") "))") (bzr-reference... "(bzr-reference" n> "(url \"" p "\")" - n> "(revision \"" p "\"))") + n> "(revision " (p "revision") "))") (:phases\ "#:phases (modify-phases %standard-phases" n> p ")")