From mboxrd@z Thu Jan 1 00:00:00 1970 From: Roel Janssen Subject: [PATCH] guix: Add whitespacing to --list-generations output. Date: Thu, 17 Nov 2016 09:59:55 +0100 Message-ID: <1479373195.8617.1.camel@gnu.org> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:44196) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c7IYM-0005t8-NH for guix-devel@gnu.org; Thu, 17 Nov 2016 04:00:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c7IYJ-00055K-I5 for guix-devel@gnu.org; Thu, 17 Nov 2016 04:00:18 -0500 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:39523) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c7IYJ-00055B-F1 for guix-devel@gnu.org; Thu, 17 Nov 2016 04:00:15 -0500 Received: from [143.121.198.129] (port=49728 helo=cog147) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.82) (envelope-from ) id 1c7IYI-0004k0-2e for guix-devel@gnu.org; Thu, 17 Nov 2016 04:00:14 -0500 List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org Dear Guix, The new diff-format displayed when invoking @command{guix package --list-generations} prints a blank line after the initial generation, and then no blank lines in the diffs. This patch adds that blank line to the diffs as well. Before: ------------------------------------------------------------------------------ Generation 1    Nov 15 2016 11:14:05   guix  0.10.0-1.97c8   out     /gnu/store/5ibkqq9...-guix-0.10.0-1.97c8 Generation 2    Nov 15 2016 12:06:32  + emacs        25.1    out     /gnu/store/sb2qfjr...-emacs-25.1 Generation 4    Nov 15 2016 12:22:15  + guix 0.11.0-3.7ca3   out     /gnu/store/l99rkv2...-guix-0.11.0-3.7ca3  - guix 0.10.0-1.97c8   out     /gnu/store/5ibkqq9...-guix-0.10.0-1.97c8 ------------------------------------------------------------------------------ After: ------------------------------------------------------------------------------ Generation 1    Nov 15 2016 11:14:05   guix  0.10.0-1.97c8   out     /gnu/store/5ibkqq9...-guix-0.10.0-1.97c8 Generation 2    Nov 15 2016 12:06:32  + emacs        25.1    out     /gnu/store/sb2qfjr...-emacs-25.1 Generation 4    Nov 15 2016 12:22:15  + guix 0.11.0-3.7ca3   out     /gnu/store/l99rkv2...-guix-0.11.0-3.7ca3  - guix 0.10.0-1.97c8   out     /gnu/store/5ibkqq9...-guix-0.10.0-1.97c8 ------------------------------------------------------------------------------ As you can see, it's only a small change, and so is the code change. Here's the patch: >From a9b5305f8af51b88643986f99a8e94cad4d7a805 Mon Sep 17 00:00:00 2001 From: Roel Janssen Date: Thu, 17 Nov 2016 09:46:15 +0100 Subject: [PATCH] guix: Add whitespacing to --list-generations output. ---  guix/ui.scm | 3 ++-  1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/guix/ui.scm b/guix/ui.scm index b9fbbfd..cafb3c6 100644 --- a/guix/ui.scm +++ b/guix/ui.scm @@ -1094,7 +1094,8 @@ DURATION-RELATION with the current time."            (removed (lset-difference                      equal-entry? (list-entries old) (list-entries new))))        (for-each (cut display-entry <> "+") added) -      (for-each (cut display-entry <> "-") removed))) +      (for-each (cut display-entry <> "-") removed) +      (newline)))      (display-diff profile gen1 gen2))   --  2.7.4 Kind regards, Roel Janssen