[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/08: ui: Add 'indented-string'.
From: |
guix-commits |
Subject: |
03/08: ui: Add 'indented-string'. |
Date: |
Mon, 23 Mar 2020 05:48:33 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 7b322d3c4cb266a0d84f5e3a8ceedd302f9f73df
Author: Ludovic Courtès <address@hidden>
AuthorDate: Fri Mar 20 12:44:43 2020 +0100
ui: Add 'indented-string'.
* guix/scripts/pull.scm (display-news-entry): Remove extra space in
format string for 'indented-string'.
(indented-string): Remove.
(display-new/upgraded-packages)[pretty]: Pass #:initial-indent? to
'indented-string'.
* guix/ui.scm (indented-string): New procedure.
---
guix/scripts/pull.scm | 17 ++---------------
guix/ui.scm | 18 ++++++++++++++++++
2 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm
index 7fc23e1..b7e0a4a 100644
--- a/guix/scripts/pull.scm
+++ b/guix/scripts/pull.scm
@@ -269,7 +269,7 @@ code, to PORT."
(let ((body (or (assoc-ref body language)
(assoc-ref body (%default-message-language))
"")))
- (format port " ~a~%"
+ (format port "~a~%"
(indented-string
(parameterize ((%text-width (- (%text-width) 4)))
(string-trim-right
@@ -520,19 +520,6 @@ true, display what would be built without actually
building it."
;;; Queries.
;;;
-(define (indented-string str indent)
- "Return STR with each newline preceded by IDENT spaces."
- (define indent-string
- (make-list indent #\space))
-
- (list->string
- (string-fold-right (lambda (chr result)
- (if (eqv? chr #\newline)
- (cons chr (append indent-string result))
- (cons chr result)))
- '()
- str)))
-
(define profile-package-alist
(mlambda (profile)
"Return a name/version alist representing the packages in PROFILE."
@@ -589,7 +576,7 @@ Return true when there is more package info to display."
(define (pretty str column)
(indented-string (fill-paragraph str (- (%text-width) 4)
column)
- 4))
+ 4 #:initial-indent? #f))
(define concise/max-item-count
;; Maximum number of items to display when CONCISE? is true.
diff --git a/guix/ui.scm b/guix/ui.scm
index b9ba8c0..a469494 100644
--- a/guix/ui.scm
+++ b/guix/ui.scm
@@ -104,6 +104,7 @@
read/eval
read/eval-package-expression
check-available-space
+ indented-string
fill-paragraph
%text-width
texi->plain-text
@@ -1206,6 +1207,23 @@ replacement if PORT is not Unicode-capable."
(lambda ()
body ...)))))
+(define* (indented-string str indent
+ #:key (initial-indent? #t))
+ "Return STR with each newline preceded by IDENT spaces. When
+INITIAL-INDENT? is true, the first line is also indented."
+ (define indent-string
+ (make-list indent #\space))
+
+ (list->string
+ (string-fold-right (lambda (chr result)
+ (if (eqv? chr #\newline)
+ (cons chr (append indent-string result))
+ (cons chr result)))
+ '()
+ (if initial-indent?
+ (string-append (list->string indent-string) str)
+ str))))
+
(define* (fill-paragraph str width #:optional (column 0))
"Fill STR such that each line contains at most WIDTH characters, assuming
that the first character is at COLUMN.
- branch master updated (1eb27d5 -> 591faab), guix-commits, 2020/03/23
- 03/08: ui: Add 'indented-string'.,
guix-commits <=
- 04/08: deploy: Show what machines will be deployed., guix-commits, 2020/03/23
- 01/08: ssh: 'send-files' reports missing modules on the remote host., guix-commits, 2020/03/23
- 02/08: machine: ssh: Make sanity checks in a single round trip., guix-commits, 2020/03/23
- 08/08: gnu: Add python-gcovr., guix-commits, 2020/03/23
- 06/08: machine: ssh: Better report missing initrd modules., guix-commits, 2020/03/23
- 07/08: gnu: Add lv2toweb., guix-commits, 2020/03/23
- 05/08: deploy: Write a message upon successful deployment., guix-commits, 2020/03/23