From patchwork Sat Dec 7 21:42:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 16407 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 C777A17866; Sun, 8 Dec 2019 02:28:34 +0000 (GMT) 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,URIBL_BLOCKED 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 7536F1785E for ; Sun, 8 Dec 2019 02:28:34 +0000 (GMT) Received: from localhost ([::1]:54810 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1idmJF-00017N-NH for patchwork@mira.cbaines.net; Sat, 07 Dec 2019 21:28:33 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53716) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1idmI5-00015S-1o for guix-patches@gnu.org; Sat, 07 Dec 2019 21:27:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1idmHx-0001rm-Ei for guix-patches@gnu.org; Sat, 07 Dec 2019 21:27:16 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:43982) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1idmHn-0001nu-Qp for guix-patches@gnu.org; Sat, 07 Dec 2019 21:27:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1idmHl-0003iL-O7 for guix-patches@gnu.org; Sat, 07 Dec 2019 21:27:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#38518] [PATCH 0/7] 'guix challenge' can diff archives directly Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 08 Dec 2019 02:27:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 38518 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 38518@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.157577196814209 (code B ref -1); Sun, 08 Dec 2019 02:27:01 +0000 Received: (at submit) by debbugs.gnu.org; 8 Dec 2019 02:26:08 +0000 Received: from localhost ([127.0.0.1]:49955 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1idmGu-0003h6-9X for submit@debbugs.gnu.org; Sat, 07 Dec 2019 21:26:08 -0500 Received: from lists.gnu.org ([209.51.188.17]:34855) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1idmGs-0003gz-KM for submit@debbugs.gnu.org; Sat, 07 Dec 2019 21:26:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60013) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1idhqe-00018P-RE for guix-patches@gnu.org; Sat, 07 Dec 2019 16:42:46 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:38082) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1idhqe-0002Ih-DG; Sat, 07 Dec 2019 16:42:44 -0500 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=53094 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1idhqd-0007Dn-T2; Sat, 07 Dec 2019 16:42:44 -0500 From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Sat, 7 Dec 2019 22:42:30 +0100 Message-Id: <20191207214230.25653-1-ludo@gnu.org> X-Mailer: git-send-email 2.24.0 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 Hello Guix! Here’s a gift brought from the R-B Summit in Marrakesh! :-) These changes allow ‘guix challenge’ to directly show the list of changed files, or to invoke ‘diffoscope’ on the differing store items. The new ‘--diff’ option allows users to choose the diff mode. The default now looks like this: --8<---------------cut here---------------start------------->8--- $ ./pre-inst-env guix challenge guile --substitute-urls="https://bayfront.guix.info https://ci.guix.gnu.org" /gnu/store/1mkkv2caiqbdbbd256c4dirfi4kwsacv-guile-2.2.6 contents differ: no local build for '/gnu/store/1mkkv2caiqbdbbd256c4dirfi4kwsacv-guile-2.2.6' https://bayfront.guix.info/nar/lzip/1mkkv2caiqbdbbd256c4dirfi4kwsacv-guile-2.2.6: 1pzzanrfpjmmm6qbgw03qnjmj9zvd4af8sqk44y3m3k36l0dxgwq https://ci.guix.gnu.org/nar/lzip/1mkkv2caiqbdbbd256c4dirfi4kwsacv-guile-2.2.6: 1qhxajxihs3gm4ny61hq9zjnssp8azzsxflk9wq4l8g2l3zicp52 differing files: /lib/guile/2.2/ccache/srfi/srfi-27.go /lib/guile/2.2/ccache/srfi/srfi-19.go /lib/guile/2.2/ccache/srfi/srfi-18.go /lib/guile/2.2/ccache/ice-9/vlist.go /lib/guile/2.2/ccache/ice-9/suspendable-ports.go 1 store items were analyzed: - 0 (0.0%) were identical - 1 (100.0%) differed - 0 (0.0%) were inconclusive --8<---------------cut here---------------end--------------->8--- Feedback welcome! Ludo’. Ludovic Courtès (7): serialization: Add 'fold-archive'. guix archive: Add '--list'. challenge: Report the best narinfo URI. serialization: Remove unused procedure. progress: Add 'progress-report-port'. challenge: Add "--diff". challenge: Support "--diff=diffoscope". doc/guix.texi | 60 +++++++++- guix/progress.scm | 31 +++++ guix/scripts/archive.scm | 45 +++++++- guix/scripts/challenge.scm | 220 ++++++++++++++++++++++++++++++++++-- guix/scripts/substitute.scm | 36 +----- guix/serialization.scm | 152 +++++++++++++------------ guix/tests/http.scm | 6 +- tests/challenge.scm | 96 +++++++++++++++- tests/guix-archive.sh | 7 +- tests/nar.scm | 74 ++++++++++++ 10 files changed, 606 insertions(+), 121 deletions(-)