mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-25 13:58:15 -05:00
pull: Factorize pretty-printing for new/upgraded package lists.
* guix/scripts/pull.scm (display-new/upgraded-packages)[pretty]: New procedure. Use it.
This commit is contained in:
parent
f2bf0407de
commit
9f4169f6c8
1 changed files with 10 additions and 9 deletions
|
@ -382,6 +382,11 @@ (define* (display-new/upgraded-packages alist1 alist2
|
||||||
"Given the two package name/version alists ALIST1 and ALIST2, display the
|
"Given the two package name/version alists ALIST1 and ALIST2, display the
|
||||||
list of new and upgraded packages going from ALIST1 to ALIST2. When ALIST1
|
list of new and upgraded packages going from ALIST1 to ALIST2. When ALIST1
|
||||||
and ALIST2 differ, display HEADING upfront."
|
and ALIST2 differ, display HEADING upfront."
|
||||||
|
(define (pretty str column)
|
||||||
|
(indented-string (fill-paragraph str (- (%text-width) 4)
|
||||||
|
column)
|
||||||
|
4))
|
||||||
|
|
||||||
(let-values (((new upgraded) (new/upgraded-packages alist1 alist2)))
|
(let-values (((new upgraded) (new/upgraded-packages alist1 alist2)))
|
||||||
(unless (and (null? new) (null? upgraded))
|
(unless (and (null? new) (null? upgraded))
|
||||||
(display heading))
|
(display heading))
|
||||||
|
@ -392,21 +397,17 @@ (define* (display-new/upgraded-packages alist1 alist2
|
||||||
(format #t (N_ " ~h new package: ~a~%"
|
(format #t (N_ " ~h new package: ~a~%"
|
||||||
" ~h new packages: ~a~%" count)
|
" ~h new packages: ~a~%" count)
|
||||||
count
|
count
|
||||||
(indented-string
|
(pretty (string-join (sort (map first new) string<?)
|
||||||
(fill-paragraph (string-join (sort (map first new) string<?)
|
", ")
|
||||||
", ")
|
30))))
|
||||||
(- (%text-width) 4) 30)
|
|
||||||
4))))
|
|
||||||
(match (length upgraded)
|
(match (length upgraded)
|
||||||
(0 #t)
|
(0 #t)
|
||||||
(count
|
(count
|
||||||
(format #t (N_ " ~h package upgraded: ~a~%"
|
(format #t (N_ " ~h package upgraded: ~a~%"
|
||||||
" ~h packages upgraded: ~a~%" count)
|
" ~h packages upgraded: ~a~%" count)
|
||||||
count
|
count
|
||||||
(indented-string
|
(pretty (string-join (sort upgraded string<?) ", ")
|
||||||
(fill-paragraph (string-join (sort upgraded string<?) ", ")
|
35))))))
|
||||||
(- (%text-width) 4) 35)
|
|
||||||
4))))))
|
|
||||||
|
|
||||||
(define (display-profile-content-diff profile gen1 gen2)
|
(define (display-profile-content-diff profile gen1 gen2)
|
||||||
"Display the changes in PROFILE GEN2 compared to generation GEN1."
|
"Display the changes in PROFILE GEN2 compared to generation GEN1."
|
||||||
|
|
Loading…
Reference in a new issue