GNU bug report logs - #76769
31.0.50; marking inconsistency between VC-Dir and dired-vc-next-action

Previous Next

Full log

View this message in rfc822 format

From: help-debbugs <at> gnu.org (GNU bug Tracking System)
To: Sean Whitton <spwhitton <at> spwhitton.name>
Cc: tracker <at> debbugs.gnu.org
Subject: bug#76769: closed (31.0.50; marking inconsistency between VC-Dir
 and dired-vc-next-action)
Date: Sun, 06 Apr 2025 03:20:02 +0000

[Message part 1 (text/plain, inline)]

Your message dated Sun, 06 Apr 2025 11:19:20 +0800
with message-id <878qoenfif.fsf <at> melete.silentflame.com>
and subject line Re: 31.0.50; marking inconsistency between VC-Dir and dired-vc-next-action
has caused the debbugs.gnu.org bug report #76769,
regarding 31.0.50; marking inconsistency between VC-Dir and dired-vc-next-action
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs <at> gnu.org.)


-- 
76769: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=76769
GNU Bug Tracking System
Contact help-debbugs <at> gnu.org with problems

[Message part 2 (message/rfc822, inline)]

From: Sean Whitton <spwhitton <at> spwhitton.name>
To: bug-gnu-emacs <at> gnu.org
Subject: 31.0.50; marking inconsistency between VC-Dir and dired-vc-next-action
Date: Thu, 06 Mar 2025 11:56:59 +0800

X-debbugs-cc: juri <at> linkov.net, dmitry <at> gutov.dev, sbaugh <at> janestreet.com

Try this:

1. make a random edit to src/emacs.c
2. open Dired in the root of emacs.git
3. use 'm' to mark src
4. go back up one line, use 'i' to insert src
5. move down to emacs.c, use 'm' to mark that as well
6. C-x v v

This gets you a VC-Dir in which both src/ and src/emacs.c are marked.

--8<---------------cut here---------------start------------->8---
                         ./
  *                      src/
  *  edited              src/emacs.c
--8<---------------cut here---------------end--------------->8---

But usually, you cannot get into this state.  If you try to mark src/
when src/emacs.c is already marked, you can't, and vice-versa.

This is not just a display inconsistency, because it changes the list of
files that vc-dir-deduce-fileset returns.

I think that dired-vc-next-action has the more useful behaviour.
Freely marking and unmarking individual entries in VC-Dir would make it
easier to use.  So I would like to make that possible.  We can guard it
behind a defcustom so people can retain the old marking behaviour if
they prefer it.

So my proposal to make things more consistent would be:

- a new defcustom, which when non-nil, allows freely marking both files
  in directories, and those directories themselves, in VC-Dir

  (I think we should default it to non-nil)

- fix dired-vc-next-action to respect that defcustom, i.e., when it is
  nil, dired-vc-next-action shouldn't generate a VC-Dir buffer with
  both src/ and src/emacs.c marked, in the example above

- change vc-dir-deduce-fileset to filter out individual files when the
  directory containing them is marked.  E.g.

  --8<---------------cut here---------------start------------->8---
                           ./
    *                      src/
    *  edited              src/emacs.c
  --8<---------------cut here---------------end--------------->8---
  Currently vc-dir-deduce-fileset returns ("src/" "src/emacs.c"),
  it should return just ("src/").

I think that for all the operations VC supports, passing a whole
directory along with some of the files in it is semantically equivalent
to just passing the whole directory.  If would have to be an esoteric,
highly VCS-specific operation to do anything other than that, I think?

For a case like this:
--8<---------------cut here---------------start------------->8---
                         ./
   *                     src/
   * edited              src/cm.c
     edited              src/emacs.c
--8<---------------cut here---------------end--------------->8---

the UI is a little confusing, because any operation will also act on
emacs.c, but it is not marked.  I would propose that we add another
symbol next to src/emacs.c, say '-', in a less prominently coloured
face, indicating that despite not having been explictly marked, it is
still effectively part of the fileset:

--8<---------------cut here---------------start------------->8---
                         ./
   *                     src/
   * edited              src/cm.c
   - edited              src/emacs.c
--8<---------------cut here---------------end--------------->8---
(imagine the '-' is in a different colour).

How does this design look?

-- 
Sean Whitton

[Message part 3 (message/rfc822, inline)]

From: Sean Whitton <spwhitton <at> spwhitton.name>
To: Juri Linkov <juri <at> linkov.net>, dmitry <at> gutov.dev,
 76769-done <at> debbugs.gnu.org,  sbaugh <at> janestreet.com,  Eli Zaretskii
 <eliz <at> gnu.org>
Subject: Re: 31.0.50; marking inconsistency between VC-Dir and
 dired-vc-next-action
Date: Sun, 06 Apr 2025 11:19:20 +0800

Hello,

This is all implemented now on master.  Please test, and let me know if
you think there could be some useful tweaks to some of the behaviours.

-- 
Sean Whitton

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.