~ruther/guix-local

054ec2e242b2e5d89711c333f4048fc1d749eab6 — Ludovic Courtès 4 years ago 5b6e31b
pull: '--list-generations' pipes its output to the pager.

* 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'.
1 files changed, 12 insertions(+), 4 deletions(-)

M guix/scripts/pull.scm
M guix/scripts/pull.scm => guix/scripts/pull.scm +12 -4
@@ 287,7 287,8 @@ purposes."
                  (texi->plain-text title))

                ;; 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)
  "Display ENTRY, a <channel-news-entry> from CHANNEL, in LANGUAGE, a language


@@ 299,7 300,8 @@ code, to PORT."
    (channel-news-entry-commit entry))

  (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?)
              (channel-commit-hyperlink channel commit)
              commit))


@@ 681,14 683,20 @@ Return true when there is more package info to display."
             (raise (condition (&profile-not-found-error
                                (profile profile)))))
            ((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)
             =>
             (match-lambda
               (()
                (exit 1))
               ((numbers ...)
                (list-generations profile numbers)))))))
                (with-paginated-output-port port
                  (with-output-to-port port
                    (lambda ()
                      (list-generations profile numbers))))))))))
    (('display-news)
     (display-news profile))))