From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:55995) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j3gdz-0001HU-4H for guix-patches@gnu.org; Mon, 17 Feb 2020 08:41:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j3gdy-0007xy-1x for guix-patches@gnu.org; Mon, 17 Feb 2020 08:41:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:60417) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j3gdx-0007xu-Vp for guix-patches@gnu.org; Mon, 17 Feb 2020 08:41:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1j3gdx-0002N2-Sy for guix-patches@gnu.org; Mon, 17 Feb 2020 08:41:01 -0500 Subject: [bug#39642] [PATCH 1/3] ui: Only display link in capable terminals. Resent-Message-ID: Received: from eggs.gnu.org ([2001:470:142:3::10]:55925) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j3gdV-00018o-34 for guix-patches@gnu.org; Mon, 17 Feb 2020 08:40:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j3gdT-0007iJ-Br for guix-patches@gnu.org; Mon, 17 Feb 2020 08:40:32 -0500 Received: from relay4-d.mail.gandi.net ([217.70.183.196]:59083) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j3gdT-0007gX-58 for guix-patches@gnu.org; Mon, 17 Feb 2020 08:40:31 -0500 Received: from bababa.home (lfbn-idf2-1-1315-147.w92-169.abo.wanadoo.fr [92.169.129.147]) (Authenticated sender: mail@ambrevar.xyz) by relay4-d.mail.gandi.net (Postfix) with ESMTPSA id 04501E0004 for ; Mon, 17 Feb 2020 13:40:27 +0000 (UTC) From: Pierre Neidhardt Date: Mon, 17 Feb 2020 14:40:27 +0100 Message-Id: <20200217134027.731-1-mail@ambrevar.xyz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 39642@debbugs.gnu.org From: zimoun * 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))) 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