From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Juri Linkov Newsgroups: gmane.emacs.bugs Subject: bug#52349: 29.0.50; vc-git and diff-mode: stage hunks Date: Sun, 28 Aug 2022 22:45:51 +0300 Organization: LINKOV.NET Message-ID: <8635dgkv80.fsf@mail.linkov.net> 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> <864jy1mrk8.fsf@mail.linkov.net> <86ler9labz.fsf@mail.linkov.net> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="27951"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/29.0.50 (x86_64-pc-linux-gnu) Cc: 52349@debbugs.gnu.org To: Dmitry Gutov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sun Aug 28 21:47:14 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 1oSOFW-00078Q-L4 for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 28 Aug 2022 21:47:14 +0200 Original-Received: from localhost ([::1]:45694 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oSOFV-0002Gh-PS for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 28 Aug 2022 15:47:13 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:35580) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oSOFK-0002GW-In for bug-gnu-emacs@gnu.org; Sun, 28 Aug 2022 15:47:03 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:41649) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oSOFK-0004mw-Au for bug-gnu-emacs@gnu.org; Sun, 28 Aug 2022 15:47:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oSOFJ-00023k-OV for bug-gnu-emacs@gnu.org; Sun, 28 Aug 2022 15:47:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Juri Linkov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 28 Aug 2022 19:47:01 +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.16617160207909 (code B ref 52349); Sun, 28 Aug 2022 19:47:01 +0000 Original-Received: (at 52349) by debbugs.gnu.org; 28 Aug 2022 19:47:00 +0000 Original-Received: from localhost ([127.0.0.1]:59629 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oSOFI-00023U-7O for submit@debbugs.gnu.org; Sun, 28 Aug 2022 15:47:00 -0400 Original-Received: from relay5-d.mail.gandi.net ([217.70.183.197]:35555) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oSOFC-00022E-3V; Sun, 28 Aug 2022 15:46:57 -0400 Original-Received: (Authenticated sender: juri@linkov.net) by mail.gandi.net (Postfix) with ESMTPSA id 58F4E1C0004; Sun, 28 Aug 2022 19:46:44 +0000 (UTC) In-Reply-To: (Dmitry Gutov's message of "Sun, 28 Aug 2022 03:40:13 +0300") 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:240992 Archived-At: close 52349 29.0.50 thanks >> The problem is that currently using 'C-c C-d' (log-edit-show-diff) >> in the *vc-log* buffer doesn't show the same diff that will be really >> committed when different files were marked in *vc-dir* parent buffer >> before typing 'C-c C-c' in *vc-log*. >> This is because currently log-edit-diff-function is set to vc-diff >> that is not suitable here since it tries to deduce fileset again >> from *vc-dir*, but files to commit are set in the buffer-local >> 'vc-log-fileset' in *vc-log*. So I added a new function >> 'log-edit-diff-fileset' that shows the diff from 'vc-log-fileset'. >> Using the same naming scheme, I renamed 'vc-diff-patch' to >> 'log-edit-diff-patch'. >> This shows the difference from the previous patch, >> but later these changes could be committed separately: > > Makes perfect sense, thanks. So now pushed and closed. If more changes are needed, this could be reopened or a new bug report opened. > Honestly, I think it's a long-requested advanced feature which we'd be > happy to have even if there were rough edges remaining (as long as it > doesn't corrupt users' files or otherwise loses changes, of course). But > this seems to be coming along nicely. 'vc-finish-logentry' has such FIXME: (let ((logbuf (current-buffer)) (log-operation vc-log-operation) ;; FIXME: When coming from VC-Dir, we should check that the ;; set of selected files is still equal to vc-log-fileset, ;; to avoid surprises. (log-fileset vc-log-fileset) (pop-to-buffer vc-parent-buffer) I tried to fix this, but it requires duplicating too much code from vc-next-action, including code that prepares 'ready-for-commit' list of files. I'm afraid that such check often will raise a false alarm. OTOH, maybe this check is not needed since I fixed 'C-c C-d' above to show the same diff that will be committed using vc-log-fileset, and 'C-c C-c' uses the same vc-log-fileset as well.