From patchwork Tue Nov 10 09:16:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Neidhardt X-Patchwork-Id: 25049 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 EB83727BBF9; Tue, 10 Nov 2020 09:17:19 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9B49127BBF7 for ; Tue, 10 Nov 2020 09:17:19 +0000 (GMT) Received: from localhost ([::1]:33260 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kcPmA-0008V7-Rv for patchwork@mira.cbaines.net; Tue, 10 Nov 2020 04:17:18 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48512) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kcPlu-0008Ih-8v for guix-patches@gnu.org; Tue, 10 Nov 2020 04:17:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:53025) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kcPlt-0005sT-Ug for guix-patches@gnu.org; Tue, 10 Nov 2020 04:17:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kcPlt-0006Vy-PD for guix-patches@gnu.org; Tue, 10 Nov 2020 04:17:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#44547] [PATCH 1/2] etc: snippets: Fix package name extraction. References: <20201110090843.30309-1-mail@ambrevar.xyz> In-Reply-To: <20201110090843.30309-1-mail@ambrevar.xyz> Resent-From: Pierre Neidhardt Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 10 Nov 2020 09:17:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 44547 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 44547@debbugs.gnu.org Received: via spool by 44547-submit@debbugs.gnu.org id=B44547.160499980125007 (code B ref 44547); Tue, 10 Nov 2020 09:17:01 +0000 Received: (at 44547) by debbugs.gnu.org; 10 Nov 2020 09:16:41 +0000 Received: from localhost ([127.0.0.1]:36336 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kcPlY-0006VF-LM for submit@debbugs.gnu.org; Tue, 10 Nov 2020 04:16:40 -0500 Received: from relay7-d.mail.gandi.net ([217.70.183.200]:60209) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kcPlW-0006Uw-Vy for 44547@debbugs.gnu.org; Tue, 10 Nov 2020 04:16:39 -0500 X-Originating-IP: 90.92.160.122 Received: from localhost.localdomain (lfbn-idf2-1-1094-122.w90-92.abo.wanadoo.fr [90.92.160.122]) (Authenticated sender: mail@ambrevar.xyz) by relay7-d.mail.gandi.net (Postfix) with ESMTPSA id 7AF5F20013 for <44547@debbugs.gnu.org>; Tue, 10 Nov 2020 09:16:32 +0000 (UTC) From: Pierre Neidhardt Date: Tue, 10 Nov 2020 10:16:24 +0100 Message-Id: <20201110091625.3515-1-mail@ambrevar.xyz> X-Mailer: git-send-email 2.28.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/snippets/text-mode/guix-commit-message-add-package: Properly extract name when the diff contains a very short `define-public ...` above the actual new package. This can happen when the above package is a small inherited definition or cl/ecl package. --- etc/snippets/text-mode/guix-commit-message-add-package | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/snippets/text-mode/guix-commit-message-add-package b/etc/snippets/text-mode/guix-commit-message-add-package index 0dff2cbcf5..e54a06de7e 100644 --- a/etc/snippets/text-mode/guix-commit-message-add-package +++ b/etc/snippets/text-mode/guix-commit-message-add-package @@ -7,7 +7,7 @@ gnu: Add ${1:`(with-temp-buffer (magit-git-wash #'magit-diff-wash-diffs "diff" "--staged") (beginning-of-buffer) - (when (search-forward "(define-public " nil 'noerror) + (when (search-forward "+(define-public " nil 'noerror) (thing-at-point 'sexp 'no-properties)))`}. * `(car (magit-staged-files))` ($1): New variable. \ No newline at end of file From patchwork Tue Nov 10 09:16:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Neidhardt X-Patchwork-Id: 25048 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 A7DF427BBF9; Tue, 10 Nov 2020 09:17:09 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4F4DD27BBF7 for ; Tue, 10 Nov 2020 09:17:09 +0000 (GMT) Received: from localhost ([::1]:32864 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kcPm0-0008Km-GU for patchwork@mira.cbaines.net; Tue, 10 Nov 2020 04:17:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48516) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kcPlu-0008J8-Lf for guix-patches@gnu.org; Tue, 10 Nov 2020 04:17:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:53026) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kcPlu-0005sg-Bs for guix-patches@gnu.org; Tue, 10 Nov 2020 04:17:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kcPlu-0006W6-7x for guix-patches@gnu.org; Tue, 10 Nov 2020 04:17:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#44547] [PATCH 2/2] etc: snippets: Prefill Common Lisp package names. Resent-From: Pierre Neidhardt Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 10 Nov 2020 09:17:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 44547 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 44547@debbugs.gnu.org Received: via spool by 44547-submit@debbugs.gnu.org id=B44547.160499980125013 (code B ref 44547); Tue, 10 Nov 2020 09:17:02 +0000 Received: (at 44547) by debbugs.gnu.org; 10 Nov 2020 09:16:41 +0000 Received: from localhost ([127.0.0.1]:36338 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kcPlY-0006VI-TQ for submit@debbugs.gnu.org; Tue, 10 Nov 2020 04:16:41 -0500 Received: from relay7-d.mail.gandi.net ([217.70.183.200]:39477) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kcPlX-0006Ux-2d for 44547@debbugs.gnu.org; Tue, 10 Nov 2020 04:16:39 -0500 X-Originating-IP: 90.92.160.122 Received: from localhost.localdomain (lfbn-idf2-1-1094-122.w90-92.abo.wanadoo.fr [90.92.160.122]) (Authenticated sender: mail@ambrevar.xyz) by relay7-d.mail.gandi.net (Postfix) with ESMTPSA id B472720008 for <44547@debbugs.gnu.org>; Tue, 10 Nov 2020 09:16:32 +0000 (UTC) From: Pierre Neidhardt Date: Tue, 10 Nov 2020 10:16:25 +0100 Message-Id: <20201110091625.3515-2-mail@ambrevar.xyz> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201110091625.3515-1-mail@ambrevar.xyz> References: <20201110091625.3515-1-mail@ambrevar.xyz> 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/snippets/text-mode/guix-commit-message-add-cl-package: New file. --- .../text-mode/guix-commit-message-add-cl-package | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 etc/snippets/text-mode/guix-commit-message-add-cl-package diff --git a/etc/snippets/text-mode/guix-commit-message-add-cl-package b/etc/snippets/text-mode/guix-commit-message-add-cl-package new file mode 100644 index 0000000000..40f1bb2a5c --- /dev/null +++ b/etc/snippets/text-mode/guix-commit-message-add-cl-package @@ -0,0 +1,13 @@ +# -*- mode: snippet -*- +# name: guix-commit-message-add-cl-package +# key: addcl +# condition: git-commit-mode +# -- +gnu: Add ${1:`(with-temp-buffer + (magit-git-wash #'magit-diff-wash-diffs + "diff" "--staged") + (beginning-of-buffer) + (when (search-forward "+(define-public " nil 'noerror) + (thing-at-point 'sexp 'no-properties)))`}. + +* `(car (magit-staged-files))` (${1:$(replace-regexp-in-string "^sbcl" "cl" yas-text)}, ${1:$(replace-regexp-in-string "^sbcl" "ecl" yas-text)}, $1): New variables. \ No newline at end of file