From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Dmitry Gutov Newsgroups: gmane.emacs.bugs Subject: bug#60126: 30.0.50; vc-git-checkin: Offer to unstage conflicting changes Date: Sat, 24 Dec 2022 21:26:40 +0200 Message-ID: <31848fd3-db85-f1cc-e70b-eae71d854964@yandex.ru> 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> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="31170"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.4.2 Cc: 60126-done@debbugs.gnu.org, juri@linkov.net To: Sean Whitton Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sat Dec 24 20:27:30 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 1p9AB8-0007zK-G6 for geb-bug-gnu-emacs@m.gmane-mx.org; Sat, 24 Dec 2022 20:27:30 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p9AAi-0000rD-Qm; Sat, 24 Dec 2022 14:27:04 -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 1p9AAg-0000qs-Vf for bug-gnu-emacs@gnu.org; Sat, 24 Dec 2022 14:27:02 -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 1p9AAg-00049X-Kb for bug-gnu-emacs@gnu.org; Sat, 24 Dec 2022 14:27:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p9AAg-0008UC-Bx for bug-gnu-emacs@gnu.org; Sat, 24 Dec 2022 14:27:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 24 Dec 2022 19:27: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.167191001032601 (code D ref 60126); Sat, 24 Dec 2022 19:27:02 +0000 Original-Received: (at 60126-done) by debbugs.gnu.org; 24 Dec 2022 19:26:50 +0000 Original-Received: from localhost ([127.0.0.1]:47177 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p9AAU-0008Tl-41 for submit@debbugs.gnu.org; Sat, 24 Dec 2022 14:26:50 -0500 Original-Received: from mail-ej1-f53.google.com ([209.85.218.53]:46782) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p9AAS-0008TV-La for 60126-done@debbugs.gnu.org; Sat, 24 Dec 2022 14:26:49 -0500 Original-Received: by mail-ej1-f53.google.com with SMTP id bj12so18764544ejb.13 for <60126-done@debbugs.gnu.org>; Sat, 24 Dec 2022 11:26:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :sender:from:to:cc:subject:date:message-id:reply-to; bh=oAY5US9I4N5zGaHCWYs+odrKGsa61QAbu2rnL/Yr8r4=; b=hzPzWMaVJUPHFy2wvgwTqUwOuAQqkVaheRKcdBGdvN1QQSi0qwqr2vilckxz4q1Au6 hVGH0KmYh3ZXhBuEX7ksm8S69/5sG7GmvAlw5BbY3/0lb7YEBRdcMRBta5fxLhrBYcKe aNwRjh8jCJFUo3CD7FoqSsoXpuPFvJ9IwyRnMfImMZL8bcjxNZZRmHhGErEckBsTsn7m cazuBtE9An2txGwORwpRh9l3GUmGaombUDWJ8V6GskCWLq/kDdhfg/Q6+rIsZO3uVcfa +QHdpDZm7uS7l1G2qF7OyZKQpf8zw6/jmA6Fd9bS8zStsx2wuYvqmeiz/0akUKSBWKcm SwwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :sender:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=oAY5US9I4N5zGaHCWYs+odrKGsa61QAbu2rnL/Yr8r4=; b=5o6DSEe24oNUkLLRex0D/hVewhNkWoD3ui659bZ0AqoxLzpCNZzO8G9ScuNmDPzVCt KXRnHgWF6DwKZM/S8VpFRZXVM+US90Kkz0vantSRvEJE/GmUSqroFeZM3lfc9NcZnBea cpMlRbmIk/L+nACH/vBjVUjb8cocJD/MKhTZP3VB6VBTfLD1q8GcXg4Q7NXhCJE0P6gc Hgbt4stquwIidakcMrKXxdF2e7N0XS+JAxDvumxzkozDt5OEhI26cecmKwLIdSsEe18r O82JhE8aZKrTKQdAFbJ3CLW+MOyWS+Cl0TxfmMRkIWSqdT/lBZqn7pnGiLTQDxP/blty DE4w== X-Gm-Message-State: AFqh2kpK9go0zEJC0T7WLhQ63l5735B1OwSiI3OMLZ26GHUg3mas3jj4 0B6SQ0mEtAp5kghu50L0Jd0= X-Google-Smtp-Source: AMrXdXtQTQeEuwf0jA61IXX1GdM9sBPJcQrAZVSnVpl4PBPboUpkaoNDkJa5qlFXI/AQRmvgP4cxFQ== X-Received: by 2002:a17:907:7094:b0:844:1d1d:1fa with SMTP id yj20-20020a170907709400b008441d1d01famr10428660ejb.23.1671910002742; Sat, 24 Dec 2022 11:26:42 -0800 (PST) Original-Received: from [192.168.0.2] ([46.251.119.176]) by smtp.googlemail.com with ESMTPSA id x3-20020a170906804300b008413803baaesm2851378ejw.58.2022.12.24.11.26.41 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 24 Dec 2022 11:26:42 -0800 (PST) Content-Language: en-US In-Reply-To: <87fsd47jbe.fsf@melete.silentflame.com> 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:251814 Archived-At: 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 "---"). > 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. > 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.