me/guix
Archived
1
0
Fork 0
Code Activity

pull: '--list-generations' pipes its output to the pager.

Browse source 
* guix/scripts/pull.scm (process-query): For 'list-generations queries,
use 'with-paginated-output-port'.
(display-news-entry-title): Pass second argument to 'highlight'.
(display-news-entry): Pass second argument to 'dim'.
This commit is contained in:
Ludovic Courtès 2022-02-09 22:21:06 +01:00
parent 5b6e31b020
commit 054ec2e242
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
guix/scripts/pull.scm
View file

@ -287,7 +287,8 @@ purposes."
(texi->plain-text title)) (texi->plain-text title))
;; When Texinfo markup is invalid, display it as-is. ;; When Texinfo markup is invalid, display it as-is.
(const title))))))) (const title)))
(or (pager-wrapped-port port) port)))))
(define (display-news-entry entry channel language port) (define (display-news-entry entry channel language port)
"Display ENTRY, a <channel-news-entry> from CHANNEL, in LANGUAGE, a language "Display ENTRY, a <channel-news-entry> from CHANNEL, in LANGUAGE, a language
@ -299,7 +300,8 @@ code, to PORT."
(channel-news-entry-commit entry)) (channel-news-entry-commit entry))
(display-news-entry-title entry language port) (display-news-entry-title entry language port)
(format port (dim (G_ " commit ~a~%")) (format port (dim (G_ " commit ~a~%")
(or (pager-wrapped-port port) port))
(if (supports-hyperlinks?) (if (supports-hyperlinks?)
(channel-commit-hyperlink channel commit) (channel-commit-hyperlink channel commit)
commit)) commit))
@ -681,14 +683,20 @@ Return true when there is more package info to display."
(raise (condition (&profile-not-found-error (raise (condition (&profile-not-found-error
(profile profile))))) (profile profile)))))
((not pattern) ((not pattern)
(list-generations profile (profile-generations profile))) (with-paginated-output-port port
(with-output-to-port port
(lambda ()
(list-generations profile (profile-generations profile))))))
((matching-generations pattern profile) ((matching-generations pattern profile)
=> =>
(match-lambda (match-lambda
(() (()
(exit 1)) (exit 1))
((numbers ...) ((numbers ...)
(list-generations profile numbers))))))) (with-paginated-output-port port
(with-output-to-port port
(lambda ()
(list-generations profile numbers))))))))))
(('display-news) (('display-news)
(display-news profile)))) (display-news profile))))