summaryrefslogtreecommitdiff
path: root/guix/scripts/pull.scm
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2019-03-28 15:55:47 +0100
committerLudovic Courtès <ludo@gnu.org>2019-03-28 23:06:58 +0100
commit9f4169f6c8014206ea389e1ded88622fa6cfbe4a (patch)
tree7e8c6a1a824b1abda5b6e85d861a263926c7cdcf /guix/scripts/pull.scm
parentf2bf0407de70e7ae29518400d66ef968134f5169 (diff)
pull: Factorize pretty-printing for new/upgraded package lists.
* guix/scripts/pull.scm (display-new/upgraded-packages)[pretty]: New procedure. Use it.
Diffstat (limited to 'guix/scripts/pull.scm')
-rw-r--r--guix/scripts/pull.scm19
1 files changed, 10 insertions, 9 deletions
diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm
index 730b6a0bf2..e06ec2f291 100644
--- a/guix/scripts/pull.scm
+++ b/guix/scripts/pull.scm
@@ -382,6 +382,11 @@ of packages upgraded in ALIST2."
"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
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)))
(unless (and (null? new) (null? upgraded))
(display heading))
@@ -392,21 +397,17 @@ and ALIST2 differ, display HEADING upfront."
(format #t (N_ " ~h new package: ~a~%"
" ~h new packages: ~a~%" count)
count
- (indented-string
- (fill-paragraph (string-join (sort (map first new) string<?)
- ", ")
- (- (%text-width) 4) 30)
- 4))))
+ (pretty (string-join (sort (map first new) string<?)
+ ", ")
+ 30))))
(match (length upgraded)
(0 #t)
(count
(format #t (N_ " ~h package upgraded: ~a~%"
" ~h packages upgraded: ~a~%" count)
count
- (indented-string
- (fill-paragraph (string-join (sort upgraded string<?) ", ")
- (- (%text-width) 4) 35)
- 4))))))
+ (pretty (string-join (sort upgraded string<?) ", ")
+ 35))))))
(define (display-profile-content-diff profile gen1 gen2)
"Display the changes in PROFILE GEN2 compared to generation GEN1."