From: Pierre Neidhardt <mail@ambrevar.xyz>
To: 39642@debbugs.gnu.org
Subject: [bug#39642] [PATCH 1/3] ui: Only display link in capable terminals.
Date: Mon, 17 Feb 2020 14:40:27 +0100 [thread overview]
Message-ID: <20200217134027.731-1-mail@ambrevar.xyz> (raw)
From: zimoun <zimon.toutoune@gmail.com>
* guix/ui.scm (display-generation): Display generation path on new line.
* guix/scripts/describe.scm (channel-commit-hyperlink): Add TRANSFORMER argument.
(display-profile-content): Use TRANSFORMER argument to display URL explicitly
when terminal does not support hyperlinks.
---
guix/scripts/describe.scm | 16 ++++++++++++----
guix/ui.scm | 2 +-
2 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/guix/scripts/describe.scm b/guix/scripts/describe.scm
index f13f221da9..9a7bd52163 100644
--- a/guix/scripts/describe.scm
+++ b/guix/scripts/describe.scm
@@ -201,7 +201,12 @@ way and displaying details about the channel's source code."
(format #t (G_ " commit: ~a~%")
(if (supports-hyperlinks?)
(channel-commit-hyperlink channel commit)
- commit))))
+ commit))
+ (when (not (supports-hyperlinks?)
+ )
+ (format #t (G_ " URL: ~a~%")
+ (channel-commit-hyperlink channel commit
+ (lambda (url msg) url))))))
(_ #f)))
;; Show most recently installed packages last.
@@ -233,9 +238,12 @@ way and displaying details about the channel's source code."
(define* (channel-commit-hyperlink channel
#:optional
- (commit (channel-commit channel)))
+ (commit (channel-commit channel))
+ (transformer hyperlink))
"Return a hyperlink for COMMIT in CHANNEL, using COMMIT as the hyperlink's
-text. The hyperlink links to a web view of COMMIT, when available."
+text. The hyperlink links to a web view of COMMIT, when available.
+TRANSFORMER is a procedure of 2 arguments, a URI and text, and returns a
+string for display."
(let* ((url (channel-url channel))
(uri (string->uri url))
(host (and uri (uri-host uri))))
@@ -244,7 +252,7 @@ text. The hyperlink links to a web view of COMMIT, when available."
(#f
commit)
((_ template)
- (hyperlink (template url commit) commit)))
+ (transformer (template url commit) commit)))
commit)))
\f
diff --git a/guix/ui.scm b/guix/ui.scm
index dce97fb7b9..7e3251446f 100644
--- a/guix/ui.scm
+++ b/guix/ui.scm
@@ -1636,7 +1636,7 @@ DURATION-RELATION with the current time."
(let* ((file (generation-file-name profile number))
(link (if (supports-hyperlinks?)
(cut file-hyperlink file <>)
- identity))
+ (cut format #f (G_ "~a~%file: ~a") <> file)))
(header (format #f (link (highlight (G_ "Generation ~a\t~a")))
number
(date->string
--
2.25.0
next reply other threads:[~2020-02-17 13:41 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-17 13:40 Pierre Neidhardt [this message]
2020-02-17 13:42 ` [bug#39642] [PATCH 2/3] ui: Don't disable colors when INSIDE_EMACS is set Pierre Neidhardt
2020-02-17 13:42 ` [bug#39642] [PATCH 3/3] ui: Don't truncate search output when inside Emacs Pierre Neidhardt
2020-02-17 16:05 ` [bug#39642] [PATCH 1/3] ui: Only display link in capable terminals zimoun
2020-02-17 22:19 ` zimoun
2020-02-18 7:21 ` Pierre Neidhardt
2020-02-18 8:04 ` zimoun
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200217134027.731-1-mail@ambrevar.xyz \
--to=mail@ambrevar.xyz \
--cc=39642@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).