GNU bug report logs - #73232
[PATCH] Allow vc-diff to suggest a default revision in vc-dir

Previous Next

Package: emacs;

Reported by: Spencer Baugh <sbaugh <at> janestreet.com>

Date: Fri, 13 Sep 2024 15:53:01 UTC

Severity: normal

Tags: patch

Done: Dmitry Gutov <dmitry <at> gutov.dev>

Bug is archived. No further changes may be made.

Full log


View this message in rfc822 format

From: Dmitry Gutov <dmitry <at> gutov.dev>
To: Spencer Baugh <sbaugh <at> janestreet.com>, Eli Zaretskii <eliz <at> gnu.org>
Cc: 73232 <at> debbugs.gnu.org, juri <at> linkov.net
Subject: bug#73232: [PATCH] Allow vc-diff to suggest a default revision in vc-dir
Date: Sat, 28 Sep 2024 00:49:53 +0300
Hi all,

On 14/09/2024 04:45, Dmitry Gutov wrote:
> 
> I can see where you're coming from though -- that default isn't very 
> useful, one might as well not press C-u.
> 
> Maybe we should switch to suggesting the previous revision in the prompt 
> even when file has changes?

Here's what seems to me an overall improvement, based on the original 
change. And more consistent as well.

* No special case for when FIRST is a directory OR it's not up-to-date.
* Make REV1-DEFAULT a list value.
* In 'vc-root-version-diff', don't try calling 'vc-deduce-fileset' and 
construct a (BACKEND DEFAULT-DIR) fileset right away.

As a result, 'C-u C-x v d' consistently provides completion and diff 
relating to the whole repository, not for files as point (if any). 
Previously, it used the revision that last touched the corresponding 
file, or nil, if the file was untracked (e.g. in Dired).

Further, don't offer the working revision as REV1-DEFAULT. Except for 
historical reasons and some idea of consistency, I can't see a scenario 
where that would be useful, which would not be covered by calling 'C-x v 
d' without a prefix. Someone please correct me here.

And combined with Spencer's patch from https://debbugs.gnu.org/62940#46, 
we get this:

* First default is HEAD^ (the last revision before the latest).
* Second default is @{upstream}.
* Then the elements from vc-revision-history.

WDYT?




This bug report was last modified 223 days ago.

Previous Next


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