From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Sean Whitton Newsgroups: gmane.emacs.bugs Subject: bug#60126: 30.0.50; vc-git-checkin: Offer to unstage conflicting changes Date: Sat, 24 Dec 2022 13:10:39 -0700 Message-ID: <87zgbc5zr4.fsf@melete.silentflame.com> References: <38d4d719-8f3c-9bb6-b141-f7e9ca66333c@yandex.ru> <871qovjabq.fsf@melete.silentflame.com> <4513ac99-76d1-cdd6-fcc9-59208b5002f3@yandex.ru> <87zgbih8wv.fsf@melete.silentflame.com> <392bbde0-9d6e-83c4-0639-af406e279ef1@yandex.ru> <87h6xqgg65.fsf@melete.silentflame.com> <87zgbh1xkn.fsf@melete.silentflame.com> <4910f545-d7b1-9f6b-8262-fd7fc89d589d@yandex.ru> <87h6xnasgn.fsf@melete.silentflame.com> <878riybwhy.fsf@melete.silentflame.com> <8735958spl.fsf@melete.silentflame.com> <87fsd47jbe.fsf@melete.silentflame.com> <31848fd3-db85-f1cc-e70b-eae71d854964@yandex.ru> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="29885"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: 60126-done@debbugs.gnu.org, juri@linkov.net To: Dmitry Gutov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sat Dec 24 21:11:36 2022 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 1p9Arj-0007Z2-6W for geb-bug-gnu-emacs@m.gmane-mx.org; Sat, 24 Dec 2022 21:11:33 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p9ArO-0000AT-J6; Sat, 24 Dec 2022 15:11:11 -0500 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 1p9ArG-0000AB-Tn for bug-gnu-emacs@gnu.org; Sat, 24 Dec 2022 15:11:04 -0500 Original-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 1p9ArG-0000Rm-KJ for bug-gnu-emacs@gnu.org; Sat, 24 Dec 2022 15:11:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p9ArG-0001Pr-52 for bug-gnu-emacs@gnu.org; Sat, 24 Dec 2022 15:11:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Sean Whitton Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 24 Dec 2022 20:11:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60126 X-GNU-PR-Package: emacs Original-Received: via spool by 60126-done@debbugs.gnu.org id=D60126.16719126545425 (code D ref 60126); Sat, 24 Dec 2022 20:11:02 +0000 Original-Received: (at 60126-done) by debbugs.gnu.org; 24 Dec 2022 20:10:54 +0000 Original-Received: from localhost ([127.0.0.1]:47184 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p9Ar8-0001PR-0V for submit@debbugs.gnu.org; Sat, 24 Dec 2022 15:10:54 -0500 Original-Received: from wout3-smtp.messagingengine.com ([64.147.123.19]:34601) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p9Ar5-0001P5-Qj for 60126-done@debbugs.gnu.org; Sat, 24 Dec 2022 15:10:53 -0500 Original-Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id 7F9D532005C1; Sat, 24 Dec 2022 15:10:41 -0500 (EST) Original-Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Sat, 24 Dec 2022 15:10:41 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=spwhitton.name; h=cc:cc:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm1; t=1671912641; x=1671999041; bh=au 1PtJjsI4uyu6TbMgyApbSTfrWB+bfD5YSgStEnP+0=; b=WnOrzUeeHpON1N8hVZ Fczwe0faD5q+QoMfC6YoB4IRbI8qhsHSe/sGakMRteiKvBIdu2YgY/oph0CyVY7Q ny/L2OMM/wK+bEVCphvPO2d+9CaIvPX11nnuvKpqrOx1QctTP0zL2EmSBk8qQl+h 1Eh6O/w4WEdOKtq9Jn1r5EpqJRJiQLjVkDvv5VMHzrpu3J/V2OOTXn1brPW5Ezeu mA/DHa616MzIxvuPtBrrwBj0Kki77eUFQsAcmR4Ytza1gQuLuyh5zqSTWq+Vd6/4 Qd1oE5YNYjEUJzryDmvplzpHJ4uJoF/rgiksUVY8bEEO/6cB8xnVN+5fQZkSa4eM /cQA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:date:date:feedback-id :feedback-id:from:from:in-reply-to:in-reply-to:message-id :mime-version:references:reply-to:sender:subject:subject:to:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; t=1671912641; x=1671999041; bh=au1PtJjsI4uyu6TbMgyApbSTfrWB +bfD5YSgStEnP+0=; b=dtuiCAYwJl5WfQvo7v0gifDgVvjkpPOpB/WV9MZhiW6n k7WyfhSMhCDn2QjwZqgWfCC1pbDKwVxJykyBG51RHD94BXeTsQCuQ5TYmrmCVXf8 Vok3tGbcD1ECaicaUdOYM15EP9u7SGNSzdFrHOcprHn30yu/hFX0dNfIAg7qUS2H 2bW4wC7MZy1TYwFSwJhxS69chwHR23WEHwetsMr1EGMJAaEpyKX9pfKPjQqesYVa slfsV3G32fRfxbyoYk11t1XtK+fuus/+49gRcgAKXGwaP40KWeHpkyE+vbP1pbDH mxsZXmyUHJYgFkeu8qNiGUwA/fghyfzdE3wPjGe4Vw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrheeggddufeehucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefujghffffkfgggtgesthdttddttdertdenucfhrhhomhepufgvrghn ucghhhhithhtohhnuceoshhpfihhihhtthhonhesshhpfihhihhtthhonhdrnhgrmhgvqe enucggtffrrghtthgvrhhnpedtffdvffeuleeuvdetkedvveehgfehvdegvefghfevudek geegleevgeejkeetkeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrih hlfhhrohhmpehsphifhhhithhtohhnsehsphifhhhithhtohhnrdhnrghmvg X-ME-Proxy: Feedback-ID: i23c04076:Fastmail Original-Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 24 Dec 2022 15:10:40 -0500 (EST) Original-Received: by melete.silentflame.com (Postfix, from userid 1000) id 37AC27EDCA1; Sat, 24 Dec 2022 13:10:39 -0700 (MST) In-Reply-To: <31848fd3-db85-f1cc-e70b-eae71d854964@yandex.ru> (Dmitry Gutov's message of "Sat, 24 Dec 2022 21:26:40 +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:251815 Archived-At: Hello, On Sat 24 Dec 2022 at 09:26PM +02, Dmitry Gutov wrote: > On 24/12/2022 20:22, Sean Whitton wrote: > >> Now that we understand clearly what we want it to do, I bet the code in >> vc-checkin-git could be simplified (vc-git--stash-staged-changes is >> fine). So I'll see about doing that, with some tests, as you suggest. >> Let me ask you about the parsing of the 'diff --git' lines. > ... >> Do you have any better ideas of how to extract the filename from the git >> --diff line, or perhaps a proof that my approach can't fail? :) > > I don't know. You could try > > (and (looking-at diff-file-header-re) (match-string 1)) > > instead, but it matches a different line (one that starts with "---"). That seems better, thank you. >> I wasn't happy with my regexp approach to extracting the filename. >> I'm not sure it can actually fail, but the current codes assumes it >> can, and that adds complexity. > > Not sure which failure you are referring to, but the process of removing > already-staged hunks from vc-git-patch-string can indeed fail, because the > hunks might be staged, or might be not. The idea was to support both > situations. I meant that my regexp might fail to correctly parse the 'diff --git' line, and then the code goes straight to "Index not empty." >> The --src-prefix, --dst-prefix and --no-prefix options to git-diff(1) >> might be relevant, but then we couldn't use a simple string-match to >> find hunks in vc-git-patch-string. > > Right. > -- Sean Whitton