* [PATCH] guix: Add whitespacing to --list-generations output.
@ 2016-11-17 8:59 Roel Janssen
2016-11-17 9:24 ` Efraim Flashner
0 siblings, 1 reply; 3+ messages in thread
From: Roel Janssen @ 2016-11-17 8:59 UTC (permalink / raw)
To: guix-devel
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 <roel@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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] guix: Add whitespacing to --list-generations output.
2016-11-17 8:59 [PATCH] guix: Add whitespacing to --list-generations output Roel Janssen
@ 2016-11-17 9:24 ` Efraim Flashner
2016-11-17 12:28 ` Ludovic Courtès
0 siblings, 1 reply; 3+ messages in thread
From: Efraim Flashner @ 2016-11-17 9:24 UTC (permalink / raw)
To: Roel Janssen; +Cc: guix-devel
[-- Attachment #1: Type: text/plain, Size: 2974 bytes --]
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 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 <roel@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 <efraim@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
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 801 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] guix: Add whitespacing to --list-generations output.
2016-11-17 9:24 ` Efraim Flashner
@ 2016-11-17 12:28 ` Ludovic Courtès
0 siblings, 0 replies; 3+ messages in thread
From: Ludovic Courtès @ 2016-11-17 12:28 UTC (permalink / raw)
To: Efraim Flashner; +Cc: guix-devel
Efraim Flashner <efraim@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 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 <roel@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'.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-11-17 12:28 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-11-17 8:59 [PATCH] guix: Add whitespacing to --list-generations output Roel Janssen
2016-11-17 9:24 ` Efraim Flashner
2016-11-17 12:28 ` Ludovic Courtès
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.