* bug#68364: Print log buttons fail with vc-log-mergebase
@ 2024-01-10 7:28 Juri Linkov
2024-01-10 13:18 ` Dmitry Gutov
0 siblings, 1 reply; 6+ messages in thread
From: Juri Linkov @ 2024-01-10 7:28 UTC (permalink / raw)
To: 68364; +Cc: Dmitry Gutov
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'.
^ permalink raw reply [flat|nested] 6+ messages in thread* bug#68364: Print log buttons fail with vc-log-mergebase
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
0 siblings, 1 reply; 6+ messages in thread
From: Dmitry Gutov @ 2024-01-10 13:18 UTC (permalink / raw)
To: Juri Linkov, 68364
Hi Juri,
On 10/01/2024 09:28, Juri Linkov wrote:
> 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.
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)
^ permalink raw reply related [flat|nested] 6+ messages in thread* bug#68364: Print log buttons fail with vc-log-mergebase
2024-01-10 13:18 ` Dmitry Gutov
@ 2024-01-10 17:20 ` Juri Linkov
2024-01-10 23:23 ` Dmitry Gutov
0 siblings, 1 reply; 6+ messages in thread
From: Juri Linkov @ 2024-01-10 17:20 UTC (permalink / raw)
To: Dmitry Gutov; +Cc: 68364
>> 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))
^ permalink raw reply related [flat|nested] 6+ messages in thread* bug#68364: Print log buttons fail with vc-log-mergebase
2024-01-10 17:20 ` Juri Linkov
@ 2024-01-10 23:23 ` Dmitry Gutov
2024-01-11 7:06 ` Juri Linkov
0 siblings, 1 reply; 6+ messages in thread
From: Dmitry Gutov @ 2024-01-10 23:23 UTC (permalink / raw)
To: Juri Linkov; +Cc: 68364
On 10/01/2024 19:20, Juri Linkov wrote:
>>> 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)"?
Probably. And a mention of allowed string values.
>> 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))
That would mean the "follow renames" button is never shown in
vc-log-mergebase outputs.
I've pushed commit 1ecb53ad2fc, check it out.
^ permalink raw reply [flat|nested] 6+ messages in thread* bug#68364: Print log buttons fail with vc-log-mergebase
2024-01-10 23:23 ` Dmitry Gutov
@ 2024-01-11 7:06 ` Juri Linkov
2024-01-11 13:10 ` Dmitry Gutov
0 siblings, 1 reply; 6+ messages in thread
From: Juri Linkov @ 2024-01-11 7:06 UTC (permalink / raw)
To: Dmitry Gutov; +Cc: 68364
close 68364 30.0.50
thanks
> That would mean the "follow renames" button is never shown in
> vc-log-mergebase outputs.
I don't know if this button makes sense in vc-log-mergebase outputs.
But in file logs it works nicely, much better than using
vc-git-print-log-follow.
> I've pushed commit 1ecb53ad2fc, check it out.
Thanks for taking care of this. I confirm there are no problems anymore.
^ permalink raw reply [flat|nested] 6+ messages in thread
* bug#68364: Print log buttons fail with vc-log-mergebase
2024-01-11 7:06 ` Juri Linkov
@ 2024-01-11 13:10 ` Dmitry Gutov
0 siblings, 0 replies; 6+ messages in thread
From: Dmitry Gutov @ 2024-01-11 13:10 UTC (permalink / raw)
To: Juri Linkov; +Cc: 68364
On 11/01/2024 09:06, Juri Linkov wrote:
> close 68364 30.0.50
> thanks
>
>> That would mean the "follow renames" button is never shown in
>> vc-log-mergebase outputs.
>
> I don't know if this button makes sense in vc-log-mergebase outputs.
It's probably less important than in the full log, but the mergebase log
interval might contain renames too, I think.
> But in file logs it works nicely, much better than using
> vc-git-print-log-follow.
Good to hear!
>> I've pushed commit 1ecb53ad2fc, check it out.
>
> Thanks for taking care of this. I confirm there are no problems anymore.
Thanks.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-01-11 13:10 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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
2024-01-10 23:23 ` Dmitry Gutov
2024-01-11 7:06 ` Juri Linkov
2024-01-11 13:10 ` Dmitry Gutov
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).