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#52349: 29.0.50; vc-git and diff-mode: stage hunks Date: Wed, 24 Aug 2022 05:06:34 +0300 Message-ID: References: <268cee0d-465d-b862-d1d6-f5da4d69e737@inventati.org> <9106387a-98cf-396f-bf45-ccb04581787b@yandex.ru> <864k7kfd56.fsf@mail.linkov.net> <86fsr3uen2.fsf@mail.linkov.net> <95d2d999-49ad-13c4-9f25-0935650a1e42@yandex.ru> <8635ktjfll.fsf@mail.linkov.net> <36b963e4-5af7-dd9e-af92-4404541b9f4d@yandex.ru> <86v8xjx45h.fsf@mail.linkov.net> <861qt9h1hh.fsf@mail.linkov.net> 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="38282"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.9.1 Cc: 52349@debbugs.gnu.org To: Juri Linkov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Wed Aug 24 04:07:15 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 1oQfnW-0009mf-W5 for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 24 Aug 2022 04:07:15 +0200 Original-Received: from localhost ([::1]:55914 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oQfnV-0007g4-Uh for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 23 Aug 2022 22:07:13 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:58326) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oQfnK-0007fo-TC for bug-gnu-emacs@gnu.org; Tue, 23 Aug 2022 22:07:02 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:55573) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oQfnK-0000s9-Jt for bug-gnu-emacs@gnu.org; Tue, 23 Aug 2022 22:07:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oQfnK-0001Pv-92 for bug-gnu-emacs@gnu.org; Tue, 23 Aug 2022 22:07:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 24 Aug 2022 02:07:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52349 X-GNU-PR-Package: emacs Original-Received: via spool by 52349-submit@debbugs.gnu.org id=B52349.16613068055424 (code B ref 52349); Wed, 24 Aug 2022 02:07:02 +0000 Original-Received: (at 52349) by debbugs.gnu.org; 24 Aug 2022 02:06:45 +0000 Original-Received: from localhost ([127.0.0.1]:45322 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oQfn3-0001PQ-2j for submit@debbugs.gnu.org; Tue, 23 Aug 2022 22:06:45 -0400 Original-Received: from mail-wm1-f52.google.com ([209.85.128.52]:52005) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oQfn1-0001PD-HT for 52349@debbugs.gnu.org; Tue, 23 Aug 2022 22:06:43 -0400 Original-Received: by mail-wm1-f52.google.com with SMTP id ay12so8054069wmb.1 for <52349@debbugs.gnu.org>; Tue, 23 Aug 2022 19:06:43 -0700 (PDT) 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; bh=xy7xhlSFnz/GY/C35UCYtMLdB3l6yaMSmVAdYD0/BfU=; b=hmknDGhUtebOnjSyeRfY3BXgEy7gdhVlcuWSBFbBIuILSa5eiIwepUcEkUHfz07RTh y4Vt3RbPZxaHynU4SY92n2gpLVEmWUdbBRo/O2U+63+lIV5GsQ9mFUQOUj44L1GbcKbi EIhwv7sJxx+923ajIDbxDfeSKemfA6UkRe5etuofepP0C3IhyCmclsEKA8xUV8BqqCuo R6qAl58pT7HFYw8I3pAnP3FIkhZioMGNmnVMFfyUqtj92AvdYeSPoFxxkHHQz0dfH8a1 mdiBVSXnlx7TBOdeh72W9724X6/KjQHvuB7FIRfLnFcId57QzDBoxe72y0aX7IPKyJCP ucbA== 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; bh=xy7xhlSFnz/GY/C35UCYtMLdB3l6yaMSmVAdYD0/BfU=; b=SZNPwIpD7pVVgfyfmXtcqhlNeZeO9UTzpuih+MYKFaEI+kqXO0JMfzd/tGDD+zSSJK F2rWSWr5RD+9lXklY/hdSE90Ym6arPF8uUy8txiX1BmkCMFyBkjl6BflE8PJSEseATOv zH+kUfFoVByZc7teUPfwYeF7vhfaCoQXAU1MQfFm5crHvYI+o5/Rt72j9WldzNRznqXe Ja9guPAiVyt4quREgof9gQcT8+CDvOfN0eVP02ufFj26X+hactSB/YU3WlJatmQom1EC m5ZmTi31TrV5qMfRMTRjDDqqX/XhFB8dSBSgCSvg9NNQTdzAFKRU8onuHm5gEbdBtTaC 0Plw== X-Gm-Message-State: ACgBeo2KHORSK+QxGgKbAGQ+lv13p9vFVu3vj4jZon9oGnwzZqq/Zcxs 7VQhg+begUO6p1B9VUx3M/0= X-Google-Smtp-Source: AA6agR5toomYQN650xw1It4yf4sV9N0iqszgUrsQj3/JSoocXzSo14iZhRuh2+FfBHidQOLtVGmQyQ== X-Received: by 2002:a05:600c:22cd:b0:3a6:7b62:3778 with SMTP id 13-20020a05600c22cd00b003a67b623778mr3690316wmg.45.1661306797643; Tue, 23 Aug 2022 19:06:37 -0700 (PDT) Original-Received: from [192.168.0.6] ([46.251.119.176]) by smtp.googlemail.com with ESMTPSA id t63-20020a1c4642000000b003a673055e68sm202531wma.0.2022.08.23.19.06.35 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 23 Aug 2022 19:06:36 -0700 (PDT) Content-Language: en-US In-Reply-To: <861qt9h1hh.fsf@mail.linkov.net> 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" Xref: news.gmane.io gmane.emacs.bugs:240585 Archived-At: On 21.08.2022 21:53, Juri Linkov wrote: >> Another solution for making sure the current backend supports the new >> feature is to add a new backend function. Call it 'checkin-patch' or >> `checkin-diff`. >> >> vc-git-checkin and vc-git-checking patch can share some implementation, so >> most of code duplication can be avoided. >> >> But when a backend does not support this, the user will see a more-or-less >> understandable error like "not supported". > > So a new patch adds a new backend function 'checkin-patch': Looks pretty good. Thank you. >> Perhaps we should also check that there are no existing staged changes for >> those files, and if so, abort? This way we won't commit anything else by >> accident. > > Will do later. Shouldn't be too hard, if we don't try to do it eagerly. Just add a check inside (when vc-git-patch-string ...) in vc-git-checkin.