unofficial mirror of bug-gnu-emacs@gnu.org 
 help / color / mirror / code / Atom feed
From: Juri Linkov <juri@linkov.net>
To: Dmitry Gutov <dgutov@yandex.ru>
Cc: 35624@debbugs.gnu.org
Subject: bug#35624: log-view-diff regression
Date: Thu, 16 May 2019 00:12:54 +0300	[thread overview]
Message-ID: <87lfz7o05l.fsf@mail.linkov.net> (raw)
In-Reply-To: <5a4d3875-5cb5-bc84-c72e-d1840aa8d7c3@yandex.ru> (Dmitry Gutov's message of "Wed, 15 May 2019 03:34:24 +0300")

>> I don't remember what VC backend produced such header, maybe
>> vc-bzr or vc-svn.  Or probably vc-cvs because CVS has the same
>> header as RCS, and I can easily check what headers RCS produces
>> because it doesn't require any configuration.  For brevity
>> only essential part of RCS log is left here for demonstration:
>
> Thank you.
>
>> Working file:
>
> I guess RCS at least outputs some pertinent information here, not just that
> text, so it's less puzzling. I don't know how useful it is, though.

Yes, RCS displays a multi-line header.

>> ----------------------------
>> revision 1.4
>> ----------------------------
>> revision 1.3
>> ----------------------------
>> revision 1.2
>> ----------------------------
>> revision 1.1
>>
>> When the beginning of the region is on the "Working file" line
>> in the header, and the end of the region is on a revision line,
>> e.g. "revision 1.4", then typing `=' displays:
>>
>>    No changes between 1.4 and workfile
>
> You can also type 'C-u C-x v =', then '1.4', RET and C-j to omit the end
> version. That would also show the diff against the workfile.

10 keys more to type.

>>>> +      (with-current-buffer buffer
>>>> +	(insert "Working\n")
>>>
>>> How does the result look? Just the word "Working" at the beginning of
>>> the buffer?
>>
>> If the word "Working" is too ambiguous, then at least an empty line
>> at the beginning of the buffer will enable this feature for Git.
>
> Should we really make the log look weirder for the sake of a feature one
> would use at most, I don't know... once a month?

When this feature was enabled, I used it every day.  Currently I'm forced
to type 10 more keys every time.  I agree the log not to look weirder,
so better to not display Working.

>> and if the current workfile has some changes, then differences
>> between 1.4 and workfile are displayed.
>>
>> This means that RCS supports this nice feature, but Git doesn't.
>
> Just how nice is it, really? It seems pretty niche to me, and I don't
> remember the last time I needed something like this exactly.

Or course, you didn't think about it, because you didn't know it exists.
I didn't know too until discovered it accidentally.  After that it hard
to lose this ability.  The problem is that this useful feature is
undocumented.  Here is the patch that documents it:

diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi
index 4986c11103..12cee5d922 100644
--- a/doc/emacs/maintaining.texi
+++ b/doc/emacs/maintaining.texi
@@ -1033,6 +1033,7 @@ VC Change Log
 Visit the revision indicated at the current line.
 
 @item d
+@itemx =
 Display a diff between the revision at point and the next earlier
 revision, for the specific file.
 
@@ -1047,6 +1048,16 @@ VC Change Log
 revision at point.
 @end table
 
+To compare two arbitrary revisions, activate the region: set the
+beginning of the region to the line with the first revision and the
+end of the region to the line with the second revision to compare,
+then type @kbd{d} or @kbd{=}.  When the beginning of the region is on
+the top line that has no revision, it uses the current work file as
+the first revision to compare.  When the end of the region is on the
+bottom non-revision line after the last revision line, then it uses
+the next earlier revision after the last displayed revision as the
+second revision to compare.
+
 @vindex vc-log-show-limit
 Because fetching many log entries can be slow, the
 @file{*vc-change-log*} buffer displays no more than 2000 revisions by
diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index 61c13026cc..b6feb3b8d1 100644
--- a/lisp/vc/vc-git.el
+++ b/lisp/vc/vc-git.el
@@ -1017,8 +1017,8 @@ vc-git-print-log
     ;; If the buffer exists from a previous invocation it might be
     ;; read-only.
     (let ((inhibit-read-only t))
-      (with-current-buffer
-          buffer
+      (with-current-buffer buffer
+	(insert "\n")
 	(apply 'vc-git-command buffer
 	       'async files
 	       (append





  reply	other threads:[~2019-05-15 21:12 UTC|newest]

Thread overview: 47+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-07 21:56 bug#35624: log-view-diff regression Juri Linkov
2019-05-07 22:54 ` Dmitry Gutov
2019-05-08 19:52   ` Juri Linkov
2019-05-09 13:26     ` Dmitry Gutov
2019-05-09 19:41       ` Juri Linkov
2019-05-10  0:14         ` Dmitry Gutov
2019-05-10  7:56           ` Eli Zaretskii
2019-05-11 20:58           ` Juri Linkov
2019-05-13  0:32             ` Dmitry Gutov
2019-05-13 20:40               ` Juri Linkov
2019-05-13 21:21                 ` Dmitry Gutov
2019-05-14 20:29                   ` Juri Linkov
2019-05-15  0:34                     ` Dmitry Gutov
2019-05-15 21:12                       ` Juri Linkov [this message]
2019-05-15 22:05                         ` Dmitry Gutov
2019-05-16 20:04                           ` Juri Linkov
2019-05-19 20:11                             ` Juri Linkov
2019-05-20 23:29                               ` Dmitry Gutov
2019-05-21 20:12                                 ` Juri Linkov
2019-05-21 20:39                                   ` Dmitry Gutov
2019-05-21 21:32                                     ` Juri Linkov
2019-05-21 21:52                                       ` Dmitry Gutov
2019-05-22 21:52                                         ` Dmitry Gutov
2019-05-23 21:07                                         ` Juri Linkov
2019-05-24  1:29                                           ` Dmitry Gutov
2019-05-24 18:41                                             ` Juri Linkov
2019-05-27 15:26                                               ` Dmitry Gutov
2019-05-27 19:47                                                 ` Juri Linkov
2019-06-10  0:57                                                   ` Dmitry Gutov
2019-06-10 20:50                                                     ` Juri Linkov
2019-06-10 22:19                                                       ` Dmitry Gutov
2019-06-16  0:55                                                   ` Dmitry Gutov
2019-06-16 20:13                                                     ` Juri Linkov
2019-06-17 13:48                                                       ` Dmitry Gutov
2019-06-17 20:42                                                         ` Juri Linkov
2019-06-17 22:23                                                           ` Dmitry Gutov
2019-05-20 23:39                             ` Dmitry Gutov
2019-05-10  7:54     ` Eli Zaretskii
2019-05-08  6:01 ` Eli Zaretskii
2019-05-08 19:52   ` Juri Linkov
2019-05-10  7:51     ` Eli Zaretskii
2019-05-11 20:53       ` Juri Linkov
2019-05-12  2:36         ` Eli Zaretskii
2019-05-12 19:15           ` Juri Linkov
2019-05-13 14:24             ` Eli Zaretskii
2019-05-13 14:44               ` Dmitry Gutov
2019-05-13 15:09                 ` Eli Zaretskii

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

  List information: https://www.gnu.org/software/emacs/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87lfz7o05l.fsf@mail.linkov.net \
    --to=juri@linkov.net \
    --cc=35624@debbugs.gnu.org \
    --cc=dgutov@yandex.ru \
    /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 public inbox

	https://git.savannah.gnu.org/cgit/emacs.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).