Re: [PATCH] guix: Add whitespacing to --list-generations output.

2016-11-17 Thread Ludovic Courtès 
Efraim Flashner <efr...@flashner.co.il> skribis:

> On Thu, Nov 17, 2016 at 09:59:55AM +0100, Roel Janssen wrote:
>> 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 1Nov 15 2016 11:14:05
>>   guix  0.10.0-1.97c8   out /gnu/store/5ibkqq9...-guix-0.10.0-1.97c8
>> 
>> Generation 2Nov 15 2016 12:06:32
>>  + emacs25.1out /gnu/store/sb2qfjr...-emacs-25.1
>> Generation 4Nov 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 1Nov 15 2016 11:14:05
>>   guix  0.10.0-1.97c8   out /gnu/store/5ibkqq9...-guix-0.10.0-1.97c8
>> 
>> Generation 2Nov 15 2016 12:06:32
>>  + emacs25.1out /gnu/store/sb2qfjr...-emacs-25.1
>> 
>> Generation 4Nov 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 <r...@gnu.org>
>> 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
>> 
>
> That does make it easier to read

+1!

Ludo'.

Re: [PATCH] guix: Add whitespacing to --list-generations output.

2016-11-17 Thread Efraim Flashner 
On Thu, Nov 17, 2016 at 09:59:55AM +0100, Roel Janssen wrote:
> 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 1Nov 15 2016 11:14:05
>   guix  0.10.0-1.97c8   out /gnu/store/5ibkqq9...-guix-0.10.0-1.97c8
> 
> Generation 2Nov 15 2016 12:06:32
>  + emacs25.1out /gnu/store/sb2qfjr...-emacs-25.1
> Generation 4Nov 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 1Nov 15 2016 11:14:05
>   guix  0.10.0-1.97c8   out /gnu/store/5ibkqq9...-guix-0.10.0-1.97c8
> 
> Generation 2Nov 15 2016 12:06:32
>  + emacs25.1out /gnu/store/sb2qfjr...-emacs-25.1
> 
> Generation 4Nov 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 <r...@gnu.org>
> 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
> 

That does make it easier to read

-- 
Efraim Flashner   <efr...@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted


signature.asc
Description: PGP signature

[PATCH] guix: Add whitespacing to --list-generations output.

2016-11-17 Thread Roel Janssen 
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 1Nov 15 2016 11:14:05
  guix  0.10.0-1.97c8   out /gnu/store/5ibkqq9...-guix-0.10.0-1.97c8

Generation 2Nov 15 2016 12:06:32
 + emacs25.1out /gnu/store/sb2qfjr...-emacs-25.1
Generation 4Nov 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 1Nov 15 2016 11:14:05
  guix  0.10.0-1.97c8   out /gnu/store/5ibkqq9...-guix-0.10.0-1.97c8

Generation 2Nov 15 2016 12:06:32
 + emacs25.1out /gnu/store/sb2qfjr...-emacs-25.1

Generation 4Nov 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 <r...@gnu.org>
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