From patchwork Thu Aug 17 14:09:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 52959 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 DAFC527BBEA; Thu, 17 Aug 2023 15:10:25 +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_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS 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 A18A127BBE9 for ; Thu, 17 Aug 2023 15:10:24 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qWdhT-00078s-Uf; Thu, 17 Aug 2023 10:10:12 -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 1qWdhP-00073A-2T for guix-patches@gnu.org; Thu, 17 Aug 2023 10:10:07 -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 1qWdhK-0006Yy-Mc for guix-patches@gnu.org; Thu, 17 Aug 2023 10:10:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qWdhK-0007c5-If for guix-patches@gnu.org; Thu, 17 Aug 2023 10:10:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65352] [PATCH 1/2] guix: git: Fix the procedure reference-available?. References: <87fs4h4vb9.fsf@gmail.com> In-Reply-To: <87fs4h4vb9.fsf@gmail.com> Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 17 Aug 2023 14:10:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65352 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 65352@debbugs.gnu.org Cc: Simon Tournier Received: via spool by 65352-submit@debbugs.gnu.org id=B65352.169228136729204 (code B ref 65352); Thu, 17 Aug 2023 14:10:02 +0000 Received: (at 65352) by debbugs.gnu.org; 17 Aug 2023 14:09:27 +0000 Received: from localhost ([127.0.0.1]:45276 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qWdgl-0007aw-II for submit@debbugs.gnu.org; Thu, 17 Aug 2023 10:09:27 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]:40296) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qWdgj-0007ad-DP for 65352@debbugs.gnu.org; Thu, 17 Aug 2023 10:09:26 -0400 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-3fe8d816a40so12946805e9.1 for <65352@debbugs.gnu.org>; Thu, 17 Aug 2023 07:09:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692281359; x=1692886159; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=w0VqyJE+c55ki3izHRi5NJ+lBrraHalgA8+CazbDL7Q=; b=BwZ4eChkpc/xjqZ5Xm5hCE6xcOqFf7NiV4lv6PQKi41xw8Y2Voh3oeuz5bE0Vs796H M/qfsutLaa+C7wADg/RSi7dNS45IitlUh6oeCR+h0rjUZiblk8d3FsBpXJ5RksIQSxzZ 7GNAkRnw/dskn8ADN/b3WjzvbQKlGmfyNuLtWvozSgIVUGKo7jEC+NtXI/f8DxmygCnN 8/9WQEPfgA22MpeOXMpQnL7a4FJfHvpJZO2O8u4tr2vbfyBRvBx7ntf8XVuuBX+lprmG U0dzi4ZEiphaSXliVaLAPVqDJH4/52S06C7SCGYPXrsAK4BsMa28YHmwTYofvkG6fQjf xSVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692281359; x=1692886159; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=w0VqyJE+c55ki3izHRi5NJ+lBrraHalgA8+CazbDL7Q=; b=JitL+yRqgD/y3qz31a75I2y3DvrCPa2eAvb46P2IEsp6xkx3DGybC77ecMuKyX1Fkk GLvUwnTWuSJGD6tL1Q2zdNKkm1I3HwHwvz5CUbfahxYHALeSUxAYsio7E0G8X7HdBzk4 zNTiKYn4xb5le/MnhQGVdEoEUOF8NBtFlFtsf++P5cJ517FIPGxxcTKmC/n3BTx5EH/I AegKMvv87UWtGLZiTDZRR2mVoxPJL0/K2zfsibwEqYTQCtTpRBfMhGKXO3G+4yYYnWjA KqwDqXZZ1baEOWe+2KUPCh1ESTJZPPhdhuiugZINTBsrRn9ycL9U+HQyenmaqSiAqpYR YI1Q== X-Gm-Message-State: AOJu0YwVzyI6hx2lUAS7JinIEWsXa3E4aCrN/yYO6zia6tHdsST/90ix kapishSpIExiWn0CuSC9lT5xJO8le+g= X-Google-Smtp-Source: AGHT+IHKSBnsvIl3bH5fwa+HfUlKALFj67Ro5gNq7cmrjAuOVWHvl3JbHFzAH7BPZErCelqhZ/HpOQ== X-Received: by 2002:a05:600c:4710:b0:3fb:aadc:41dc with SMTP id v16-20020a05600c471000b003fbaadc41dcmr4594824wmo.4.1692281359460; Thu, 17 Aug 2023 07:09:19 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id 10-20020a05600c228a00b003fe4ca8decdsm3135502wmf.31.2023.08.17.07.09.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Aug 2023 07:09:19 -0700 (PDT) From: Simon Tournier Date: Thu, 17 Aug 2023 16:09:16 +0200 Message-Id: X-Mailer: git-send-email 2.39.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 * guix/git/scm (reference-available?): Rely of the procedure resolve-reference to determine if the reference belongs to the local Git checkout. --- guix/git.scm | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) base-commit: 1b2d43fe016848ea2ec16ff18cbc14340944fc4e diff --git a/guix/git.scm b/guix/git.scm index dbc3b7caa7..ebe2600209 100644 --- a/guix/git.scm +++ b/guix/git.scm @@ -360,17 +360,8 @@ (define-syntax-rule (false-if-git-not-found exp) (define (reference-available? repository ref) "Return true if REF, a reference such as '(commit . \"cabba9e\"), is definitely available in REPOSITORY, false otherwise." - (match ref - ((or ('commit . commit) - ('tag-or-commit . (? commit-id? commit))) - (let ((len (string-length commit)) - (oid (string->oid commit))) - (false-if-git-not-found - (->bool (if (< len 40) - (object-lookup-prefix repository oid len OBJ-COMMIT) - (commit-lookup repository oid)))))) - (_ - #f))) + (false-if-git-not-found + (->bool (resolve-reference repository ref)))) (define (clone-from-swh url tag-or-commit output) "Attempt to clone TAG-OR-COMMIT (a string), which originates from URL, using From patchwork Thu Aug 17 14:09:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 52958 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 B079B27BBE2; Thu, 17 Aug 2023 15:10:25 +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_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=ham 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 B6D5C27BBEA for ; Thu, 17 Aug 2023 15:10:24 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qWdhT-00078g-Nh; Thu, 17 Aug 2023 10:10:11 -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 1qWdhP-00073E-3K for guix-patches@gnu.org; Thu, 17 Aug 2023 10:10:07 -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 1qWdhL-0006Yz-31 for guix-patches@gnu.org; Thu, 17 Aug 2023 10:10:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qWdhK-0007cC-Uj for guix-patches@gnu.org; Thu, 17 Aug 2023 10:10:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65352] [PATCH 2/2] scripts: pull: Remove unused reference pair. Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 17 Aug 2023 14:10:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65352 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 65352@debbugs.gnu.org Cc: Simon Tournier Received: via spool by 65352-submit@debbugs.gnu.org id=B65352.169228136829210 (code B ref 65352); Thu, 17 Aug 2023 14:10:02 +0000 Received: (at 65352) by debbugs.gnu.org; 17 Aug 2023 14:09:28 +0000 Received: from localhost ([127.0.0.1]:45278 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qWdgl-0007az-Rt for submit@debbugs.gnu.org; Thu, 17 Aug 2023 10:09:28 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]:40297) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qWdgj-0007ae-Np for 65352@debbugs.gnu.org; Thu, 17 Aug 2023 10:09:26 -0400 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-3fe8d816a40so12946855e9.1 for <65352@debbugs.gnu.org>; Thu, 17 Aug 2023 07:09:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692281360; x=1692886160; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ZVcZTXujkU3RxQdcdytnK4naEHEw6fQAf3sEJF0h7EI=; b=MACIhuAs3NCnVTTO47WMT6DlMMU77YutPLuhWhx8tJIF05cAREzWXhlE+/K5ICpQTp pbUYCypmPmPIJUUa44R39Xuy9fzJtqvlPPml7HcfS1toNIRDXS2lZ0b9/lnWPEPHg8eN +gNeW/czpl7jP5S5NV6MRGr+w3adahmxhAWDpupUN6ornVpR798d745oNDvx9a+vwtrr gCS/OiTBIgn+A4bihgbglT2XkACbPOTKL0xOk0QP43m2c0uEonZV6/ekzl53QzLIFY0k rHDWBfbW4RQLTey8IRci0oDr2KyrM6wlnHdaiHbGZG+UDIiE6oRi72rVcS4wqrKyExYn swmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692281360; x=1692886160; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZVcZTXujkU3RxQdcdytnK4naEHEw6fQAf3sEJF0h7EI=; b=QSBZTkOsag2fWWvgRpF242tUgYnWf2igs7tWppLfCWbCKHMUsDVKswyRkicZGL0lLq 58Dth2ICQz0nvZaSwRnE3lXwr+XbxtK14Gw0DXEsVRtQcIwgC7jOnAfxGkfu8b9EZ8/c oNYRa2wXxxG7cSHBGZh5LuhgxoxGxSfRQ752RBF8xIuUVmtU03tO3ltv8LLVuBxHbjCZ rVGAjipeASjqGH6UMHNCaoOqBKrIWhsT+06vTKIkw8oNYiRu5Ti2PwIYfjNbtQy7/l/q 9Qm92fTTbdTyh7S9Ws6lcKcCpfWoTElTEd8xuMqSu7yuDhsnNW8oxD77Ozs2czydKoNZ fLkA== X-Gm-Message-State: AOJu0YxA/SQfwJtaRWVOB7n7QBq4n4alNP1O/pvzPyhWtmzRR1krvjCQ 5T9EE+bojVk8o3C/lyiUhAylqIpujsM= X-Google-Smtp-Source: AGHT+IElCHrs38hHzRPrnlOE1qEViDK9it7nEEhbK9pplo/UxZgqEWH4/e4R1x6dMBx+nitNJ+wj+w== X-Received: by 2002:a5d:444f:0:b0:317:5f08:329f with SMTP id x15-20020a5d444f000000b003175f08329fmr4244170wrr.1.1692281359875; Thu, 17 Aug 2023 07:09:19 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id 10-20020a05600c228a00b003fe4ca8decdsm3135502wmf.31.2023.08.17.07.09.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Aug 2023 07:09:19 -0700 (PDT) From: Simon Tournier Date: Thu, 17 Aug 2023 16:09:17 +0200 Message-Id: <444e7e32d49b56ba6cb0a132e97d63560d8de437.1692281315.git.zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: 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 * guix/scripts/pull.scm (channel-list): Remove commit pair reference specification. --- guix/scripts/pull.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm index 9b78d4b5ca..616926ee0b 100644 --- a/guix/scripts/pull.scm +++ b/guix/scripts/pull.scm @@ -774,8 +774,7 @@ (define (channel-list opts) (if (guix-channel? c) (let ((url (or url (channel-url c)))) (match ref - ((or ('commit . commit) - ('tag-or-commit . commit)) + (('tag-or-commit . commit) (channel (inherit c) (url url) (commit commit) (branch #f))) (('branch . branch)