From mboxrd@z Thu Jan 1 00:00:00 1970 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 Subject: [bug#38518] [PATCH 0/7] 'guix challenge' can diff archives directly Resent-Message-ID: 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 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> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 38518@debbugs.gnu.org Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= 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(-) -- 2.24.0