From mboxrd@z Thu Jan  1 00:00:00 1970
From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=)
Subject: Re: [PATCH] guix: Add whitespacing to --list-generations output.
Date: Thu, 17 Nov 2016 13:28:12 +0100
Message-ID: <87wpg247fn.fsf@gnu.org>
References: <1479373195.8617.1.camel@gnu.org>
	<20161117092413.GB24482@macbook42.flashner.co.il>
Mime-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Return-path: <guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([2001:4830:134:3::10]:35506)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <ludo@gnu.org>) id 1c7Lnf-0004SP-CN
	for guix-devel@gnu.org; Thu, 17 Nov 2016 07:28:20 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <ludo@gnu.org>) id 1c7Lnb-0004q9-EK
	for guix-devel@gnu.org; Thu, 17 Nov 2016 07:28:19 -0500
In-Reply-To: <20161117092413.GB24482@macbook42.flashner.co.il> (Efraim
	Flashner's message of "Thu, 17 Nov 2016 11:24:14 +0200")
List-Id: "Development of GNU Guix and the GNU System distribution."
	<guix-devel.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-devel>,
	<mailto:guix-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/guix-devel/>
List-Post: <mailto:guix-devel@gnu.org>
List-Help: <mailto:guix-devel-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-devel>,
	<mailto:guix-devel-request@gnu.org?subject=subscribe>
Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org
Sender: "Guix-devel" <guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org>
To: Efraim Flashner <efraim@flashner.co.il>
Cc: guix-devel@gnu.org

Efraim Flashner <efraim@flashner.co.il> skribis:

> On Thu, Nov 17, 2016 at 09:59:55AM +0100, Roel Janssen wrote:
>> Dear Guix,
>>=20
>> 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.
>>=20
>> This patch adds that blank line to the diffs as well.
>>=20
>> Before:
>> ------------------------------------------------------------------------=
------
>> Generation 1=C2=A0=C2=A0=C2=A0=C2=A0Nov 15 2016 11:14:05
>> =C2=A0 guix=C2=A0=C2=A00.10.0-1.97c8=C2=A0=C2=A0=C2=A0out=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0/gnu/store/5ibkqq9...-guix-0.10.0-1.97c8
>>=20
>> Generation 2=C2=A0=C2=A0=C2=A0=C2=A0Nov 15 2016 12:06:32
>> =C2=A0+ emacs=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A025.1=C2=A0=
=C2=A0=C2=A0=C2=A0out=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0/gnu/store/sb2qfjr...-em=
acs-25.1
>> Generation 4=C2=A0=C2=A0=C2=A0=C2=A0Nov 15 2016 12:22:15
>> =C2=A0+ guix 0.11.0-3.7ca3=C2=A0=C2=A0=C2=A0out=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0/gnu/store/l99rkv2...-guix-0.11.0-3.7ca3
>> =C2=A0- guix 0.10.0-1.97c8=C2=A0=C2=A0=C2=A0out=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0/gnu/store/5ibkqq9...-guix-0.10.0-1.97c8
>> ------------------------------------------------------------------------=
------
>>=20
>> After:
>> ------------------------------------------------------------------------=
------
>> Generation 1=C2=A0=C2=A0=C2=A0=C2=A0Nov 15 2016 11:14:05
>> =C2=A0 guix=C2=A0=C2=A00.10.0-1.97c8=C2=A0=C2=A0=C2=A0out=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0/gnu/store/5ibkqq9...-guix-0.10.0-1.97c8
>>=20
>> Generation 2=C2=A0=C2=A0=C2=A0=C2=A0Nov 15 2016 12:06:32
>> =C2=A0+ emacs=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A025.1=C2=A0=
=C2=A0=C2=A0=C2=A0out=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0/gnu/store/sb2qfjr...-em=
acs-25.1
>>=20
>> Generation 4=C2=A0=C2=A0=C2=A0=C2=A0Nov 15 2016 12:22:15
>> =C2=A0+ guix 0.11.0-3.7ca3=C2=A0=C2=A0=C2=A0out=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0/gnu/store/l99rkv2...-guix-0.11.0-3.7ca3
>> =C2=A0- guix 0.10.0-1.97c8=C2=A0=C2=A0=C2=A0out=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0/gnu/store/5ibkqq9...-guix-0.10.0-1.97c8
>> ------------------------------------------------------------------------=
------
>>=20
>> As you can see, it's only a small change, and so is the code change.
>> Here's the patch:
>>=20
>> >From a9b5305f8af51b88643986f99a8e94cad4d7a805 Mon Sep 17 00:00:00 2001
>> From: Roel Janssen <roel@gnu.org>
>> Date: Thu, 17 Nov 2016 09:46:15 +0100
>> Subject: [PATCH] guix: Add whitespacing to --list-generations output.
>>=20
>> ---
>> =C2=A0guix/ui.scm | 3 ++-
>> =C2=A01 file changed, 2 insertions(+), 1 deletion(-)
>>=20
>> 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."
>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0(remov=
ed (lset-difference
>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0equal-entry? (list-en=
tries old) (list-entries new))))
>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0(for-each (cut display-entry <=
> "+") added)
>> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0(for-each (cut display-entry <> "-"=
) removed)))
>> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0(for-each (cut display-entry <> "-"=
) removed)
>> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0(newline)))
>> =C2=A0
>> =C2=A0=C2=A0=C2=A0(display-diff profile gen1 gen2))
>> =C2=A0
>> --=C2=A0
>> 2.7.4
>>=20
>> Kind regards,
>> Roel Janssen
>>=20
>
> That does make it easier to read

+1!

Ludo'.