From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id gE0KMt28qV/UeQAA0tVLHw (envelope-from ) for ; Mon, 09 Nov 2020 22:04:13 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id yC3SLd28qV8RFQAAB5/wlQ (envelope-from ) for ; Mon, 09 Nov 2020 22:04:13 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 3EF06940548 for ; Mon, 9 Nov 2020 22:04:13 +0000 (UTC) Received: from localhost ([::1]:39316 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kcFGk-00089p-Pe for larch@yhetil.org; Mon, 09 Nov 2020 17:04:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41580) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kcFGc-00089j-PE for bug-guix@gnu.org; Mon, 09 Nov 2020 17:04:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:52461) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kcFGc-0001jU-FO for bug-guix@gnu.org; Mon, 09 Nov 2020 17:04:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kcFGc-0002fs-BO for bug-guix@gnu.org; Mon, 09 Nov 2020 17:04:02 -0500 X-Loop: help-debbugs@gnu.org Subject: bug#43893: [PATCH v3] maint: update-guix-package: Prevent accidentally breaking guix pull. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Mon, 09 Nov 2020 22:04:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43893 X-GNU-PR-Package: guix X-GNU-PR-Keywords: patch To: Maxim Cournoyer Received: via spool by 43893-submit@debbugs.gnu.org id=B43893.160495942710251 (code B ref 43893); Mon, 09 Nov 2020 22:04:02 +0000 Received: (at 43893) by debbugs.gnu.org; 9 Nov 2020 22:03:47 +0000 Received: from localhost ([127.0.0.1]:35774 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kcFGM-0002fH-PP for submit@debbugs.gnu.org; Mon, 09 Nov 2020 17:03:47 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41402) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kcFGK-0002f3-EL for 43893@debbugs.gnu.org; Mon, 09 Nov 2020 17:03:45 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:51997) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kcFGF-0001h2-7l; Mon, 09 Nov 2020 17:03:39 -0500 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=40318 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1kcFGE-0002Cd-Lw; Mon, 09 Nov 2020 17:03:38 -0500 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <87imbedsko.fsf@gnu.org> <20201014031705.4516-1-maxim.cournoyer@gmail.com> <87lfg0bo9m.fsf@gnu.org> <87v9f44852.fsf@gmail.com> <875z749czt.fsf@gnu.org> <87eelpd0af.fsf@gmail.com> <87k0vhm1fg.fsf@gnu.org> <87d0172adj.fsf@gmail.com> <87k0vefjgv.fsf@gnu.org> <874kmifhn2.fsf@gnu.org> <87d00zyrom.fsf@gmail.com> <871rhevfpp.fsf@gnu.org> <877dquib3z.fsf@gmail.com> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 19 Brumaire an 229 de la =?UTF-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Mon, 09 Nov 2020 23:03:37 +0100 In-Reply-To: <877dquib3z.fsf@gmail.com> (Maxim Cournoyer's message of "Mon, 09 Nov 2020 14:28:00 -0500") Message-ID: <878sbarxvq.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -3.3 (---) X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: 43893@debbugs.gnu.org Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" X-Scanner: ns3122888.ip-94-23-21.eu Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of bug-guix-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=bug-guix-bounces@gnu.org X-Spam-Score: -1.51 X-TUID: VxST0i+Enaxl Hi! Maxim Cournoyer skribis: >> Maxim Cournoyer skribis: >> >>>> +(define (assert-clean-checkout repository) >>>> + "Error out if the working directory at REPOSITORY contains local >>>> +modifications." >>>> + (define description >>>> + (let ((format-options (make-describe-format-options >>>> + #:dirty-suffix "-dirty"))) >>>> + (describe-format (describe-workdir repository) format-options))) >>>> + >>>> + (when (string-suffix? "-dirty" description) >>>> + (leave (G_ "attempt to update 'guix' package from a dirty tree (~= a)~%") >>>> + description)) >>>> + >>>> + (info (G_ "updating 'guix' package to '~a'~%") description)) >>> >>> Unfortunately this doesn't catch the case where git has explicitly been >>> told to '--skip-worktree' on a path or file (the original cause of this >>> bug report). See >>> https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D43893#11. >> >> Any such issue is caught when one eventually runs =E2=80=98guix build gu= ix=E2=80=99 >> (wrong commit ID, wrong hash, etc.). >> >> But you=E2=80=99re right that the above test isn=E2=80=99t fool-proof: i= t=E2=80=99s just a way >> to catch this common mistake early and report it nicely. > > Right. I still don't like that it wouldn't work from a checkout where > someone would have modified, e.g., the .dir-locals file locally and > marked it with 'git --skip-worktree'. Having to revert this kind of > 'developer setup' is painful. The current approach makes it unnecessary > (only committed changes are taken into account, not just git tracked > files). =E2=80=9CWouldn=E2=80=99t work=E2=80=9D is a strong statement: like I wrote= , mistakes would always be caught when you try to build =E2=80=98guix=E2=80=99, as with any = other package (we don=E2=80=99t have special support for other packages, why would this o= ne have to be different?). Thanks, Ludo=E2=80=99.