From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.bugs Subject: bug#72341: VC: CVS template lines not stripped when committing Date: Sun, 28 Jul 2024 20:49:15 +0300 Message-ID: <86plqxz9t0.fsf@gnu.org> References: <20240728123256.GW9440@irregular-apocalypse.k.bsd.de> Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="16429"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 72341@debbugs.gnu.org To: Christoph Badura Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sun Jul 28 19:50:16 2024 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1sY829-000449-LQ for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 28 Jul 2024 19:50:13 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sY81p-00039d-He; Sun, 28 Jul 2024 13:49:53 -0400 Original-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 1sY81n-00039D-JS for bug-gnu-emacs@gnu.org; Sun, 28 Jul 2024 13:49:51 -0400 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sY81m-0006Xy-En for bug-gnu-emacs@gnu.org; Sun, 28 Jul 2024 13:49:51 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=References:In-Reply-To:From:Date:To:Subject; bh=alUaeP0P6CYj0kXdxRg9Uc+zYyKbZb9YIgnj5JNalqM=; b=anl56mB++SQsZ1CbWV+TEAK6XJH5dtjx2VUhLi920NJuF535ak86Hmk/WTd17jyppaS3BudFuIWkFPoPzLd2Y+kYO1V2Qu75VgBcntdQwoXmgec8kKKtZf74TwD0iJGwObSzzbUi7blYPeyG0X/qAXV8jC7+Lcl+CwFZC1nz/kQ2L4hn14uCbjzvM780wpNhDbiw9RuSUhMNrms5KNUPvPb2VlFEaDyv6+3W8ZksnX7CU1ecWhQOkHkUcw/qpTB3BCTMwRjVFIvvX0G4TWWBxdMZbf+2ZwlceAcS9mmbeiBunD2qeBPIo++grJH8fNbgiuL3F42GYLpXWiB5U8rERg==; Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sY81y-0007e7-3A for bug-gnu-emacs@gnu.org; Sun, 28 Jul 2024 13:50:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 28 Jul 2024 17:50:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72341 X-GNU-PR-Package: emacs Original-Received: via spool by 72341-submit@debbugs.gnu.org id=B72341.172218897829347 (code B ref 72341); Sun, 28 Jul 2024 17:50:02 +0000 Original-Received: (at 72341) by debbugs.gnu.org; 28 Jul 2024 17:49:38 +0000 Original-Received: from localhost ([127.0.0.1]:44332 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sY81Z-0007dG-Mc for submit@debbugs.gnu.org; Sun, 28 Jul 2024 13:49:38 -0400 Original-Received: from eggs.gnu.org ([209.51.188.92]:36216) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sY81Y-0007d4-9z for 72341@debbugs.gnu.org; Sun, 28 Jul 2024 13:49:37 -0400 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sY81G-0006Vx-CZ; Sun, 28 Jul 2024 13:49:18 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date: mime-version; bh=alUaeP0P6CYj0kXdxRg9Uc+zYyKbZb9YIgnj5JNalqM=; b=nHp2mSBn53Ti Rpn9/SaHu/N1+A14syjRBWq8gBCfIotrTJfythJg433IrMaanR9r4bFuCia1oAXflyQOLamiFk3Jg D5jcOV2JtKHxNEjuX2VzlMXBiiMxQmdsoo4ttAumfTBych6x5o61fi2I7b8U9V2CKkaJ3LKw98yDP RsSMIj6xhXtcEAON8EAtN9A+jnspNks4mUI/zDA4kn5wZabfLeh9bMIVaY9VttY8qbAvZ4gdHfyk8 uN+YWvYlsX1emnaM4Bz4rRFpgP3G/7WHGK4pe93CbBuLmo/37ojm3qRxRXw/fhugxh0szZb5DQ68d hXGHMVCp2fdN86LxzPEzfA==; In-Reply-To: <20240728123256.GW9440@irregular-apocalypse.k.bsd.de> (message from Christoph Badura on Sun, 28 Jul 2024 14:32:57 +0200) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:289488 Archived-At: > Date: Sun, 28 Jul 2024 14:32:57 +0200 > From: Christoph Badura > > CVS strips all lines beginning with "CVS: " after editing the commit > message. This is not done when using VC. > > Specifically log-edit-hook's default includes log-edit-insert-cvs-template > causing the CVS/Template file to be inserted. However, the lines starting > with "CVS: " aren't stripped out when log-edit-done is called. The change > is then committed with "cvs ci -m" which does not strip these line, as the > template file is only loaded when cvs invokes an editor to edit the commit > message. > > This behaviour is very annoying when working in a project that makes use of > CVS templates (e.g. NetBSD). It would be nice, if VC behaved by default > like CVS does. I'm confused by your description. At the beginning you say: CVS strips all lines beginning with "CVS: " after editing the commit message. But later you say: However, the lines starting with "CVS: " aren't stripped out when log-edit-done is called. The change is then committed with "cvs ci -m" which does not strip these line, as the template file is only loaded when cvs invokes an editor to edit the commit message. If "cvs ci -m" doesn't strip the "CVS: " lines, then when and how does the stripping you describe at the beginning happens? And what does the last part of the last sentence above, about the template file being loaded when CVS invokes an editor, has to do with this issue? Thanks.