GNU bug report logs - #6399
Confirm vc commits when the files do not match those marked in vc-dir

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 6399 in the body.
You can then email your comments to 6399 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #3 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Glenn Morris <rgm <at> gnu.org>
To: submit <at> debbugs.gnu.org
Subject: Confirm vc commits when the files do not match those marked in vc-dir
Date: Thu, 10 Jun 2010 23:50:24 -0400

Package: emacs
Severity: wishlist

I've made this mistake a few times now:

1) Mark say 5 files in vc-dir.

2) Press v to get a vc-log buffer.

3) Realize I should not have marked one of the 5 files, and unmark it
in the vc-dir buffer.

4) Forget to kill the existing vc-log buffer, and so end up committing
all 5 files anyway.


I wish that at step 4 when I try to commit, Emacs would check if the
files about to be commited match those marked in the vc-dir buffer,
and if not ask me to confirm the commit.

Message #6 received at 6399 <at> debbugs.gnu.org (full text, mbox):

From: Stefan Monnier <monnier <at> iro.umontreal.ca>
To: Glenn Morris <rgm <at> gnu.org>
Cc: 6399 <at> debbugs.gnu.org
Subject: Re: bug#6399: Confirm vc commits when the files do not match those
	marked in vc-dir
Date: Fri, 11 Jun 2010 01:53:56 -0400

> I've made this mistake a few times now:

> 1) Mark say 5 files in vc-dir.

> 2) Press v to get a vc-log buffer.

> 3) Realize I should not have marked one of the 5 files, and unmark it
> in the vc-dir buffer.

> 4) Forget to kill the existing vc-log buffer, and so end up committing
> all 5 files anyway.


> I wish that at step 4 when I try to commit, Emacs would check if the
> files about to be commited match those marked in the vc-dir buffer,
> and if not ask me to confirm the commit.

Agreed.  That's what PCL-CVS does.  PCL-CVS goes one step further,
actually: if there's a discrepancy (and the user confirms that the
discrepancy is OK), it's the *cvs* (aka *vc-dir*) selection that takes
precedence over the list of files that was active when the vc-log buffer
was created.


        Stefan

Message #13 received at 6399 <at> debbugs.gnu.org (full text, mbox):

From: Lars Ingebrigtsen <larsi <at> gnus.org>
To: Glenn Morris <rgm <at> gnu.org>
Cc: 6399 <at> debbugs.gnu.org
Subject: Re: bug#6399: Confirm vc commits when the files do not match those
 marked in vc-dir
Date: Sun, 18 Jul 2021 15:10:45 +0200

Glenn Morris <rgm <at> gnu.org> writes:

> I've made this mistake a few times now:
>
> 1) Mark say 5 files in vc-dir.
>
> 2) Press v to get a vc-log buffer.
>
> 3) Realize I should not have marked one of the 5 files, and unmark it
> in the vc-dir buffer.
>
> 4) Forget to kill the existing vc-log buffer, and so end up committing
> all 5 files anyway.

Somehow that has never happened to me, so I guess it's never occurred to
me to do something like that.  But I see that the problem is still
present in Emacs 28.

> I wish that at step 4 when I try to commit, Emacs would check if the
> files about to be commited match those marked in the vc-dir buffer,
> and if not ask me to confirm the commit.

Yeah, that seems like a good idea.  I can't really imagine somebody
altering the marked files in the vc-dir buffer without wanting to affect
which files get checked in on the `C-c C-c'.  But before I start poking
at this -- would adding a query like this disrupt somebody's work flow?

-- 
(domestic pets only, the antidote for overdose, milk.)
   bloggy blog: http://lars.ingebrigtsen.no

Message #22 received at 6399-done <at> debbugs.gnu.org (full text, mbox):

From: Sean Whitton <spwhitton <at> spwhitton.name>
To: 6399-done <at> debbugs.gnu.org
Subject: Check now implemented
Date: Tue, 08 Jul 2025 17:48:35 +0100

Version: 31.1

Hello,

I've implemented a check for this on master.

I went with not changing the file selection to match *vc-dir*, instead
just asking the user to confirm they wish to proceed with the old
selection.

I did this because we have various hooks and mode-specific checks that
have already run by the time we get to C-c C-c, and we would bypass them
if we let the fileset change.

-- 
Sean Whitton

Previous Next

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