From: Spencer Baugh via "Bug reports for GNU Emacs, the Swiss army knife of text editors" <bug-gnu-emacs@gnu.org>
To: Dmitry Gutov <dmitry@gutov.dev>
Cc: Eli Zaretskii <eliz@gnu.org>, 73232@debbugs.gnu.org, juri@linkov.net
Subject: bug#73232: [PATCH] Allow vc-diff to suggest a default revision in vc-dir
Date: Fri, 04 Oct 2024 07:38:55 -0400 [thread overview]
Message-ID: <iery134yu5s.fsf@janestreet.com> (raw)
In-Reply-To: <12a817d4-ca57-4951-b958-ed4eed96c521@gutov.dev> (Dmitry Gutov's message of "Sat, 28 Sep 2024 00:55:23 +0300")
Dmitry Gutov <dmitry@gutov.dev> writes:
> And here's the diff.
>
> On 28/09/2024 00:49, Dmitry Gutov wrote:
>> 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 seems reasonable to me. Then we have the following reliable
behaviors:
- [some diff command] RET
diffs the working tree against HEAD
- C-u [some diff command] RET RET
diffs the working tree against HEAD^
- C-u [some diff command] M-n RET RET
diffs the working tree against @{upstream}
This seems like a big improvement, since previously would need to
actually read the prompt in the C-u case to figure out whether the
default was correct/what you wanted.
next prev parent reply other threads:[~2024-10-04 11:38 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-13 15:51 bug#73232: [PATCH] Allow vc-diff to suggest a default revision in vc-dir Spencer Baugh via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-09-13 16:10 ` Eli Zaretskii
2024-09-13 16:25 ` Spencer Baugh via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-09-14 1:45 ` Dmitry Gutov
2024-09-14 7:04 ` Eli Zaretskii
2024-09-14 16:13 ` Dmitry Gutov
2024-09-14 16:49 ` Eli Zaretskii
2024-09-17 6:59 ` Juri Linkov
2024-09-27 21:49 ` Dmitry Gutov
2024-09-27 21:55 ` Dmitry Gutov
2024-10-04 11:38 ` Spencer Baugh via Bug reports for GNU Emacs, the Swiss army knife of text editors [this message]
2024-10-09 23:36 ` Dmitry Gutov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=iery134yu5s.fsf@janestreet.com \
--to=bug-gnu-emacs@gnu.org \
--cc=73232@debbugs.gnu.org \
--cc=dmitry@gutov.dev \
--cc=eliz@gnu.org \
--cc=juri@linkov.net \
--cc=sbaugh@janestreet.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.