From patchwork Sat Sep 21 21:12:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 15433 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 7DC9017400; Sat, 21 Sep 2019 22:14:13 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 453BB173FB for ; Sat, 21 Sep 2019 22:14:13 +0100 (BST) Received: from localhost ([::1]:43768 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iBmho-0003s2-Qp for patchwork@mira.cbaines.net; Sat, 21 Sep 2019 17:14:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41414) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iBmgp-00033l-23 for guix-patches@gnu.org; Sat, 21 Sep 2019 17:13:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iBmgn-00060m-Rd for guix-patches@gnu.org; Sat, 21 Sep 2019 17:13:10 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52665) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iBmgn-00060f-Ox for guix-patches@gnu.org; Sat, 21 Sep 2019 17:13:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iBmgn-0000P2-IU for guix-patches@gnu.org; Sat, 21 Sep 2019 17:13:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#37413] [PATCH v2 08/11] pull: '-l' displays channel news. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 21 Sep 2019 21:13:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 37413 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 37413@debbugs.gnu.org Received: via spool by 37413-submit@debbugs.gnu.org id=B37413.15691003811454 (code B ref 37413); Sat, 21 Sep 2019 21:13:09 +0000 Received: (at 37413) by debbugs.gnu.org; 21 Sep 2019 21:13:01 +0000 Received: from localhost ([127.0.0.1]:33239 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iBmgf-0000NH-4q for submit@debbugs.gnu.org; Sat, 21 Sep 2019 17:13:01 -0400 Received: from eggs.gnu.org ([209.51.188.92]:32828) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iBmga-0000LL-K0 for 37413@debbugs.gnu.org; Sat, 21 Sep 2019 17:12:57 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:49545) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1iBmgV-0005fj-HN; Sat, 21 Sep 2019 17:12:51 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=53014 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1iBmgV-00065A-2T; Sat, 21 Sep 2019 17:12:51 -0400 From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Sat, 21 Sep 2019 23:12:25 +0200 Message-Id: <20190921211228.13096-9-ludo@gnu.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190921211228.13096-1-ludo@gnu.org> References: <87sgow0w7w.fsf@gnu.org> <20190921211228.13096-1-ludo@gnu.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * guix/scripts/pull.scm (display-channel-news): Make 'previous' a parameter. (process-query)[list-generations]: Call 'display-channel-news'. --- guix/scripts/pull.scm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm index 85291c3745..4a4756dc6e 100644 --- a/guix/scripts/pull.scm +++ b/guix/scripts/pull.scm @@ -272,12 +272,12 @@ and NEW are records with a proper 'commit' field." (for-each (cut display-news-entry <> language port) entries) (newline port))))))) -(define (display-channel-news profile) - "Display new about the channels of PROFILE " - (define previous - (and=> (relative-generation profile -1) - (cut generation-file-name profile <>))) - +(define* (display-channel-news profile + #:optional + (previous + (and=> (relative-generation profile -1) + (cut generation-file-name profile <>)))) + "Display news about the channels of PROFILE compared to PREVIOUS." (when previous (let ((old-channels (profile-channels previous)) (new-channels (profile-channels profile))) @@ -614,6 +614,8 @@ display long package lists that would fill the user's screen." ((first second rest ...) (display-profile-content-diff profile first second) + (display-channel-news (generation-file-name profile second) + (generation-file-name profile first)) (loop (cons second rest))) ((_) #t) (() #t))))))