From patchwork Tue Jul 2 13:03:01 2024 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: 65850 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 D3A0F27BBEA; Tue, 2 Jul 2024 14:04:14 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 11A1E27BBE2 for ; Tue, 2 Jul 2024 14:04:14 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sOdB0-0000Nt-0B; Tue, 02 Jul 2024 09:04:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sOdAy-0000NJ-Ph for guix-patches@gnu.org; Tue, 02 Jul 2024 09:04:04 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sOdAy-00074H-94; Tue, 02 Jul 2024 09:04:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sOdAw-0008Lo-40; Tue, 02 Jul 2024 09:04:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71900] [PATCH] git: Remove untracked files from cached checkouts. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix@cbaines.net, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Tue, 02 Jul 2024 13:04:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 71900 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71900@debbugs.gnu.org Cc: Ricardo Wurmus , Ludovic =?utf-8?q?Court=C3=A8s?= , Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by submit@debbugs.gnu.org id=B.171992540232042 (code B ref -1); Tue, 02 Jul 2024 13:04:01 +0000 Received: (at submit) by debbugs.gnu.org; 2 Jul 2024 13:03:22 +0000 Received: from localhost ([127.0.0.1]:36237 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sOdAH-0008Kj-T1 for submit@debbugs.gnu.org; Tue, 02 Jul 2024 09:03:22 -0400 Received: from lists.gnu.org ([209.51.188.17]:40664) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sOdAF-0008Kb-Vo for submit@debbugs.gnu.org; Tue, 02 Jul 2024 09:03:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sOdAE-0000Dl-5B for guix-patches@gnu.org; Tue, 02 Jul 2024 09:03:18 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sOdAC-0006yL-Je; Tue, 02 Jul 2024 09:03:16 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:Subject:To:From:in-reply-to: references; bh=asBIEPM1WkK9EnTybPnb9gIHHtfSt3VzVNi/HNljn/o=; b=Moci8LbyZYsAnb XBRqevkMBPMFLOQk3xwBT9OhU6Uskp/YySu/4/nbI0ZnuBZvk1fP0OooVdpI8YMoHtFqHEz7YeEr1 xTIJvZNDcjkNAhfKvUI/tYZnheRiGLdIDb3fZDqL1FWqtH6fJhJ3YsedawyUQLi2lKuTsjcngUdry OfIKM8+JLjc0f8KXYiKQsr0V1HYE0+/WLyHsNNHnEG+DkJ2FLX27C+6iuDA043MyCcrQlGR5EugG6 WubYU4f2Am4E5CYACKeUIOl8s5EcaIeFB3T6VIHCFGilJyMv0MEeiX2thLkBed9oyYOEwHw+tCf3W d4Sc38ENqwLBGql8ceUA==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Tue, 2 Jul 2024 15:03:01 +0200 Message-ID: <384ad3938ada52672969a2d8563d132c34e9dd01.1719925366.git.ludo@gnu.org> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Cached checkouts could end up with stale untracked files, for example because the checkout was interrupted. As a result, when this happens for the Guix checkout, users would not get substitutes for ‘guix pull’. * guix/git.scm (delete-untracked-files): New procedure. (switch-to-ref): Use it. * tests/git.scm ("update-cached-checkout, untracked files removed"): New test. Co-authored-by: Ricardo Wurmus Change-Id: Iccbe644ade396ad27a037db7e0ef1c2a68ef91ce --- guix/git.scm | 24 ++++++++++++++++++++++++ tests/git.scm | 22 +++++++++++++++++++++- 2 files changed, 45 insertions(+), 1 deletion(-) base-commit: bd908af0c619cb1b74afeeb07839d7af08de9d91 diff --git a/guix/git.scm b/guix/git.scm index d75a301f98b..48a962089de 100644 --- a/guix/git.scm +++ b/guix/git.scm @@ -298,6 +298,25 @@ (define (resolve-reference repository ref) (('tag . tag) (tag->commit repository tag))))) +(define (delete-untracked-files repository) + "Delete untracked files from the work directory of REPOSITORY." + (let ((workdir (repository-working-directory repository)) + (status (status-list-new repository + (make-status-options + STATUS-SHOW-WORKDIR-ONLY + (logior + STATUS-FLAG-INCLUDE-UNTRACKED + STATUS-FLAG-INCLUDE-IGNORED))))) + (for-each (lambda (entry) + (let ((status (status-entry-status entry))) + (when (or (memq 'wt-new status) + (memq 'ignored status)) + (let* ((diff (status-entry-index-to-workdir entry)) + (new (diff-delta-new-file diff))) + (delete-file-recursively + (in-vicinity workdir (diff-file-path new))))))) + (status-list->status-entries status)))) + (define (switch-to-ref repository ref) "Switch to REPOSITORY's branch, commit or tag specified by REF. Return the OID (roughly the commit hash) corresponding to REF." @@ -305,6 +324,11 @@ (define (switch-to-ref repository ref) (resolve-reference repository ref)) (reset repository obj RESET_HARD) + + ;; There might still be untracked files in REPOSITORY due to an interrupted + ;; checkout for example; delete them. + (delete-untracked-files repository) + (object-id obj)) (define (call-with-repository directory proc) diff --git a/tests/git.scm b/tests/git.scm index ad43435b674..9ccd04f0cdf 100644 --- a/tests/git.scm +++ b/tests/git.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2019, 2020, 2022 Ludovic Courtès +;;; Copyright © 2019-2020, 2022, 2024 Ludovic Courtès ;;; Copyright © 2021 Xinglu Chen