From: Juri Linkov <juri@linkov.net>
To: Dmitry Gutov <dmitry@gutov.dev>
Cc: 68364@debbugs.gnu.org
Subject: bug#68364: Print log buttons fail with vc-log-mergebase
Date: Wed, 10 Jan 2024 19:20:05 +0200 [thread overview]
Message-ID: <86jzohp0ti.fsf@mail.linkov.net> (raw)
In-Reply-To: <94864f5e-9e3a-44dd-a7d7-31c93d2d09c9@gutov.dev> (Dmitry Gutov's message of "Wed, 10 Jan 2024 15:18:26 +0200")
>> Buttons to show more log entries is a nice feature,
>> but after the recent change this doesn't work with
>> 'C-x v M L' (vc-log-mergebase):
>> Debugger entered--Lisp error: (wrong-type-argument number-or-marker-p
>> "branch-2")
>> vc-print-log-setup-buttons("branch-1" t "branch-2" nil)
>> Probably it requires a special handling for 'C-x v M L'.
>
> Does this help?
>
> Looks like the description of the LIMIT argument wasn't updated in the
> vc-print-log-internal's docstring, when it started to be a string
> sometimes.
The description of the LIMIT argument in vc-print-log-internal looks strange:
"Show up to LIMIT entries (non-nil means unlimited)."
Maybe it should be "(nil means unlimited)"?
> diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
> index b8cc44fc3dc..7d5a5486250 100644
> --- a/lisp/vc/vc.el
> +++ b/lisp/vc/vc.el
> @@ -2711,7 +2711,7 @@ vc-print-log-setup-buttons
> ;; In either case only one revision is wanted, no buttons.
> (when (and limit (not (eq 'limit-unsupported pl-return))
> (not (and is-start-revision
> - (= limit 1))))
> + (eql limit 1))))
> (let ((entries 0))
> (goto-char (point-min))
> (while (re-search-forward log-view-message-re nil t)
Sorry, still fails on another line:
(if (< entries limit)
But this works:
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index b8cc44fc3dc..d284b19fcf0 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -2709,7 +2709,8 @@ vc-print-log-setup-buttons
;; LIMIT=1 is set by vc-annotate-show-log-revision-at-line
;; or by vc-print-root-log with current-prefix-arg=1.
;; In either case only one revision is wanted, no buttons.
- (when (and limit (not (eq 'limit-unsupported pl-return))
+ (when (and limit (not (stringp limit))
+ (not (eq 'limit-unsupported pl-return))
(not (and is-start-revision
(= limit 1))))
(let ((entries 0))
next prev parent reply other threads:[~2024-01-10 17:20 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-10 7:28 bug#68364: Print log buttons fail with vc-log-mergebase Juri Linkov
2024-01-10 13:18 ` Dmitry Gutov
2024-01-10 17:20 ` Juri Linkov [this message]
2024-01-10 23:23 ` Dmitry Gutov
2024-01-11 7:06 ` Juri Linkov
2024-01-11 13:10 ` 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
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=86jzohp0ti.fsf@mail.linkov.net \
--to=juri@linkov.net \
--cc=68364@debbugs.gnu.org \
--cc=dmitry@gutov.dev \
/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).