From mboxrd@z Thu Jan 1 00:00:00 1970 From: Efraim Flashner Subject: Re: [PATCH] guix: Add whitespacing to --list-generations output. Date: Thu, 17 Nov 2016 11:24:14 +0200 Message-ID: <20161117092413.GB24482@macbook42.flashner.co.il> References: <1479373195.8617.1.camel@gnu.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="yNb1oOkm5a9FJOVX" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:47719) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c7Ivh-0003pP-98 for guix-devel@gnu.org; Thu, 17 Nov 2016 04:24:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c7Ive-0002DB-41 for guix-devel@gnu.org; Thu, 17 Nov 2016 04:24:25 -0500 Content-Disposition: inline In-Reply-To: <1479373195.8617.1.camel@gnu.org> 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: Roel Janssen Cc: guix-devel@gnu.org --yNb1oOkm5a9FJOVX Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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 > 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(remove= d (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 --=20 Efraim Flashner =D7=90=D7=A4=D7=A8=D7=99=D7=9D = =D7=A4=D7=9C=D7=A9=D7=A0=D7=A8 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --yNb1oOkm5a9FJOVX Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIcBAEBCgAGBQJYLXc8AAoJEPTB05F+rO6TDz8P/3ShiaERYBUjhw26XMdlbibd QODbrA5BLKEzj4DKcCnEDOV4rAGjZq8GyS0OsP+G8UawQ+kCe3ZKllcQHQUWGDJP EEiiIQI0J4xpT+TkgSh4nYy2NK2yi4SOLHXPkJybuY9Aw5G952ZPXAh7LPFwdosv GSCO/RGdd9J8jlDj6KDkKjqGiqShhjZqxzmv2Fz97fRObrMEnG4MnpUV5mjxEMPm B9Q8HGQIklVHBsYoFBc4wqOdWqnACndMS1rhXN4EFmEqsbM0NioeblyYEqB8Ghfb 1dTrT6Jh/4a8INt9nco449f+ZMh7KsRb9tr7auX/z5xLtlnYOFhQA1taJucwptyj 9UIEiNfu6vpy1AQajN4CFiQYiVWsIDKDsMIqLz/XRKMQ0cU6ewrqFNbNqCbXdqEI 9gUchnzgGDh/lhbiDEGCBOm63417M37yKAusGHn8fZkOlRuXFjd3P5hT0KoJNQ+f IE1ifpsMDOdtEfv/GrQ82ntm1Matf0xpqINowcIQKEO/GoOBDA4L2lAS/KFICuo5 H1VBuW27wPkbSv5J0GKXpl5a4TyiexDF0RJViIxze9ssI1U/b9ScWnSNEygL6Hfs 4u30RqaWrKy/YwSulqaeh/S9WJqCISCEj9qtBieT2DDn5HXf/XrOw2A3sgTSqkYC RueUuawy9qsLmGy3x6ZT =9ah6 -----END PGP SIGNATURE----- --yNb1oOkm5a9FJOVX--