From mboxrd@z Thu Jan 1 00:00:00 1970 From: Roel Janssen Subject: Re: Display diffs between generations. Date: Wed, 19 Oct 2016 23:48:56 +0200 Message-ID: <87vawo57sn.fsf@gnu.org> References: <87eg59izmw.fsf@gnu.org> <87d1kry22u.fsf@gnu.org> <87inuj5r5v.fsf@gnu.org> <87y43ck6dz.fsf@gnu.org> <87a8frq0n5.fsf@gnu.org> <87lgz78v4d.fsf@gnu.org> <87eg3ogd5l.fsf@gnu.org> <87r37nxshp.fsf@gnu.org> <8760opeskj.fsf@gnu.org> <87wph43x8x.fsf@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]:48577) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bwyiJ-00024z-0k for guix-devel@gnu.org; Wed, 19 Oct 2016 17:47:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bwyiH-0000jR-VZ for guix-devel@gnu.org; Wed, 19 Oct 2016 17:47:55 -0400 In-reply-to: <87wph43x8x.fsf@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: Ludovic =?utf-8?Q?Court=C3=A8s?= Cc: guix-devel Ludovic Courtès writes: > Roel Janssen skribis: > >> Roel Janssen writes: >> >>> Ludovic Courtès writes: > > [...] > >>>> In the discussion that ensued, it seems there was a consensus to provide >>>> only the diff format: >>>> >>>> https://lists.gnu.org/archive/html/guix-devel/2016-09/msg00385.html >>>> >>>> So it seems all the lights are green. :-) Let me know if there’s >>>> anything we should do to help! >>> >>> Thanks for the reminder. I seem to have a lot to finish up :-). I will >>> work out the arguments and post a new version of the patch for final review. >> >> My GNU mail hasn't been working for a couple of days, but now that it >> does, I wonder if the initial patch I sent is fine as-is, since we agree >> upon only showing the diff format. >> >> Should I implement the --no-diff-format option to change to the >> old behavior? > > I don’t think so. The old behavior will always be available by > specifying a single generation anyway: > > guix package --list-generations=42 > > It may be worth mentioning this in the manual. > > My understanding of the discussion referred above is that people were > fine with that (or indifferent ;-)). Then the following patch should be it. I applied your genius suggestions of using @code{display-entry} instead of @code{display-entries}. I learned something new again today. :-) >From 5630a512f16c6677fd5b0b8085e2ef15cb10499b Mon Sep 17 00:00:00 2001 From: Roel Janssen Date: Wed, 19 Oct 2016 23:38:11 +0200 Subject: [PATCH] guix package: Display generation diffs. * guix/ui.scm (display-profile-content-diff): New variable. * guix/scripts/package.scm (process-query): Use display-profile-content-diff. --- guix/scripts/package.scm | 2 +- guix/ui.scm | 27 +++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/guix/scripts/package.scm b/guix/scripts/package.scm index b87aee0..5d93b7b 100644 --- a/guix/scripts/package.scm +++ b/guix/scripts/package.scm @@ -670,7 +670,7 @@ processed, #f otherwise." (define (list-generation number) (unless (zero? number) (display-generation profile number) - (display-profile-content profile number) + (display-profile-content-diff profile number) (newline))) (cond ((not (file-exists? profile)) ; XXX: race condition diff --git a/guix/ui.scm b/guix/ui.scm index eb85df3..7c835c2 100644 --- a/guix/ui.scm +++ b/guix/ui.scm @@ -87,6 +87,7 @@ matching-generations display-generation display-profile-content + display-profile-content-diff roll-back* switch-to-generation* delete-generation* @@ -1070,6 +1071,32 @@ DURATION-RELATION with the current time." (format #t (_ "~a\t(current)~%") header) (format #t "~a~%" header))))) +(define (display-profile-content-diff profile number) + "Display the changed packages in PROFILE compared to generation NUMBER." + + (define (equal-entry? first second) + (string= (manifest-entry-item first) (manifest-entry-item second))) + + (define (display-entry entry prefix) + (match entry + (($ name version output location _) + (format #t " ~a ~a\t~a\t~a\t~a~%" prefix name version output location)))) + + (define (list-entries input) + (manifest-entries (profile-manifest (generation-file-name profile input)))) + + (define (display-diff profile old new) + (if (= old 0) + (display-profile-content profile new) + (let ((added (lset-difference + equal-entry? (list-entries new) (list-entries old))) + (removed (lset-difference + equal-entry? (list-entries old) (list-entries new)))) + (for-each (cut display-entry <> "+") added) + (for-each (cut display-entry <> "-") removed)))) + + (display-diff profile (previous-generation-number profile number) number)) + (define (display-profile-content profile number) "Display the packages in PROFILE, generation NUMBER, in a human-readable way." -- 2.10.0 Kind regards, Roel Janssen