From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Christoph Badura Newsgroups: gmane.emacs.bugs Subject: bug#72341: VC: CVS template lines not stripped when committing Date: Sun, 28 Jul 2024 21:48:30 +0200 Message-ID: <20240728194830.GB19989@irregular-apocalypse.k.bsd.de> References: <20240728123256.GW9440@irregular-apocalypse.k.bsd.de> <86plqxz9t0.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="1791"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Mutt/1.5.20 (2009-06-14) To: 72341@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sun Jul 28 21:49:19 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 1sY9tO-0000HO-9S for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 28 Jul 2024 21:49:18 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sY9t1-0000F4-H6; Sun, 28 Jul 2024 15:48:55 -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 1sY9sy-0000Ee-0k for bug-gnu-emacs@gnu.org; Sun, 28 Jul 2024 15:48:53 -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 1sY9sw-0001DV-8l for bug-gnu-emacs@gnu.org; Sun, 28 Jul 2024 15:48:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=In-Reply-To:MIME-Version:References:From:Date:To:Subject; bh=Ax90+qIGqbfAz7ZbUaLu5z2RqyuFTef7aEbG4Mx+Oc0=; b=mKQDG94uKaOgWpoFgOv8jrjJaXdKWmjCqSvw8XBAan1Heibv4Lg75tBXkuuB3iP53wGZRAVlnalRSmu3sJmoFRpBtbangCqmKGT2vJE86NbkRhc1/KI9hwiIcAp5fwaTPw4XCFCcUV+sABTEUmBaVeQzusxXIRNyNplwmSyv+Zrf/xgme2TdDhKtuiTw72cnzV4K6EMW+auuOfzswfQNefI5HxUITam3Yt+7Q1Zkthh63bPOISG8tGIjoxU9zgR3PzWY/IWaJoh9Sm+cqZvVOIjnJBChmNXqDkM552bfr0/L+KFrk1KL9lad67ZN8LV58zEJ4OJdi+FejDXZwwzSRw==; Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sY9t7-00026e-Vf for bug-gnu-emacs@gnu.org; Sun, 28 Jul 2024 15:49:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Christoph Badura Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 28 Jul 2024 19:49:01 +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.17221961278051 (code B ref 72341); Sun, 28 Jul 2024 19:49:01 +0000 Original-Received: (at 72341) by debbugs.gnu.org; 28 Jul 2024 19:48:47 +0000 Original-Received: from localhost ([127.0.0.1]:44369 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sY9st-00025n-3d for submit@debbugs.gnu.org; Sun, 28 Jul 2024 15:48:47 -0400 Original-Received: from moe.eta.tal.de ([195.8.227.228]:59286 helo=moc.eta.tal.de) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sY9sq-00025c-Bj for 72341@debbugs.gnu.org; Sun, 28 Jul 2024 15:48:45 -0400 Original-Received: from irregular-apocalypse.k.bsd.de (unknown [82.139.197.224]) by smtp.tal.de (Postfix) with ESMTP id F0E1D8000C65 for <72341@debbugs.gnu.org>; Sun, 28 Jul 2024 21:48:30 +0200 (CEST) Original-Received: by irregular-apocalypse.k.bsd.de (Postfix, from userid 201) id B5F35918B6; Sun, 28 Jul 2024 21:48:30 +0200 (CEST) Content-Disposition: inline In-Reply-To: <86plqxz9t0.fsf@gnu.org> 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:289491 Archived-At: Resending the message, because debbugs.gnu.org wasn't cc'ed on the original reply. On Sun, Jul 28, 2024 at 08:49:15PM +0300, Eli Zaretskii wrote: > 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. CVS only adds the template file and later strips the "CVS: " lines if you actually edit the commit message in an editor (which is invoked by cvs). I.e. if you do not pass a commit message via "cvs ci -m'message'" or "cvs ci -F messagefile". > 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? When invoked as "cvs ci -m" (or "cvs ci -F") cvs uses the commit message *as is*. With either option, cvs itself doesn't add the template file to the commit message and hence doesn't have to do any stripping. log-edit-insert-cvs-template adds the CVS template file to the commit message outside of cvs. Therefore log-edit has to strip the "CVS: " lines outside of cvs too. Is that clearer? --chris --chris