Received: (at 65352) by debbugs.gnu.org; 25 Sep 2023 11:21:42 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Mon Sep 25 07:21:42 2023 Received: from localhost ([127.0.0.1]:44472 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1qkjen-0000Zb-M5 for submit <at> debbugs.gnu.org; Mon, 25 Sep 2023 07:21:41 -0400 Received: from mail-oa1-x33.google.com ([2001:4860:4864:20::33]:38033) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <zimon.toutoune@HIDDEN>) id 1qkjej-0000ZF-M6 for 65352 <at> debbugs.gnu.org; Mon, 25 Sep 2023 07:21:41 -0400 Received: by mail-oa1-x33.google.com with SMTP id 586e51a60fabf-1bb3df62b34so261231fac.0 for <65352 <at> debbugs.gnu.org>; Mon, 25 Sep 2023 04:21:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695640879; x=1696245679; darn=debbugs.gnu.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=+DJW3fEJNj202UGBnFg6MWbRwfirtZo9BhZDeWKfJdI=; b=GaufiACb35bn8RpptwEw3oVkXimoHdjIbUtBuNSr5Ls+eu9Xf7e8UWH7z6dXHT21Gz eMme5Dc31a5322r2G8Jkaue5B709VM8XkMlQqss1/uGXZrOjF8f7N6f4pv6gYlz7oPMY Y3c1Mk0L2AR+4b3/hDlCMar3pP6Tz2Oz1jwQS4Opd3Ox+7IMRO+n0lnnP1+CefUE+GFT bhfnCMdwIwtL9AuEBskaCoceMf2oh2NzkhHVVJhBwOjVMSRt0sQCw8FHCXDtHGDQq8XO ilFS6T36/qIbBuELmFMXDfjaHdil76FEjthAS34EyiR73VJgq2+89DU1PU0tqGgMjE7k qd+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695640879; x=1696245679; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+DJW3fEJNj202UGBnFg6MWbRwfirtZo9BhZDeWKfJdI=; b=qAUBIcKKBxUwFmqNmAQKC0NXfCstHFKaMB5It54bJBLGcW5ib/1bhQqAZ2NiSuiIsa yVNdoDCnWoXYdqtZLwi6Ee+4nKz1Q9KzAmIPFxmt74cFfUUM85z9EMdAjKGNXMNK/m2X OQelUlhNXPew2wIdlFBMyvWfAk3vF8qjoS5r9pYgjUbmtpdr5v4fo1KBk/4b/Acnafum fAKv1rJnFsFvAiz2VJp8j4Ulmb3nY3RJiHa7g7apcKN8cKn8bQ/5CwNgrGF1TPkP9WT9 U5HJXSf0+l1HvAPVUNuXxOhwIAUAu3l7t4ZQJ347ZmMd/WhAFLskjvWLe/8hUbfzJ+ps 37FQ== X-Gm-Message-State: AOJu0YzCAWShfz4zCL+WjAR6TsCFpYb8IvN0J2bCvMDdMtf0bQZKiy+y MELCjwl050vrEZZjdrNyqCsj7y3QTDyvFH6MeA0= X-Google-Smtp-Source: AGHT+IHw8QmMvQgYFDeqmFKrAmlo+eG8BaONcX5nGI2DxlQR2eWLGeBzCdLGalPloDFytxrm8y5pdl04Mwk+99icOOE= X-Received: by 2002:a05:6870:3126:b0:1d5:bda7:132d with SMTP id v38-20020a056870312600b001d5bda7132dmr5785746oaa.4.1695640879399; Mon, 25 Sep 2023 04:21:19 -0700 (PDT) MIME-Version: 1.0 References: <86ledjoaly.fsf@HIDDEN> <32d3fb5066e0b20e200dabef0fba897634e21dda.1694009405.git.zimon.toutoune@HIDDEN> <875y4dltgm.fsf_-_@HIDDEN> <86a5tqzze6.fsf@HIDDEN> <87zg1pgm7v.fsf@HIDDEN> <87pm267g4h.fsf_-_@HIDDEN> <CAJ3okZ3KZmYrCePBOCGXCooa1J6o0dT5yxiTJ61t83_wJ4nLjA@HIDDEN> In-Reply-To: <CAJ3okZ3KZmYrCePBOCGXCooa1J6o0dT5yxiTJ61t83_wJ4nLjA@HIDDEN> From: Simon Tournier <zimon.toutoune@HIDDEN> Date: Mon, 25 Sep 2023 13:21:08 +0200 Message-ID: <CAJ3okZ1kfQ5iMrQmSYKC5LGEa5vjE5918AOZBCcPwL3v9zzojQ@HIDDEN> Subject: Re: bug#65352: Fix time-machine and network To: =?UTF-8?Q?Ludovic_Court=C3=A8s?= <ludo@HIDDEN> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65352 Cc: 65352 <at> debbugs.gnu.org, Christopher Baines <guix@HIDDEN>, Maxim Cournoyer <maxim.cournoyer@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) Re On Mon, 25 Sept 2023 at 11:57, Simon Tournier <zimon.toutoune@HIDDEN> wr= ote: > On Mon, 25 Sept 2023 at 11:32, Ludovic Court=C3=A8s <ludo@HIDDEN> wrote: > > > 1. =E2=80=98false-if-git-not-found=E2=80=99 was removed around the ca= ll to > > =E2=80=98commit-lookup=E2=80=99, which breaks things as reported j= ust today on > > IRC. Could you reintroduce it? [...] > Yes, for sure let reintroduce it. Done with 94f3831e5bb1e04eeb3a0e7d31a0675208ce6f4c. Cheers, simon
guix-patches@HIDDEN:bug#65352; Package guix-patches.
Full text available.Received: (at 65352) by debbugs.gnu.org; 25 Sep 2023 09:58:03 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Mon Sep 25 05:58:03 2023 Received: from localhost ([127.0.0.1]:44249 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1qkiLr-0006Cq-CL for submit <at> debbugs.gnu.org; Mon, 25 Sep 2023 05:58:03 -0400 Received: from mail-qv1-xf36.google.com ([2607:f8b0:4864:20::f36]:39174) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <zimon.toutoune@HIDDEN>) id 1qkiLn-0006CE-5N for 65352 <at> debbugs.gnu.org; Mon, 25 Sep 2023 05:58:02 -0400 Received: by mail-qv1-xf36.google.com with SMTP id 6a1803df08f44-65afc3310e3so5283996d6.1 for <65352 <at> debbugs.gnu.org>; Mon, 25 Sep 2023 02:57:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695635861; x=1696240661; darn=debbugs.gnu.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=p2iNpKR9vfRUdFZ7vALA5xDJGZxDdaeobfeZdjlLw/c=; b=Jd4qJGrrW/T8/3kEg5oB71gMXGP3qdK+mDkP/TPhIhiIgHvI+xu9vydJ9s8j20zX0N WYCYrIMjrSVLwnQFG3DCePGBoVrEo/s9HTW1k3jBMsR4akZBAIAvTsuos6WIg9WsHo9X WhvPNUoFjZ+sFLGV8Ca3PeruSbX/Py5Eb+IF1o2MA5jZ0iNHMtAmIoNh6kASPUDfc2Tk cdmwPqza4EehGIRpaujyGAZpjxD1txGbIQa/Y8WL/gtXhAUEfbHDfnlpFIyl6r86IlPK +jpsXjgmxlMwNvI22O6VK7XoXKWxBAefUqEVVYX1sF7o2Pa4C7VEzf9C9Pl6g8j6W5qx lICA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695635861; x=1696240661; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=p2iNpKR9vfRUdFZ7vALA5xDJGZxDdaeobfeZdjlLw/c=; b=M2swC2vTOnSsBwbb+prse/CmwIrERzkZd7sgP7d5wpraMHxgWVpDTOqA9MeoeMJG7D uiRa80hLaYT/syDok7M0Gw+SfIot/21ZM71GIo755MPV6yJEth60OP69KYywCJDbOBw5 6vq0TGjmT2SEIMbje0u28DHJLQPINdsw1ZcNe8iTGJAaq0LelhqTuUs+4bS+JOYLtYQ3 BzbigZPcjWVR6jsvJBsCOLJfGoM0xt2bfPcmwDq+Pl0MlvuUlqWFsoaxUr+g9uFfWWZd Y0zImhuNBLROOH1LmG+lNolnAHz1HmRrm84XoOmrAKwUtbj45ZVrgICm4hH5gvCuvAIl eClQ== X-Gm-Message-State: AOJu0Yy2l/hYlWb9dj814XRDmtGsiEd+IhaHsVsls9ndlEcPtuHPDBIk grzZ/aeKs3fuK98L0WQQdfwBA9EhL8oO1UoiyPs= X-Google-Smtp-Source: AGHT+IE4IrJBxMkPCpoGuYpclbnqerBjb90VbtU9u4A+SQhiRTW2rmahLr4COelnL4jP0LRRLgW7Y6+HI1ooobaASag= X-Received: by 2002:a05:6214:a11:b0:65a:fc66:bbc1 with SMTP id dw17-20020a0562140a1100b0065afc66bbc1mr5106524qvb.5.1695635861254; Mon, 25 Sep 2023 02:57:41 -0700 (PDT) MIME-Version: 1.0 References: <86ledjoaly.fsf@HIDDEN> <32d3fb5066e0b20e200dabef0fba897634e21dda.1694009405.git.zimon.toutoune@HIDDEN> <875y4dltgm.fsf_-_@HIDDEN> <86a5tqzze6.fsf@HIDDEN> <87zg1pgm7v.fsf@HIDDEN> <87pm267g4h.fsf_-_@HIDDEN> In-Reply-To: <87pm267g4h.fsf_-_@HIDDEN> From: Simon Tournier <zimon.toutoune@HIDDEN> Date: Mon, 25 Sep 2023 11:57:30 +0200 Message-ID: <CAJ3okZ3KZmYrCePBOCGXCooa1J6o0dT5yxiTJ61t83_wJ4nLjA@HIDDEN> Subject: Re: bug#65352: Fix time-machine and network To: =?UTF-8?Q?Ludovic_Court=C3=A8s?= <ludo@HIDDEN> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65352 Cc: 65352 <at> debbugs.gnu.org, Christopher Baines <guix@HIDDEN>, Maxim Cournoyer <maxim.cournoyer@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) Hi, On Mon, 25 Sept 2023 at 11:32, Ludovic Court=C3=A8s <ludo@HIDDEN> wrote: > 1. =E2=80=98false-if-git-not-found=E2=80=99 was removed around the call= to > =E2=80=98commit-lookup=E2=80=99, which breaks things as reported jus= t today on > IRC. Could you reintroduce it? About "guix system"? Yes, for sure let reintroduce it. But I miss why it would work for one case and not for the other. I was looking at 'check-forward-update'. > 2. Short commit IDs are no longer handled in the 'commit case, as I > mentioned before in this thread (and then forgot). Could you > reintroduce support for them? Short commit ID are handled by tag-or-commit (guix time-machine and guix pull). If there is a discrepancy elsewhere with short commit ID, it should be fixed overthere, IMHO. Else, I do not understand what you are asking. From my understanding, it would not make sense to have short commit ID handled with (commit . "abc123") for some part of the code and (tag-or-commit . "abc123") for some other part. Cheers, simon
guix-patches@HIDDEN:bug#65352; Package guix-patches.
Full text available.
Received: (at 65352) by debbugs.gnu.org; 25 Sep 2023 09:32:52 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Mon Sep 25 05:32:52 2023
Received: from localhost ([127.0.0.1]:44232 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qkhxT-0002qi-Sl
for submit <at> debbugs.gnu.org; Mon, 25 Sep 2023 05:32:52 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:50712)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <ludo@HIDDEN>) id 1qkhxS-0002qW-1D
for 65352 <at> debbugs.gnu.org; Mon, 25 Sep 2023 05:32:50 -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 <ludo@HIDDEN>)
id 1qkhx5-0007vb-9k; Mon, 25 Sep 2023 05:32:28 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To:
From; bh=zMYDCCN7FUCf2wJdD7WtyB6kqml91dWhumuXhj7DhsY=; b=f0oC49krEJjkrreozScJ
180O0bSEn75XQsO91jlVjMI8iJfK1n13IwLf6ThJDUIOR0MF9WyrqnLxkYOhzfxjSwFd6r7UrFPf3
B8/w+pfawsUzdWFj9noejacErRjBHIwh6n/7paBsVATgl2y1mzsclEVFX2N+f4THWVzu4gQQwx1wh
fOugj3P1AvvoY1ze0j3NAkLOHefvjCpCAXcKx9C+3Tn/fU5TT10puXaIYlpab+sHNdwnY3aewFzkP
akYD9sx/06O4ALtC0KSRC7TCp0SNC37lcQuto+unAMmLgvFstoWEbPwum8cd0WlPu0exKKCTTTguY
eWRRrhc/GA0a+Q==;
From: =?utf-8?Q?Ludovic_Court=C3=A8s?= <ludo@HIDDEN>
To: Simon Tournier <zimon.toutoune@HIDDEN>
Subject: Re: bug#65352: Fix time-machine and network
References: <86ledjoaly.fsf@HIDDEN>
<32d3fb5066e0b20e200dabef0fba897634e21dda.1694009405.git.zimon.toutoune@HIDDEN>
<875y4dltgm.fsf_-_@HIDDEN> <86a5tqzze6.fsf@HIDDEN>
<87zg1pgm7v.fsf@HIDDEN>
Date: Mon, 25 Sep 2023 11:32:14 +0200
In-Reply-To: <87zg1pgm7v.fsf@HIDDEN> ("Ludovic =?utf-8?Q?Court=C3=A8s=22'?=
=?utf-8?Q?s?= message of "Thu, 14 Sep 2023 11:04:04 +0200")
Message-ID: <87pm267g4h.fsf_-_@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 65352
Cc: 65352 <at> debbugs.gnu.org, Christopher Baines <guix@HIDDEN>,
Maxim Cournoyer <maxim.cournoyer@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
Hi,
Ludovic Court=C3=A8s <ludo@HIDDEN> skribis:
> Yes this seems to confirm what I thought.
>
> So anyway, go for it!
Apologies, I clearly lost track of what I was saying.
There are two things we missed here:
1. =E2=80=98false-if-git-not-found=E2=80=99 was removed around the call to
=E2=80=98commit-lookup=E2=80=99, which breaks things as reported just =
today on
IRC. Could you reintroduce it?
2. Short commit IDs are no longer handled in the 'commit case, as I
mentioned before in this thread (and then forgot). Could you
reintroduce support for them?
(Cc=E2=80=99ing Chris who=E2=80=99s been debugging it and discussing it on =
IRC.)
Thanks,
Ludo=E2=80=99.
guix-patches@HIDDEN:bug#65352; Package guix-patches.
Full text available.Received: (at 65352-done) by debbugs.gnu.org; 22 Sep 2023 14:00:52 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Fri Sep 22 10:00:52 2023 Received: from localhost ([127.0.0.1]:37013 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1qjgiB-0001ub-RD for submit <at> debbugs.gnu.org; Fri, 22 Sep 2023 10:00:52 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:41262) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <zimon.toutoune@HIDDEN>) id 1qjgi8-0001uM-S9 for 65352-done <at> debbugs.gnu.org; Fri, 22 Sep 2023 10:00:50 -0400 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-405101a02bcso7431455e9.1 for <65352-done <at> debbugs.gnu.org>; Fri, 22 Sep 2023 07:00:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695391232; x=1695996032; darn=debbugs.gnu.org; h=mime-version:message-id:date:references:in-reply-to:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=yRzSZ9O6oP8000673RKFxFSHRR4QgWxo5wTm3FzGebM=; b=cOHrV5a8ZigZHmnVzUd6n9Y0/uSvNeqeNdqjAD/HOwO7Q8dA7PwN/MKWgJSNHkVEXw Xq6RSwr+2CTWZh5k3VFKSe6OAHpJ2fuv1fGqneNQQ4MBzzIrzRO6vYa5V6drAOoaORUM iAxDLIXRcSJgNE5dDNK2H93UZyRT9OCxF0LXkt7eTk91Hh93q5StKi3atTTNyOiGHOHN dQhXyxM6uEjzCBVOeUNvc+MxU0av2UDaYN6diLYlHbWIl9zsJbOElBZYU/2EPs/+IdoU adsUXy7ZiluZ+KrY59E3ZsIGGbyEDyKFWi/2MoiK/1kG4LPV9Ijbz9dOlpD8yckFGOjO VBdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695391232; x=1695996032; h=mime-version:message-id:date:references:in-reply-to:subject:cc:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=yRzSZ9O6oP8000673RKFxFSHRR4QgWxo5wTm3FzGebM=; b=Tw+6Ix02B+22H9KLqewIJ32yDxVvYdlXKKKF+UF8g8lEVtBzFqVWEjqSpIQJ7YcEM8 wcGadrS6PGsWgFm0YMMiIPlcH8BAdXb8p50UiiovDzHxJK2ZzYLxzyw/5U2PJSWbTJKe BcaKzRZHwInb2ZB7R1L1OAfV3T818kIuritSCl+rq/rQ2NatO+wtHMdwFJCbC5bJS4KQ Z5GiVdDrCt7I2kTLHbDni0fX3WjG9z53dxcAD2eA4vsaQJH9k/e9dXEG0I6Gi/w+XZlD Q2d91bsQzG/24r5bTcbtlc9u/eky26iq5IozZwEI5/eRIQTzmxLi/resfmT+V684wc79 jFKA== X-Gm-Message-State: AOJu0YzA1EKHfolYi/Uu3w/H0QPlggIPWfc4kUS0QPPa5ZfurvECPwjR jE1bgb+8CIAzK4VKNCU+MbBTSIbKGlI= X-Google-Smtp-Source: AGHT+IHH8YLV83NwimgpK74BLbTw1iwpMds0kYJvHW7EUCAftMhydGMFSr2junAjtNwiuQkQqr7Dyw== X-Received: by 2002:a5d:6308:0:b0:31a:ea18:c516 with SMTP id i8-20020a5d6308000000b0031aea18c516mr7336516wru.3.1695391211537; Fri, 22 Sep 2023 07:00:11 -0700 (PDT) Received: from pfiuh07 ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id v11-20020a5d610b000000b0031435731dfasm4516535wrt.35.2023.09.22.07.00.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Sep 2023 07:00:10 -0700 (PDT) From: Simon Tournier <zimon.toutoune@HIDDEN> To: Ludovic =?utf-8?Q?Court=C3=A8s?= <ludo@HIDDEN> Subject: Re: [bug#65352] Fix time-machine and network In-Reply-To: <CAJ3okZ1ccutZ+jjW9Fzk5HC=fm7HEj5D9RSbhxMZA-2OUrO2BA@HIDDEN> References: <86ledjoaly.fsf@HIDDEN> <32d3fb5066e0b20e200dabef0fba897634e21dda.1694009405.git.zimon.toutoune@HIDDEN> <875y4dltgm.fsf_-_@HIDDEN> <86a5tqzze6.fsf@HIDDEN> <87zg1pgm7v.fsf@HIDDEN> <CAJ3okZ1ccutZ+jjW9Fzk5HC=fm7HEj5D9RSbhxMZA-2OUrO2BA@HIDDEN> Date: Fri, 22 Sep 2023 15:54:04 +0200 Message-ID: <87ttrm8gar.fsf@HIDDEN> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65352-done Cc: 65352-done <at> debbugs.gnu.org, Maxim Cournoyer <maxim.cournoyer@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) Hi, On Thu, 14 Sep 2023 at 11:42, Simon Tournier <zimon.toutoune@HIDDEN> wrote: >> So anyway, go for it! > > Cool! I will proceed. Done with 6d33c1f8061e86d63ab5c9ec75df9c58130c7264. Cheers, simon
Simon Tournier <zimon.toutoune@HIDDEN>:Simon Tournier <zimon.toutoune@HIDDEN>:Received: (at 65352) by debbugs.gnu.org; 14 Sep 2023 09:43:18 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Thu Sep 14 05:43:18 2023 Received: from localhost ([127.0.0.1]:37672 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1qgisX-0002yP-1f for submit <at> debbugs.gnu.org; Thu, 14 Sep 2023 05:43:18 -0400 Received: from mail-lj1-x230.google.com ([2a00:1450:4864:20::230]:37984) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <zimon.toutoune@HIDDEN>) id 1qgisS-0002yA-DE for 65352 <at> debbugs.gnu.org; Thu, 14 Sep 2023 05:43:16 -0400 Received: by mail-lj1-x230.google.com with SMTP id 38308e7fff4ca-2bfcb39037dso1099061fa.0 for <65352 <at> debbugs.gnu.org>; Thu, 14 Sep 2023 02:43:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1694684580; x=1695289380; darn=debbugs.gnu.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=9R8fNv2epqXO6+YVn0kfy5zd7gANmSMY7QG8yHKRGwo=; b=sfQToToqMr/+0LPMeocuJVXnFC2gCMZSvE+5DslLafyzge6iCoG5gzK2nyAlR8xMF+ fW6+kcfEXeH0Q5VXEC0Wxq3b56avLKUDzdhPLu2xI4diai221Fdwr/zwjwgZe2VATdwf gGxa6ZXITC9ueRGSlO1mRz4Jm1sRQbfOS1tnhBUKTIZB7pYUwV0bnSbSFsiDW2tMqB05 5Z5aVL7SFv7zF/ckIESx/4W/3mVHJfg5nWyQtNd9lJk2ZteJ1uN/P5U8/zyLek8J5bnL i5r8MAtKfoYwF8gGaFpgS8HYQq7LnlWI8UcJCvocDMiQNN0rac0Lh3N4LvMinRS0WgBQ vpoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694684580; x=1695289380; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9R8fNv2epqXO6+YVn0kfy5zd7gANmSMY7QG8yHKRGwo=; b=XT/7oGBmutI0aaH9G6UqdOuVShH6+SZt+8n5gnMpYVa2Z2355lxKgTmL9i1AO5lCaU QlcZXqCWah44kjwWOGd6x2FrJUZ64oWIPehjfGR55hCixfvbrE+dhP7K6zr2EpgIyw2F RDBy7UjLXPTC+R3Tg19KGD/jvlOHKLGiXEtYijLZbJwIlMeBuafEtjLsV2wTGuxQHiO5 4VB6vHJOKoSED7d/xPir/L9ndaxc6kTtj4GRclzykqvkJfwA+CXgmKuUZeKmICASA0z9 LQFXJgUVGygJgdkjW41ECAxR1BnQEWCgxGs/wlz+kwJH+ebkLh4b0Bx5uBa2HUbY0aZf WCcg== X-Gm-Message-State: AOJu0YxOsqfJbH1mJJXyX9pqDRNGKooSX3qjXjs4KicpDfEQkgnLchx8 qdJjdTK2deEcfSPdyLPWONtYUf2QKkQ16lWAvTQ= X-Google-Smtp-Source: AGHT+IG8LtlLJdGw927FTO95bAdCaEIWzwt1SVtNerY+TKLSkk0IOE2L7fxm3pvl9/EfZcbybf5npZK1Tc6k6bzcL9U= X-Received: by 2002:a2e:a7cd:0:b0:2bf:7908:ae73 with SMTP id x13-20020a2ea7cd000000b002bf7908ae73mr5911340ljp.2.1694684580237; Thu, 14 Sep 2023 02:43:00 -0700 (PDT) MIME-Version: 1.0 References: <86ledjoaly.fsf@HIDDEN> <32d3fb5066e0b20e200dabef0fba897634e21dda.1694009405.git.zimon.toutoune@HIDDEN> <875y4dltgm.fsf_-_@HIDDEN> <86a5tqzze6.fsf@HIDDEN> <87zg1pgm7v.fsf@HIDDEN> In-Reply-To: <87zg1pgm7v.fsf@HIDDEN> From: Simon Tournier <zimon.toutoune@HIDDEN> Date: Thu, 14 Sep 2023 11:42:48 +0200 Message-ID: <CAJ3okZ1ccutZ+jjW9Fzk5HC=fm7HEj5D9RSbhxMZA-2OUrO2BA@HIDDEN> Subject: Re: [bug#65352] Fix time-machine and network To: =?UTF-8?Q?Ludovic_Court=C3=A8s?= <ludo@HIDDEN> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: 65352 Cc: 65352 <at> debbugs.gnu.org, Maxim Cournoyer <maxim.cournoyer@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) Hi, On Thu, 14 Sept 2023 at 11:04, Ludovic Court=C3=A8s <ludo@HIDDEN> wrote: > Yes this seems to confirm what I thought. Hum, maybe we have miscommunicated because we were speaking on different levels, I guess. :-) By 'tag references, you meant (tag . "foo") right? And that case is not possible from the command-line and even I am not sure about the use-case of passing (tag . "foo") to reference-available?. Another story. Reconsidering your question, yes the case (tag . "foo") is currently on the fast path and will stay on the fast path. I have read "tag references" as the user is passing a Git tag. Which is currently managed the same way as short commit ID. Hence my previous answer. :-) > So anyway, go for it! Cool! I will proceed. > Great that you=E2=80=99re improving performance here. Now, we can give a look to bug#65787 [1]. ;-) 1: bug#65787: time-machine is doing too much network requests Simon Tournier <zimon.toutoune@HIDDEN> Mon, 11 Sep 2023 11:41:54 +0200 id:87tts1jbbx.fsf@HIDDEN https://yhetil.org/guix/87tts1jbbx.fsf@HIDDEN https://issues.guix.gnu.org/msgid/87tts1jbbx.fsf@HIDDEN Cheers, simon
guix-patches@HIDDEN:bug#65352; Package guix-patches.
Full text available.Received: (at 65352) by debbugs.gnu.org; 14 Sep 2023 09:04:22 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Thu Sep 14 05:04:22 2023 Received: from localhost ([127.0.0.1]:37622 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1qgiGr-00022d-RK for submit <at> debbugs.gnu.org; Thu, 14 Sep 2023 05:04:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59768) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <ludo@HIDDEN>) id 1qgiGo-00022P-UG for 65352 <at> debbugs.gnu.org; Thu, 14 Sep 2023 05:04:19 -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 <ludo@HIDDEN>) id 1qgiGd-0001Qc-NU; Thu, 14 Sep 2023 05:04:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=dE7e5kSI90+LfUbOdghGjBQt5wSELtR1cOaxxJdiQB4=; b=DHBepthoQmGbiDXawAb5 J+3jh8HKTKsncbLc7Oi1JK67Gony1e2n/JSOSnzKAgh8MNs0ramVNOm9q8G/dletT1+fLFUJqRlot eg/I5o7r5uFQlaW4Te4wiOp9kKnFiSbikTgm9vJdreK/7eOtExyTbBdAGjOUpdn3ySNX0QA/tXcX+ Tvzw4vKvrpXH6pBk5LiwhGHBp8Y4iUqL8QCOKnW4oPXRiepkwxB43InYpK7Mh/GMQW3Aq6sYA/6DE XuqkAWqr4NgUSWRVnaUlkyb4W1c7cuqaPTFUuj5kSdd01gfYxyGRF674sZUurGtTQvgzEy2sciWHK XNAUM1zSXXInQQ==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= <ludo@HIDDEN> To: Simon Tournier <zimon.toutoune@HIDDEN> Subject: Re: [bug#65352] Fix time-machine and network References: <86ledjoaly.fsf@HIDDEN> <32d3fb5066e0b20e200dabef0fba897634e21dda.1694009405.git.zimon.toutoune@HIDDEN> <875y4dltgm.fsf_-_@HIDDEN> <86a5tqzze6.fsf@HIDDEN> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: Octidi 28 Fructidor an 231 de la =?utf-8?Q?R=C3=A9vo?= =?utf-8?Q?lution=2C?= jour du =?utf-8?Q?Ma=C3=AFs?= 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: Thu, 14 Sep 2023 11:04:04 +0200 In-Reply-To: <86a5tqzze6.fsf@HIDDEN> (Simon Tournier's message of "Wed, 13 Sep 2023 02:32:17 +0200") Message-ID: <87zg1pgm7v.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 65352 Cc: 65352 <at> debbugs.gnu.org, Maxim Cournoyer <maxim.cournoyer@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -3.3 (---) Hi again, Simon Tournier <zimon.toutoune@HIDDEN> skribis: > Let =E2=80=99pk=E2=80=99 (see below) to convince you. :-) > > Before the proposed patch: > > $ ./pre-inst-env guix time-machine --commit=3Dv1.4.0 -- describe > > ;;; (ref (tag-or-commit . "v1.4.0")) > > ;;; (reference-available? #f) > > ;;; (remote-fetch NETWORK) > C-c C-c > > $ ./pre-inst-env guix time-machine --commit=3D8e2f32c -- describe > > ;;; (ref (tag-or-commit . "8e2f32c")) > > ;;; (reference-available? #f) > > ;;; (remote-fetch NETWORK) > C-c C-c Yes this seems to confirm what I thought. So anyway, go for it! Great that you=E2=80=99re improving performance here. Ludo=E2=80=99.
guix-patches@HIDDEN:bug#65352; Package guix-patches.
Full text available.
Received: (at 65352) by debbugs.gnu.org; 14 Sep 2023 08:51:37 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Sep 14 04:51:37 2023
Received: from localhost ([127.0.0.1]:37608 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qgi4X-0001jE-3t
for submit <at> debbugs.gnu.org; Thu, 14 Sep 2023 04:51:37 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:42098)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <ludo@HIDDEN>) id 1qgi4R-0001iw-MO
for 65352 <at> debbugs.gnu.org; Thu, 14 Sep 2023 04:51:35 -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 <ludo@HIDDEN>)
id 1qgi4G-0007oE-8d; Thu, 14 Sep 2023 04:51:20 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To:
From; bh=+h5HmTDPikTbUrqALtKk10ze8jM0sBrcyHMJat1/lHY=; b=sfZg80KJWCzYAg4NAQOB
cyZwVlTVA7TletkjzTv5y8/C+vF/KjrSxFGoAR2XzCsiP5L/gJr1yrTrPOeQh7PF6oHa0vDJTfaDA
Px9U9EQ2VJL+nnAQzSr9iYJ2l7BbEzkYl9m29Z5OpnvjH9+pZF1+Im/RMwJivPgcsxY83hfNGFRgz
tFjfLq/EZH9VV7XG6443paZlLcrcbGx4SGi4xEBBPJ0MlEHzKF2iLzIzSsMMaXoSaDfVxD8cwG0zJ
gYRaKk46EU4kKMGEvH2b2RXgAru9vZkoKIoz9Y57WQebqIeDKSY3UPrR7aAHohUcheLDmffzUBp8f
TAChCVWy7RST6A==;
From: =?utf-8?Q?Ludovic_Court=C3=A8s?= <ludo@HIDDEN>
To: Simon Tournier <zimon.toutoune@HIDDEN>
Subject: Re: [bug#65352] Fix time-machine and network
References: <86ledjoaly.fsf@HIDDEN>
<32d3fb5066e0b20e200dabef0fba897634e21dda.1694009405.git.zimon.toutoune@HIDDEN>
<875y4dltgm.fsf_-_@HIDDEN> <86a5tqzze6.fsf@HIDDEN>
X-URL: http://www.fdn.fr/~lcourtes/
X-Revolutionary-Date: Octidi 28 Fructidor an 231 de la =?utf-8?Q?R=C3=A9vo?=
=?utf-8?Q?lution=2C?= jour du =?utf-8?Q?Ma=C3=AFs?=
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: Thu, 14 Sep 2023 10:50:58 +0200
In-Reply-To: <86a5tqzze6.fsf@HIDDEN> (Simon Tournier's message of "Wed, 13
Sep 2023 02:32:17 +0200")
Message-ID: <874jjxi1e5.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 65352
Cc: 65352 <at> debbugs.gnu.org, Maxim Cournoyer <maxim.cournoyer@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
Hi,
Simon Tournier <zimon.toutoune@HIDDEN> skribis:
> On Wed, 13 Sep 2023 at 22:16, Ludovic Court=C3=A8s <ludo@HIDDEN> wrote:
>
>>> + (('commit . (? commit-id? commit))
>>> + (let ((oid (string->oid commit)))
>>> + (->bool (commit-lookup repository oid))))
>>> + ((or ('tag . str)
>>> + ('tag-or-commit . str))
>>> + (false-if-git-not-found
>>> + (->bool (resolve-reference repository ref))))
>>
>> IIUC, the differences compared to what we had are:
>>
>> 1. 'tag references are now handled on the fast path
>> (=E2=80=98reference-available?=E2=80=99 can return #t);
>>
>> 2. short commit strings are now always on the slow path
>> (=E2=80=98reference-available?=E2=80=99 always returns #f).
>>
>> Is that correct?
>
> No
Sorry, could you explain what the difference is then on the hunk I
quoted?
https://issues.guix.gnu.org/65352#34-lineno11
I see different treatment of short commit IDs and tags, and no
difference for full commit IDs.
Thanks,
Ludo=E2=80=99.
guix-patches@HIDDEN:bug#65352; Package guix-patches.
Full text available.
Received: (at 65352) by debbugs.gnu.org; 13 Sep 2023 22:52:27 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Sep 13 18:52:27 2023
Received: from localhost ([127.0.0.1]:36296 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qgYih-0005Lk-2m
for submit <at> debbugs.gnu.org; Wed, 13 Sep 2023 18:52:27 -0400
Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:39175)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <zimon.toutoune@HIDDEN>) id 1qgYid-0005LT-AW
for 65352 <at> debbugs.gnu.org; Wed, 13 Sep 2023 18:52:26 -0400
Received: by mail-wm1-x332.google.com with SMTP id
5b1f17b1804b1-403c5bcffc4so911245e9.1
for <65352 <at> debbugs.gnu.org>; Wed, 13 Sep 2023 15:52:17 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20221208; t=1694645532; x=1695250332; darn=debbugs.gnu.org;
h=content-transfer-encoding:mime-version:message-id:date:references
:in-reply-to:subject:cc:to:from:from:to:cc:subject:date:message-id
:reply-to; bh=IBhjqwB2hC2JQoQ/JMbcvE1d5lXrBnXkJBzAwom+G9c=;
b=RbWMEO4cGY4vSkaATsIjhxyOQhv96uaE1ntN5RlQ/a1K2F9WK+4dGbDgb09gITk203
QKtKecE9e6GdQAgtwDJoN03A8BPAvbWXn0WiRH321l6w40pJ9tMK/jEzRfjt1PsGzVrX
o/bAN73ldq+QKHlW29BFNqDMmrZESU9TehdPh6tM796bgZoQ05djSo+9Y8QebYEFFZ2+
BPXFUUUoBY1t5jFHvXFU1HgN6NC/PIEkswtrAdG/A0vqqYscy8Z0/v84aWVNKxgAKHl1
uMEPPDMpy6iiJCtfaSF3/2U5TIWQruXn6IwXoNyY1F1nCei0gju9WflbW3te9ao4U3jy
w6AA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1694645532; x=1695250332;
h=content-transfer-encoding:mime-version:message-id:date:references
:in-reply-to:subject:cc:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=IBhjqwB2hC2JQoQ/JMbcvE1d5lXrBnXkJBzAwom+G9c=;
b=Ph34fQzDiMHe/dvvjDFFdw6/Hk99I3OAw6727L7NW7a6kPNwk+s4YMfesVhEBDqT2w
yyQpkjJYNLPRgHK7NuNuRzctkPAjWBxgSF49hBruMl2mh8SSasb+Vukab210CZN7mJ41
EpH4DS2bkOLX7zbcy0tLuSQhCbbzv/qqmtq5blQidGhbDgf0q1jEtt5U2rh57/02VxuH
fhgianydhXufHeqOAUW/SLXP2lIApohmgU6vxXiZtr+o73dPhPcGpsQgeEV+1Y8C4rw7
ABHvffSYfBuW8xzPctxEBYtt5QRNQLZeGpIXWlRZoslNnFr7lK9Q3RA2mCDncEuHuHPG
0p3Q==
X-Gm-Message-State: AOJu0Yz+bPEBOgma4IJyBpUYhmnIYo3cwQ3LIUmJF9xXg+xaJnEQQyR9
GLjIYvUzMaaPOOjX7s8qcOc=
X-Google-Smtp-Source: AGHT+IGi/KEEdP8ZkKHcUkZe7bgGnoUFLHziix5hMmCVrP9Ckd1e6l3MSNmwC1tCByGIn9Lb2HlYiQ==
X-Received: by 2002:adf:ebc8:0:b0:317:7238:336a with SMTP id
v8-20020adfebc8000000b003177238336amr3015358wrn.5.1694645531645;
Wed, 13 Sep 2023 15:52:11 -0700 (PDT)
Received: from lili ([2a01:e0a:59b:9120:65d2:2476:f637:db1e])
by smtp.gmail.com with ESMTPSA id
x2-20020adfec02000000b003179d7ed4f3sm95419wrn.12.2023.09.13.15.52.11
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Wed, 13 Sep 2023 15:52:11 -0700 (PDT)
From: Simon Tournier <zimon.toutoune@HIDDEN>
To: Ludovic =?utf-8?Q?Court=C3=A8s?= <ludo@HIDDEN>
Subject: Re: [bug#65352] Fix time-machine and network
In-Reply-To: <875y4dltgm.fsf_-_@HIDDEN>
References: <86ledjoaly.fsf@HIDDEN>
<32d3fb5066e0b20e200dabef0fba897634e21dda.1694009405.git.zimon.toutoune@HIDDEN>
<875y4dltgm.fsf_-_@HIDDEN>
Date: Wed, 13 Sep 2023 02:32:17 +0200
Message-ID: <86a5tqzze6.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: 0.8 (/)
X-Debbugs-Envelope-To: 65352
Cc: 65352 <at> debbugs.gnu.org, Maxim Cournoyer <maxim.cournoyer@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.2 (/)
Hi Ludo,
On Wed, 13 Sep 2023 at 22:16, Ludovic Court=C3=A8s <ludo@HIDDEN> wrote:
>> + (('commit . (? commit-id? commit))
>> + (let ((oid (string->oid commit)))
>> + (->bool (commit-lookup repository oid))))
>> + ((or ('tag . str)
>> + ('tag-or-commit . str))
>> + (false-if-git-not-found
>> + (->bool (resolve-reference repository ref))))
>
> IIUC, the differences compared to what we had are:
>
> 1. 'tag references are now handled on the fast path
> (=E2=80=98reference-available?=E2=80=99 can return #t);
>
> 2. short commit strings are now always on the slow path
> (=E2=80=98reference-available?=E2=80=99 always returns #f).
>
> Is that correct?
No, or I am missing some details.
> It would be nice to have #1 without #2.
It=E2=80=99s already the case because of that:
(option '("commit") #t #f
(lambda (opt name arg result)
(alist-cons 'ref `(tag-or-commit . ,arg) result)))
Currently, the heuristic to determine if it is a tag or a commit is
implemented by =E2=80=99resolve-reference=E2=80=99.
Somehow, considering the command-line parser, the alternative is:
#1 and #2 on the fast path (the patch)
or
#1 and #2 on the slow path (the current implementation)
Let =E2=80=99pk=E2=80=99 (see below) to convince you. :-)
Before the proposed patch:
--8<---------------cut here---------------start------------->8---
$ ./pre-inst-env guix time-machine --commit=3Dv1.4.0 -- describe
;;; (ref (tag-or-commit . "v1.4.0"))
;;; (reference-available? #f)
;;; (remote-fetch NETWORK)
C-c C-c
$ ./pre-inst-env guix time-machine --commit=3D8e2f32c -- describe
;;; (ref (tag-or-commit . "8e2f32c"))
;;; (reference-available? #f)
;;; (remote-fetch NETWORK)
C-c C-c
--8<---------------cut here---------------end--------------->8---
After the proposed patch:
--8<---------------cut here---------------start------------->8---
$ ./pre-inst-env guix time-machine --commit=3Dv1.4.0 -- describe
;;; (ref (tag-or-commit . "v1.4.0"))
;;; (reference-available? #t)
guix 8e2f32c
repository URL: https://git.savannah.gnu.org/git/guix.git
commit: 8e2f32cee982d42a79e53fc1e9aa7b8ff0514714
$ ./pre-inst-env guix time-machine --commit=3D8e2f32c -- describe
;;; (ref (tag-or-commit . "8e2f32c"))
;;; (reference-available? #t)
guix 8e2f32c
repository URL: https://git.savannah.gnu.org/git/guix.git
commit: 8e2f32cee982d42a79e53fc1e9aa7b8ff0514714
--8<---------------cut here---------------end--------------->8---
Cheers,
simon
--8<---------------cut here---------------start------------->8---
diff --git a/guix/git.scm b/guix/git.scm
index 1cb87a45607b..c927555cce18 100644
--- a/guix/git.scm
+++ b/guix/git.scm
@@ -481,6 +481,8 @@ (define* (update-cached-checkout url
(repository-open cache-directory)
(clone/swh-fallback url ref cache-directory))=
))
;; Only fetch remote if it has not been cloned just before.
+ (pk 'ref ref)
+ (pk 'reference-available? (reference-available? repository ref))
(when (and cache-exists?
(not (reference-available? repository ref)))
(remote-fetch (remote-lookup repository "origin")
--8<---------------cut here---------------end--------------->8---
guix-patches@HIDDEN:bug#65352; Package guix-patches.
Full text available.
Received: (at 65352) by debbugs.gnu.org; 13 Sep 2023 20:16:43 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Sep 13 16:16:43 2023
Received: from localhost ([127.0.0.1]:36142 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qgWHz-00074t-35
for submit <at> debbugs.gnu.org; Wed, 13 Sep 2023 16:16:43 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:36172)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <ludo@HIDDEN>) id 1qgWHw-00074e-Cg
for 65352 <at> debbugs.gnu.org; Wed, 13 Sep 2023 16:16:42 -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 <ludo@HIDDEN>)
id 1qgWHl-0000zw-HJ; Wed, 13 Sep 2023 16:16:29 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To:
From; bh=ziDB1Hw71luZI/ZmD/SZ1PYWN1XA9NiVcLfXa15/AoY=; b=bnPqEn7Badj3sTfjwBFG
iSJteyQQYkNQEKcVuBPHKQk7rbMwya8gXT/DcmmnTMGv2B0sMK0L7zO6foiaM+OYqzfod8DBtW+3t
BPCdWOD9TqlENwkHyyDZjEM2HYzMIXxsnsAiepMxh7/98OTSHvzvLCVvP9RewhpxtqHdn3sZ8JCHO
Rd0D6yi5Xes5Xo6PUovd1MQOqMCGC1U0ei37jE/agyZ/Hc2/yPhuZPd6koanemTb8GrSbK+JtSLaL
0K9aW9Qf7wvIrno5fgQabO6n77Ir5xC3WcML8ZPz/ARGY3ciLbBvKGr+Bshg71QpAFkuoYJOmEM0v
zzwyto2ItpfhzA==;
From: =?utf-8?Q?Ludovic_Court=C3=A8s?= <ludo@HIDDEN>
To: Simon Tournier <zimon.toutoune@HIDDEN>
Subject: Re: bug#65352: Fix time-machine and network
References: <86ledjoaly.fsf@HIDDEN>
<32d3fb5066e0b20e200dabef0fba897634e21dda.1694009405.git.zimon.toutoune@HIDDEN>
Date: Wed, 13 Sep 2023 22:16:25 +0200
In-Reply-To: <32d3fb5066e0b20e200dabef0fba897634e21dda.1694009405.git.zimon.toutoune@HIDDEN>
(Simon Tournier's message of "Wed, 6 Sep 2023 16:17:08 +0200")
Message-ID: <875y4dltgm.fsf_-_@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 65352
Cc: 65352 <at> debbugs.gnu.org, Maxim Cournoyer <maxim.cournoyer@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
Hi,
Simon Tournier <zimon.toutoune@HIDDEN> skribis:
> Follow-up of 756e336fa008c2469b4a7317ad5c641ed48f25d6 fixing the issue.
>
> * guix/git/scm (reference-available?): Address case by case to determine
> whether the reference exists in the local Git checkout.
[...]
> (define (reference-available? repository ref)
> "Return true if REF, a reference such as '(commit . \"cabba9e\"), is
> definitely available in REPOSITORY, false otherwise."
> - ;; Note: this must not rely on 'resolve-reference', as that procedure =
always
> - ;; resolves the references for branch names such as master. The seman=
tic we
> - ;; want here is that unless the reference is exact (e.g. a commit), the
> - ;; reference should not be considered available, as it could have chan=
ged on
> - ;; the remote.
> (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))))))
> + (('commit . (? commit-id? commit))
> + (let ((oid (string->oid commit)))
> + (->bool (commit-lookup repository oid))))
> + ((or ('tag . str)
> + ('tag-or-commit . str))
> + (false-if-git-not-found
> + (->bool (resolve-reference repository ref))))
IIUC, the differences compared to what we had are:
1. 'tag references are now handled on the fast path
(=E2=80=98reference-available?=E2=80=99 can return #t);
2. short commit strings are now always on the slow path
(=E2=80=98reference-available?=E2=80=99 always returns #f).
Is that correct?
It would be nice to have #1 without #2.
> (_
> + ;; For the others REF as branch or symref, the REF cannot be availa=
ble
=E2=80=9CFor other values of REF such as branch or symref, the target is by
definition unavailable locally.=E2=80=9D
Thanks,
Ludo=E2=80=99.
guix-patches@HIDDEN:bug#65352; Package guix-patches.
Full text available.
Received: (at 65352) by debbugs.gnu.org; 7 Sep 2023 15:19:06 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Sep 07 11:19:06 2023
Received: from localhost ([127.0.0.1]:40975 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qeGmg-00029x-1f
for submit <at> debbugs.gnu.org; Thu, 07 Sep 2023 11:19:06 -0400
Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]:39992)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <zimon.toutoune@HIDDEN>)
id 1qeGmY-00028m-1p; Thu, 07 Sep 2023 11:19:01 -0400
Received: by mail-wm1-x32c.google.com with SMTP id
5b1f17b1804b1-401d61e9fecso2810825e9.0;
Thu, 07 Sep 2023 08:18:56 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20221208; t=1694099930; x=1694704730; darn=debbugs.gnu.org;
h=content-transfer-encoding:mime-version:message-id:date:references
:in-reply-to:subject:cc:to:from:from:to:cc:subject:date:message-id
:reply-to; bh=COhFKk878JkiQEPQdXMNr9+88+rEdE9oMrnEn2YeLV0=;
b=MXuhnwJfrRw7hVkMHX5z9+8CFhwJXsNg2EsESGE+dGITjq5P9Y0zm3skKHdhNuW4Gr
SXI+ODo6vYCNHMGdfSxxKOQ/KQSNfvv2WAGnOzZRe07GovyFZIu2GuG4+Dlsm5B3kfc3
W3fXHUiTAqUwvpDwAbGPHUQQy4SaqgmblDf3fYyZCMcLqqL3H4cRTgpeH72aVxXmbecy
uC7HIBdXRvzrn0TiYySOtVjhAphOM38StOxY2BjnkLUx7gSy+zVU+H2i0MeSaAah3jZR
0s3Tq2oAWSm70cxuBPZ3XFxcK06pvSNUNFByFGoNiFqDoQmVqJtoLKn9dTFLESVFU4C6
/6xQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20221208; t=1694099930; x=1694704730;
h=content-transfer-encoding:mime-version:message-id:date:references
:in-reply-to:subject:cc:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=COhFKk878JkiQEPQdXMNr9+88+rEdE9oMrnEn2YeLV0=;
b=bhkqXh8I5SkICPF/iiosTDo56YqTycuqFIDL4oOsHOLFugwZABoOw0hs+Iyp82Eo0M
cJIqgszHFXFB4GRc9nWmaIJj2tggXVbOrz3ITbk3/S5WlmwlolfmQaUFU6mhC9RfWiHa
ZUxXtIe9N8y5HRpCjlXRhGY62zy3h6LJ5d+DbM4FZ59x2AneiDJdJGtxoQvIUaPp54kf
R4SmUM3tFgfER+7CslADZwT5/ZOZ04lVgYjEdrAWZyB9J3Ii3NQT8cm1Qrk2EKRHp4Vu
zOqZmMXkO0N0Z0+k031aqTsJoaei7y9vICzh2j8OsA0KbwiE8AVtMIu1bCJf0R6JAMCa
pIpA==
X-Gm-Message-State: AOJu0YySnQYz+XGrWhGIanVgvir0rPwn4yt2p3OGxiek7TpY3Rs4xe6T
kjvAEdLFRqTRp031s9K2D5gRQZ9Gwbg=
X-Google-Smtp-Source: AGHT+IFMpxlx7cZi3exMkl1+4ySJkVLMsornMmEIlH5JMSB9nLX5IYecL7z7dvl13SGHpGb/OxuTZQ==
X-Received: by 2002:adf:cf08:0:b0:31d:d5db:597d with SMTP id
o8-20020adfcf08000000b0031dd5db597dmr13911029wrj.4.1694099930230;
Thu, 07 Sep 2023 08:18:50 -0700 (PDT)
Received: from pfiuh07 ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id
r12-20020adfce8c000000b00317afc7949csm23459087wrn.50.2023.09.07.08.18.49
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Thu, 07 Sep 2023 08:18:49 -0700 (PDT)
From: Simon Tournier <zimon.toutoune@HIDDEN>
To: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
Subject: Re: [bug#65352] Fix time-machine and network
In-Reply-To: <878r9kdpsk.fsf@HIDDEN>
References: <87fs4h4vb9.fsf@HIDDEN>
<c5156f9a756c2a6a304dc789c00abf533c787fd8.1692281315.git.zimon.toutoune@HIDDEN>
<87fs3slplq.fsf_-_@HIDDEN>
<CAJ3okZ3xkUMZnGvUcM8WSxDu0dkOZ0Cfp+qtauYJc7wTsR2xyQ@HIDDEN>
<87tts8f9p7.fsf@HIDDEN>
<CAJ3okZ17LnExcT32HwW1i86tS7fUD3WJqUURwMi=X3AXZ-1YZA@HIDDEN>
<878r9kdpsk.fsf@HIDDEN>
Date: Thu, 07 Sep 2023 13:15:20 +0200
Message-ID: <87y1hikzef.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: 2.1 (++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
has NOT identified this incoming email as spam. The original
message has been attached to this so you can view it or label
similar future email. If you have any questions, see
the administrator of that system for details.
Content preview: Hi, On Tue, 05 Sep 2023 at 22:00, Maxim Cournoyer wrote: >>
Anyway, I will open a >> report for that order issue. > > OK, thank you.
It's a bit hard to keep track of multiple issues and > their resolutions in
a longish thread.
Content analysis details: (2.1 points, 10.0 required)
pts rule name description
---- ---------------------- --------------------------------------------------
-0.0 SPF_PASS SPF: sender matches SPF record
1.1 DATE_IN_PAST_03_06 Date: is 3 to 6 hours before Received: date
0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail
provider (zimon.toutoune[at]gmail.com)
0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record
-0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/,
no trust [2a00:1450:4864:20:0:0:0:32c listed in]
[list.dnswl.org]
1.0 FREEMAIL_REPLY From and body contain different freemails
X-Debbugs-Envelope-To: 65352
Cc: 65352 <at> debbugs.gnu.org, GNU Debbugs <control <at> debbugs.gnu.org>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: 0.1 (/)
Hi,
On Tue, 05 Sep 2023 at 22:00, Maxim Cournoyer <maxim.cournoyer@HIDDEN> w=
rote:
>> Anyway, I will open a
>> report for that order issue.
>
> OK, thank you. It's a bit hard to keep track of multiple issues and
> their resolutions in a longish thread.
For cross-referencing, done with bug#65788,
bug#65788: poor information when updating using =E2=80=9Cguix time-=
machine=E2=80=9D
Simon Tournier <zimon.toutoune@HIDDEN>
Wed, 06 Sep 2023 18:57:38 +0200
id:87pm2vme7x.fsf@HIDDEN
https://yhetil.org/guix/87pm2vme7x.fsf@HIDDEN
https://issues.guix.gnu.org/msgid/87pm2vme7x.fsf@HIDDEN
Cheers,
simon
guix-patches@HIDDEN:bug#65352; Package guix-patches.
Full text available.
Received: (at 65352) by debbugs.gnu.org; 6 Sep 2023 23:22:06 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Sep 06 19:22:06 2023
Received: from localhost ([127.0.0.1]:38133 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qe1qW-0002fB-PL
for submit <at> debbugs.gnu.org; Wed, 06 Sep 2023 19:22:06 -0400
Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:41329)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <zimon.toutoune@HIDDEN>) id 1qe1qR-0002ee-8m
for 65352 <at> debbugs.gnu.org; Wed, 06 Sep 2023 19:22:03 -0400
Received: by mail-wm1-x332.google.com with SMTP id
5b1f17b1804b1-401e6ce2d9fso920435e9.1
for <65352 <at> debbugs.gnu.org>; Wed, 06 Sep 2023 16:21:57 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20221208; t=1694042512; x=1694647312; darn=debbugs.gnu.org;
h=content-transfer-encoding:mime-version:message-id:date:references
:in-reply-to:subject:cc:to:from:from:to:cc:subject:date:message-id
:reply-to; bh=0yiov2MK9iLD2kXBD5M9GHSoF097TEveFDEoFMqIPQA=;
b=hTSBraxI3eI1zLYtHLYVlwyfQSFwykszPYGjMPZOhjyzUu1dspdAnmEpOzwESCfRss
2Tr5SfcHz2gJEIRTZAmk1/Ka7fawjwP+ghxh4SgZoH5RTLF8L0cb2nJzbGUlsJJDqH+n
BF2uR7gAjE5C9M/qM2568PzvwwnuuwT1G0kxmMFBAU9SIZULdKm7RRJSB/RIjRnY0JrZ
3M05WGtBfpZz8Hsz8tZb6IbuhI+VW13XnTj8EImQNR2mgRawQIY1PgxTg3oyOKFOX3JN
e2AKIyLNNfGpSZ7TWtr3v+63Jm86tn0S6vj+4sQbv0HOsOrJUGnO+BEySVFUVkAP//Db
O34w==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20221208; t=1694042512; x=1694647312;
h=content-transfer-encoding:mime-version:message-id:date:references
:in-reply-to:subject:cc:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=0yiov2MK9iLD2kXBD5M9GHSoF097TEveFDEoFMqIPQA=;
b=J3dVHrSw3KutNpXiXNmGmtqsuQC37hIhtrCM6FjwRRmPJJ2Qrgf+jEJvoFgMHzeFDq
kD+ie3EfZ5N0fatpm+Iy94tEwZrlY6XxTm7mGpEpvokwBr8ImUHTj90GNHoZz6ckPvWO
KdrKM9mA9MifKGsO5NZv1SjUX4OtSjIzadnwMuEhRThNAzBQ7kdTvfwCrRs4r2h94C3w
uNCYRnBtIL9h+WH+N/NcI9h7h5WO3hZNB1NOrEnA/H3c6G2j05CMQzZ+dN2oU5iKO3jy
4wv6nlREyDQ5af6aspVETavJrG3QSjayjmZ5itA3sP7rrwY0pbzqnnBoFdKd2vaLxFxu
wGPw==
X-Gm-Message-State: AOJu0Yx4HDukOaOtXwld/0Y3XMLgvZ8ecN0AveACxDIEsEgBtfGYYy95
tg/sXIHHjjAudQxAepaTQlc=
X-Google-Smtp-Source: AGHT+IEu0/hcC4KgOoDZa7UilVkJSefH/LPwY7B6NS8FNX+5QI1IzMPLISN3owNnESAN6GAa6UEA5A==
X-Received: by 2002:a05:600c:3b83:b0:3ff:c342:f296 with SMTP id
n3-20020a05600c3b8300b003ffc342f296mr13914039wms.1.1694042511820;
Wed, 06 Sep 2023 16:21:51 -0700 (PDT)
Received: from lili ([2a01:e0a:59b:9120:65d2:2476:f637:db1e])
by smtp.gmail.com with ESMTPSA id
y25-20020a05600c365900b003ffca80edb8sm816090wmq.15.2023.09.06.16.21.51
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Wed, 06 Sep 2023 16:21:51 -0700 (PDT)
From: Simon Tournier <zimon.toutoune@HIDDEN>
To: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
Subject: Re: [bug#65352] time-machine, unavailable network or Savannah down
In-Reply-To: <871qfb5hcq.fsf@HIDDEN>
References: <86ledjoaly.fsf@HIDDEN> <871qfb5hcq.fsf@HIDDEN>
Date: Thu, 07 Sep 2023 01:21:46 +0200
Message-ID: <86a5tyopkl.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 65352
Cc: 65352 <at> debbugs.gnu.org, Ludovic =?utf-8?Q?Court=C3=A8s?= <ludo@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
Hi,
On Wed, 06 Sep 2023 at 13:41, Maxim Cournoyer <maxim.cournoyer@HIDDEN> w=
rote:
> So all the refs such as commit(ish) or tags would be referenced locally,
> and branches such as 'master' would still trigger an update.
That=E2=80=99s the intent of this patch:
[bug#65352] [PATCH v2] DRAFT git: Avoid touching the network unless=
needed in 'reference-available?'.
Simon Tournier <zimon.toutoune@HIDDEN>
Wed, 06 Sep 2023 16:17:08 +0200
id:32d3fb5066e0b20e200dabef0fba897634e21dda.1694009405.git.zimon.to=
utoune@HIDDEN
https://issues.guix.gnu.org//65352
https://issues.guix.gnu.org/msgid/32d3fb5066e0b20e200dabef0fba89763=
4e21dda.1694009405.git.zimon.toutoune@HIDDEN
https://yhetil.org/guix/32d3fb5066e0b20e200dabef0fba897634e21dda.16=
94009405.git.zimon.toutoune@HIDDEN
> LGTM, but I'd be curious to hear what Ludovic thinks, since their
> original code treated tags as mutable (which they technically are, but I
> agree to the value of treating them as immutable, and it appears low
> risk to me).
Do we have an use-case where tags are mutable?
To my knowledge, the Guix remote tags have always been immutable. Do we
have one counter-example?
Well, here an attempt for a scenario with mutable tags =E2=80=93 although I
think that=E2=80=99s a corner case considering the current state for
manipulating Guix cache checkouts. I am using Guix 6113e05, nothing
about the patch I am proposing. :-)
$ cp -r ~/.cache/guix/checkouts/pjmkglp4t7znuugeurpurzikxq3tnlaywmisyr27shj=
7apsnalwq /tmp/guix,git
$ guix time-machine -q --commit=3D4a027d2 --url=3D/tmp/guix.git -- describe
So far, so good. Let add one tag.
$ git -C /tmp/guix.git tag -a mutable -m "some tag" 4a027d2
$ git -C /tmp/guix.git tag -l mut*
And=E2=80=A6
$ guix time-machine -q --commit=3Dmutable --url=3D/tmp/guix.git -- describe
guix time-machine: error: Git error: reference 'refs/tags/mutable' not found
=E2=80=A6bang!
Well, the basic Git tags does not seem supported by the Guile-Git
=E2=80=99remote-fetch=E2=80=99 procedure. I have not investigated more. M=
aybe I am
missing something.
My opinion is to stay focused on the current real annoyances first and
not try to fix another hypothetical use-case which seems already buggy.
Ludo, WDYT about the proposed patch? Does it work for your use-cases?
Cheers,
simon
guix-patches@HIDDEN:bug#65352; Package guix-patches.
Full text available.Received: (at 65352) by debbugs.gnu.org; 6 Sep 2023 17:42:11 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Wed Sep 06 13:42:11 2023 Received: from localhost ([127.0.0.1]:37536 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1qdwXb-00009T-8N for submit <at> debbugs.gnu.org; Wed, 06 Sep 2023 13:42:11 -0400 Received: from mail-qk1-x733.google.com ([2607:f8b0:4864:20::733]:55427) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <maxim.cournoyer@HIDDEN>) id 1qdwXW-00008p-15 for 65352 <at> debbugs.gnu.org; Wed, 06 Sep 2023 13:42:09 -0400 Received: by mail-qk1-x733.google.com with SMTP id af79cd13be357-76da22c090dso5971885a.2 for <65352 <at> debbugs.gnu.org>; Wed, 06 Sep 2023 10:42:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1694022119; x=1694626919; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:user-agent:message-id :in-reply-to:date:references:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=NbFxwdo13GnmNcBU4wcJjC1/qxJBDN+iZ5dSIY8r8pA=; b=TrwB9WTDKtaKL8QtNzFBorHa/8pTjCYOLoSiTMhffz0gnNPJfdmFqUo+JzfeNiUlir a79rwk+u0jGTqFYSflSv6KORZ+lsKG7WLscWbJvhpI1vgOcL6L+VAhtUOV7BViA4Zp/u 34oi1/Tp8Cs4LVeUV1JSdMX/ZdEX9N02nQotyvaZKj7fqu39WQHbhLwlUpO02wQ7fZTK PHQd4W/QUwqwNIdKaClSfYiozB5EVQaD2ECwEwlk0DEOWbMNRFv/OPkjN1FWRcBcTwzi phfRRARhmWGgnv4Aq6zlfdIbodxKP/5IVbEgeauzw5+Qzes08T7S4++RLzsYH8xUui9x 11sQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1694022119; x=1694626919; h=content-transfer-encoding:mime-version:user-agent:message-id :in-reply-to:date:references:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=NbFxwdo13GnmNcBU4wcJjC1/qxJBDN+iZ5dSIY8r8pA=; b=TzWoCamr9DpMDdtpC+zH09dJEItAkkRrXl2TJoI+Du5GaQcAdgttAMFsNGHvweocB+ N65wDO7hcCcTvA56JmDv/H3qSlzyNE+UA0u5RWv1pbFLbrmL7aS3Y5wihJDRcUcG3M9b 5JiypFSLhwfrwiJWb4IZ0BeO2C21myvRJ5BjZgb52sXkW6k5DBpw19aG1e0Y+nJvJeja Exz3A8hoiqyXsuq1+lR4PlFwyJ2FIJcyUidR2PqH+CXMfIwsuWr2w6HtdlWaSs+KPXaC X98E5IOHEJGts6x4Vb5zS5AGZVAzXhMg2cb0IFYeTAslumBPkyLuR8mUXHBgv/Apo29z jZzQ== X-Gm-Message-State: AOJu0YzILhPqF5JrMWPym3JPa/Dc4pBxnn8VrCXp609+I4DyQHK3Nv+X KtRCsaK5w9epKct06dDkXOAQnN+RVBOVgg== X-Google-Smtp-Source: AGHT+IGrUt9lbx7iHrQ9XuznVjxGgWtN6tIxOJoFP9uR0OBd20e0J81cmxXI0ZmPpjWNBF7pDfY7FQ== X-Received: by 2002:a05:620a:17a6:b0:76e:e9b4:ff44 with SMTP id ay38-20020a05620a17a600b0076ee9b4ff44mr18188366qkb.67.1694022118753; Wed, 06 Sep 2023 10:41:58 -0700 (PDT) Received: from hurd (dsl-153-125.b2b2c.ca. [66.158.153.125]) by smtp.gmail.com with ESMTPSA id j15-20020a05620a146f00b00767dc4c539bsm5152521qkl.44.2023.09.06.10.41.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Sep 2023 10:41:58 -0700 (PDT) From: Maxim Cournoyer <maxim.cournoyer@HIDDEN> To: Simon Tournier <zimon.toutoune@HIDDEN> Subject: Re: [bug#65352] time-machine, unavailable network or Savannah down References: <86ledjoaly.fsf@HIDDEN> Date: Wed, 06 Sep 2023 13:41:57 -0400 In-Reply-To: <86ledjoaly.fsf@HIDDEN> (Simon Tournier's message of "Wed, 06 Sep 2023 12:32:41 +0200") Message-ID: <871qfb5hcq.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65352 Cc: 65352 <at> debbugs.gnu.org, Ludovic =?utf-8?Q?Court=C3=A8s?= <ludo@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) Hi Simon, Ludovic, Simon Tournier <zimon.toutoune@HIDDEN> writes: > Hi Maxim, > > Let start another branch in that thread of #65352. :-) Alright :-). > Let start the discussion on good basis, let start with an example: > > $ guix describe > Generation 26 Jul 12 2023 09:13:39 (current) > guix 4a027d2 > repository URL: https://git.savannah.gnu.org/git/guix.git > branch: master > commit: 4a027d2b0ee68e39f21f6802a8cd1751d3065330 > > $ guix time-machine --commit=3D4a027d2 -- describe > Updating channel 'guix' from Git repository at 'https://git.savannah.gnu.= org/git/guix.git'... > substitute: updating substitutes from 'https://ci.guix.gnu.org'... 100.0% > substitute: updating substitutes from 'https://bordeaux.guix.gnu.org'... = 100.0% > building /gnu/store/sg8ca36rlbh4il6jy8dk2gr33lxm4z8q-compute-guix-derivat= ion.drv... > Computing Guix derivation for 'x86_64-linux'... | > substitute: updating substitutes from 'https://ci.guix.gnu.org'... 100.0% > substitute: updating substitutes from 'https://bordeaux.guix.gnu.org'... = 100.0% > The following derivations will be built: > [...] > building profile with 1 package... > guix 4a027d2 > repository URL: https://git.savannah.gnu.org/git/guix.git > commit: 4a027d2b0ee68e39f21f6802a8cd1751d3065330 > > > So far, so good. Here all is cached and so on. Now, let make > git.savannah.gnu.org unreachable by tweaking some stuff. Then, > > $ guix time-machine --commit=3D4a027d2 -- describe > guix time-machine: error: Git error: failed to resolve address for git.sa= vannah.gnu.org: Name or service not known > > > Do we agree it is bug? Do we agree that the behaviour is not POLA? Thanks for the example, it helps :-). I agree it's an undesirable behavior to reach to the network after having (supposedly) cached the very same ref. [...] > On Tue, 05 Sep 2023 at 22:00, Maxim Cournoyer <maxim.cournoyer@HIDDEN>= wrote: > >> I don't know if we want to consider tags are immutable or not; the >> safest is to consider them an *not* immutable, which is what we had been >> doing. I agree it doesn't cover all the potential git refspecs; we can >> get there if we want (although I suppose it's uncommon for someone to >> try 'guix time-machine --commit=3Dv1.3.0-47405-ge0767a24d0' or similar). > > [...] > >> I'm not sure if short commit IDs should be treated as immutable, since >> in theory they can collide; the safest would be to check if there are >> collisions and report an error if there is; and this requires fetching >> new objects first. > > Well, the behaviour that I want is that it just works whatever the > status of Savannah when I have a local Git ref that matches what I > provide to =E2=80=99guix time-machine=E2=80=99 (or guix pull or else). > > I think you are inferring a rule from two corner-cases. And from my > point of view, there are only hypothetical. :-) Also, from the current state of things (the code) :-). But I agree that there seems to be space for improvements here. > 1. About tag. The ones from upstream are defacto immutable. It is > uncommon that people set local tag under ~/.cache/guix/checkouts. And, > the failure when Savannah is unreachable appears to me more annoying > than hypothetical mutable tags. Therefore, I propose what I already > proposed. :-) It will make it works for most of the cases. More annoying but also, much more likely! > Even, what would happen if a tag is changed? The user does not get the > same inferior for two invocations. The question is: what triggers the > update of the cached checkout? > > What is the consequence for not updating when the user-specified Git ref > is a mutable one (tag or else)? Here, I am proposing to delay the > update until the next =E2=80=9Cguix pull=E2=80=9D or =E2=80=9Cguix time-m= achine -q=E2=80=9D, well until > the user invokes a command with a Git ref that does not belong to the > local cached checkout. > > I do not see why this delay is a problem. And it avoids an update. > > > 2. About short commit IDs. The same reasoning applies. :-) > > About the collision, it is the same. It only delays the collision > report. Sounds reasonable; it'll reduce some load from Savannah ;-). > > All in all, I think that reference-available? needs to check if the Git > ref belongs to the local cached checkout and that=E2=80=99s all. If it i= s, use > it, else update the local cached checkout. > > At time t, the user-specificity Git ref can match some local Git ref but > not the upstream state. And so? > > Somehow, I am considering the local cached checkout as the primary > reference for looking up Git ref. > > Do you see a potential issue that I am missing? So all the refs such as commit(ish) or tags would be referenced locally, and branches such as 'master' would still trigger an update. LGTM, but I'd be curious to hear what Ludovic thinks, since their original code treated tags as mutable (which they technically are, but I agree to the value of treating them as immutable, and it appears low risk to me). --=20 Thanks, Maxim
guix-patches@HIDDEN:bug#65352; Package guix-patches.
Full text available.
Received: (at 65352) by debbugs.gnu.org; 6 Sep 2023 14:17:29 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Sep 06 10:17:29 2023
Received: from localhost ([127.0.0.1]:37076 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qdtLU-0006Bg-RU
for submit <at> debbugs.gnu.org; Wed, 06 Sep 2023 10:17:29 -0400
Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]:38170)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <zimon.toutoune@HIDDEN>) id 1qdtLQ-0006BN-Dt
for 65352 <at> debbugs.gnu.org; Wed, 06 Sep 2023 10:17:28 -0400
Received: by mail-wm1-x329.google.com with SMTP id
5b1f17b1804b1-401ef656465so11929375e9.1
for <65352 <at> debbugs.gnu.org>; Wed, 06 Sep 2023 07:17:23 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20221208; t=1694009836; x=1694614636; darn=debbugs.gnu.org;
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=Sw98O3dNVCOWfHSc7YY7jIf+BUdZvVKiPIi1mOQBdcw=;
b=WmTmsbNV4v7hZzr6TfI30MnfwxiIrVn9BMmYrgPIN241Sm+ELwH7OA/lyjtco4sj1d
2sHk/V3MrmSkJ/Qwb/3lnMltM/Tsyl+MNjmtdWqN8ShX1NKmoMZ0G7IH7U6JQPNKVgaZ
sWMt+4rfovPntGPM4eyAeAUOme/xXWa4nKV76T7SmkKsoH3HU4GAH8x3cr7sUJ3MfaGS
tCjUO6qmwtjnaXzSAHTo9ZTBEPdm7LtS93akyCiqKI8F7vDhNmTkypFeBObPk7G6PiPF
iFfem4I2spoPmTufzqYoXzr4Fcf5eEFN/cGIGRC2x4wDMkFc7G9Qg9dl0wlobNaZRz2M
e5SQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20221208; t=1694009836; x=1694614636;
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=Sw98O3dNVCOWfHSc7YY7jIf+BUdZvVKiPIi1mOQBdcw=;
b=DyGNm4nvC8PuuKFhn0sv3eLL5vSm3y72R2HNS4L114ymv8/IHx1yeHvXHjwrdwpoEQ
rGe8EHDVnI1669iiqTIId7MbpQ+7kV+AXjP+oRbGcCf0h1yUJvH0MUSXVQVtQgqevYJJ
H0zJrqsUUdol/8N1+zC2IC2u4so7xAHIimZyPWtwHZGGzu3JnzRu7Y9gb0kXvwFwdXf4
5+FpQL3sp5Dg/TqqEXVcn87+o6gmDocXzk9AjISJ0ENHd3ChdYQ6CkPMMMeDzREeVKDX
qvMuHdiy0IB0A7aLLgM720uo0eB5E/pud24kLiSxhLO7tvkU5iOa2qfXdA3X/Dk381hp
lyHQ==
X-Gm-Message-State: AOJu0YxabhNpPwJGmnprdtWjqIQo/Yy13mbnNb7eCG2Z2CU2QP52zWbT
lEST4JaAyaI7k64zfbU+NYk=
X-Google-Smtp-Source: AGHT+IGSIbhKzrOjWCvms+7Z61U1tEoTGzaXlQq2EBYHaEtHxzuSDu51EF1+1sEkkrV/ZXGS9GMiDw==
X-Received: by 2002:a05:600c:1da5:b0:3fe:d46a:ef4b with SMTP id
p37-20020a05600c1da500b003fed46aef4bmr12740760wms.1.1694009835943;
Wed, 06 Sep 2023 07:17:15 -0700 (PDT)
Received: from localhost.localdomain ([193.48.40.241])
by smtp.gmail.com with ESMTPSA id
z12-20020adff1cc000000b0031ddf6cc89csm20437091wro.98.2023.09.06.07.17.15
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Wed, 06 Sep 2023 07:17:15 -0700 (PDT)
From: Simon Tournier <zimon.toutoune@HIDDEN>
To: Simon Tournier <zimon.toutoune@HIDDEN>, 65352 <at> debbugs.gnu.org,
Maxim Cournoyer <maxim.cournoyer@HIDDEN>
Subject: [PATCH v2] DRAFT git: Avoid touching the network unless needed in
'reference-available?'.
Date: Wed, 6 Sep 2023 16:17:08 +0200
Message-Id: <32d3fb5066e0b20e200dabef0fba897634e21dda.1694009405.git.zimon.toutoune@HIDDEN>
X-Mailer: git-send-email 2.39.2
In-Reply-To: <86ledjoaly.fsf@HIDDEN>
References: <86ledjoaly.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 65352
Cc: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
Follow-up of 756e336fa008c2469b4a7317ad5c641ed48f25d6 fixing the issue.
* guix/git/scm (reference-available?): Address case by case to determine
whether the reference exists in the local Git checkout.
---
guix/git.scm | 22 +++++++++-------------
1 file changed, 9 insertions(+), 13 deletions(-)
Hi,
Here a draft about what I think is the correct solution.
Well, the tests we have talked about are all passing.
Let me know what you think.
Cheers,
simon
diff --git a/guix/git.scm b/guix/git.scm
index 1cb87a45607b..1b3355109e42 100644
--- a/guix/git.scm
+++ b/guix/git.scm
@@ -5,6 +5,7 @@
;;; Copyright © 2021 Marius Bakke <marius@HIDDEN>
;;; Copyright © 2022 Maxime Devos <maximedevos@HIDDEN>
;;; Copyright © 2023 Tobias Geerinckx-Rice <me@HIDDEN>
+;;; Copyright © 2023 Simon Tournier <zimon.toutoune@HIDDEN>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -360,21 +361,16 @@ (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."
- ;; Note: this must not rely on 'resolve-reference', as that procedure always
- ;; resolves the references for branch names such as master. The semantic we
- ;; want here is that unless the reference is exact (e.g. a commit), the
- ;; reference should not be considered available, as it could have changed on
- ;; the remote.
(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))))))
+ (('commit . (? commit-id? commit))
+ (let ((oid (string->oid commit)))
+ (->bool (commit-lookup repository oid))))
+ ((or ('tag . str)
+ ('tag-or-commit . str))
+ (false-if-git-not-found
+ (->bool (resolve-reference repository ref))))
(_
+ ;; For the others REF as branch or symref, the REF cannot be available
#f)))
(define (clone-from-swh url tag-or-commit output)
base-commit: 6113e0529d61df7425f64e30a6bf77f7cfdfe5a5
--
2.38.1
guix-patches@HIDDEN:bug#65352; Package guix-patches.
Full text available.
Received: (at 65352) by debbugs.gnu.org; 6 Sep 2023 10:34:44 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Sep 06 06:34:44 2023
Received: from localhost ([127.0.0.1]:33039 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qdprw-0002nd-6Y
for submit <at> debbugs.gnu.org; Wed, 06 Sep 2023 06:34:44 -0400
Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:41131)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <zimon.toutoune@HIDDEN>) id 1qdprs-0002nM-Mt
for 65352 <at> debbugs.gnu.org; Wed, 06 Sep 2023 06:34:43 -0400
Received: by mail-wr1-x42e.google.com with SMTP id
ffacd0b85a97d-31f4629aaaaso372304f8f.0
for <65352 <at> debbugs.gnu.org>; Wed, 06 Sep 2023 03:34:39 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20221208; t=1693996474; x=1694601274; darn=debbugs.gnu.org;
h=content-transfer-encoding:mime-version:message-id:date:subject:cc
:to:from:from:to:cc:subject:date:message-id:reply-to;
bh=YTn7VorFj0F6jnPSpbz2n+KNCQuxJIvwxONMrzwA0sg=;
b=WOFK/TdBzdTa152rbCUFKZTo6lcaSN8p5XBqU5eFn3Smqyv8LTRl9IP5LiIiNn83WP
aHzrgFpAcyUlYObtgxbKsq78LKT10xAXqMC/FmWu3P+OoQy+YiJIgffUWpjgJ3H7lS34
TGCHcvYfQWMILUE6hMDj0pYR89zDSyraAdqguGCYezJE//2p2YDGx0a/CuBrUVIKg2GK
PJPq0bqCHr5QZyQg+f6ZFMyQg6qrQpotLNAZbT+Eb8LRz/dk2UABBvvkjL9ycFFLrn82
hYOt9nYfi6OxyKQ/N52paDyAC9nAqcX1DvfBVfBR8zIYLj3exD4bD+5WjCEezlTXbAoI
nwsQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20221208; t=1693996474; x=1694601274;
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=YTn7VorFj0F6jnPSpbz2n+KNCQuxJIvwxONMrzwA0sg=;
b=k1uim8CMWAoTka0NHSgZLv0wyJgGqj0tPfAG6gpAd1kWiU+vabA3OqMcncmEJEAglA
uErTcNvpah6gX+Tj26RWy4l7EqvFO09MfG0+VNQb1raoXHdLMs7ZqX1KothRqK0P33Hp
tetJ6B5W97ju9BgBeqrKV2M9emFjNygqkZlrPf3BB+ysHScZ/e3wLtMequUwPg5GKSHc
kShMsthBxhsuq0+xGsM8ZU/0mIO4jAhMXG4+iX8K2d1SFjJ3l6SbJkDhtWePLImeFQwX
rV+qx/iDjcpO1is0sR5mM+qljcdv5RS8n9z9pK3Eaha3+r999qYS5dsL2WJX4wlEnEYz
ewYQ==
X-Gm-Message-State: AOJu0YyCZ/jwQbeHnu9/m/rHAwrES/X+hXO9IRi0NDDj4Rdh4U6zii7T
f2JrPas9bcREqQmjgJAEhI5AVMTSqaw=
X-Google-Smtp-Source: AGHT+IGmaxzv4dbKpkD1/jZVAujvGy+QPe+74YRPHbEND7xmdqDpfS4PPhIC9uCjXQxjqsMCeu+GtQ==
X-Received: by 2002:a5d:5227:0:b0:31a:d22c:1ee with SMTP id
i7-20020a5d5227000000b0031ad22c01eemr12086355wra.1.1693996473864;
Wed, 06 Sep 2023 03:34:33 -0700 (PDT)
Received: from lili ([2a01:e0a:59b:9120:65d2:2476:f637:db1e])
by smtp.gmail.com with ESMTPSA id
z14-20020adff1ce000000b0031c855d52efsm19930851wro.87.2023.09.06.03.34.33
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Wed, 06 Sep 2023 03:34:33 -0700 (PDT)
From: Simon Tournier <zimon.toutoune@HIDDEN>
To: 65352 <at> debbugs.gnu.org, Maxim Cournoyer <maxim.cournoyer@HIDDEN>
Subject: [bug#65352] time-machine, unavailable network or Savannah down
Date: Wed, 06 Sep 2023 12:32:41 +0200
Message-ID: <86ledjoaly.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 65352
Cc: Ludovic =?utf-8?Q?Court=C3=A8s?= <ludo@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
Hi Maxim,
Let start another branch in that thread of #65352. :-)
Let start the discussion on good basis, let start with an example:
--8<---------------cut here---------------start------------->8---
$ guix describe
Generation 26 Jul 12 2023 09:13:39 (current)
guix 4a027d2
repository URL: https://git.savannah.gnu.org/git/guix.git
branch: master
commit: 4a027d2b0ee68e39f21f6802a8cd1751d3065330
$ guix time-machine --commit=3D4a027d2 -- describe
Updating channel 'guix' from Git repository at 'https://git.savannah.gnu.or=
g/git/guix.git'...
substitute: updating substitutes from 'https://ci.guix.gnu.org'... 100.0%
substitute: updating substitutes from 'https://bordeaux.guix.gnu.org'... 10=
0.0%
building /gnu/store/sg8ca36rlbh4il6jy8dk2gr33lxm4z8q-compute-guix-derivatio=
n.drv...
Computing Guix derivation for 'x86_64-linux'... |
substitute: updating substitutes from 'https://ci.guix.gnu.org'... 100.0%
substitute: updating substitutes from 'https://bordeaux.guix.gnu.org'... 10=
0.0%
The following derivations will be built:
[...]
building profile with 1 package...
guix 4a027d2
repository URL: https://git.savannah.gnu.org/git/guix.git
commit: 4a027d2b0ee68e39f21f6802a8cd1751d3065330
--8<---------------cut here---------------end--------------->8---
So far, so good. Here all is cached and so on. Now, let make
git.savannah.gnu.org unreachable by tweaking some stuff. Then,
--8<---------------cut here---------------start------------->8---
$ guix time-machine --commit=3D4a027d2 -- describe
guix time-machine: error: Git error: failed to resolve address for git.sava=
nnah.gnu.org: Name or service not known
--8<---------------cut here---------------end--------------->8---
Do we agree it is bug? Do we agree that the behaviour is not POLA?
It is the same when specifying a release tag,
--8<---------------cut here---------------start------------->8---
$ guix time-machine --commit=3Dv1.4.0 -- describe
guix time-machine: error: Git error: failed to resolve address for git.sava=
nnah.gnu.org: Name or service not known
--8<---------------cut here---------------end--------------->8---
I think Guix needs to be reliable whatever the status of Savannah when a
local Git ref is in the local cached checkout.
After this introduction, let start the core discussion.
On Tue, 05 Sep 2023 at 22:00, Maxim Cournoyer <maxim.cournoyer@HIDDEN> w=
rote:
> I don't know if we want to consider tags are immutable or not; the
> safest is to consider them an *not* immutable, which is what we had been
> doing. I agree it doesn't cover all the potential git refspecs; we can
> get there if we want (although I suppose it's uncommon for someone to
> try 'guix time-machine --commit=3Dv1.3.0-47405-ge0767a24d0' or similar).
[...]
> I'm not sure if short commit IDs should be treated as immutable, since
> in theory they can collide; the safest would be to check if there are
> collisions and report an error if there is; and this requires fetching
> new objects first.
Well, the behaviour that I want is that it just works whatever the
status of Savannah when I have a local Git ref that matches what I
provide to =E2=80=99guix time-machine=E2=80=99 (or guix pull or else).
I think you are inferring a rule from two corner-cases. And from my
point of view, there are only hypothetical. :-)
1. About tag. The ones from upstream are defacto immutable. It is
uncommon that people set local tag under ~/.cache/guix/checkouts. And,
the failure when Savannah is unreachable appears to me more annoying
than hypothetical mutable tags. Therefore, I propose what I already
proposed. :-) It will make it works for most of the cases.
Even, what would happen if a tag is changed? The user does not get the
same inferior for two invocations. The question is: what triggers the
update of the cached checkout?
What is the consequence for not updating when the user-specified Git ref
is a mutable one (tag or else)? Here, I am proposing to delay the
update until the next =E2=80=9Cguix pull=E2=80=9D or =E2=80=9Cguix time-mac=
hine -q=E2=80=9D, well until
the user invokes a command with a Git ref that does not belong to the
local cached checkout.
I do not see why this delay is a problem. And it avoids an update.
2. About short commit IDs. The same reasoning applies. :-)
About the collision, it is the same. It only delays the collision
report.
All in all, I think that reference-available? needs to check if the Git
ref belongs to the local cached checkout and that=E2=80=99s all. If it is,=
use
it, else update the local cached checkout.
At time t, the user-specificity Git ref can match some local Git ref but
not the upstream state. And so?
Somehow, I am considering the local cached checkout as the primary
reference for looking up Git ref.
Do you see a potential issue that I am missing?
Cheers,
simon
guix-patches@HIDDEN:bug#65352; Package guix-patches.
Full text available.Received: (at 65352) by debbugs.gnu.org; 6 Sep 2023 02:39:21 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Tue Sep 05 22:39:21 2023 Received: from localhost ([127.0.0.1]:60306 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1qdiRt-00040a-A9 for submit <at> debbugs.gnu.org; Tue, 05 Sep 2023 22:39:21 -0400 Received: from mail-qt1-x82c.google.com ([2607:f8b0:4864:20::82c]:54350) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <maxim.cournoyer@HIDDEN>) id 1qdiRq-00040M-9X for 65352 <at> debbugs.gnu.org; Tue, 05 Sep 2023 22:39:20 -0400 Received: by mail-qt1-x82c.google.com with SMTP id d75a77b69052e-4135d72c75bso21451491cf.0 for <65352 <at> debbugs.gnu.org>; Tue, 05 Sep 2023 19:39:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693967951; x=1694572751; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:user-agent:message-id :in-reply-to:date:references:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=4Lnqhcl06XNrecvvZiR/+kmZV+S3p9vQ6+Ff6I3IRjY=; b=Y14XAQtPlelo1gy10VHGzjBpm9ToDGrDc/jm7DsyMu6fDb6+HZUIHK8JIUbgln6Gd0 xoSacYaAUYyGTASjIyX562nw/HUBadv2NiBG+vYDf16vjtjqmXAEexytaaYXJJCq0EET vvAcDz5Q/YjgcEx3yQ/xqHmdmKiHzhX8D/zpvsI2+98Zi4kD8Wwi8EUOO4YDTtUOmclB 9QcpvYnRIhyKHbk3/oQ6+0cLXzvhEgajNaaoYVr1S8GDCIOP9MrqDO7TQlMLX81KU7mW Zb35YYSy+XLoSAbqFo0b19Y0YvApdTHVEwMwpjnOYbyg0ieM+ApCT9ijRh57lNOm43Ex 7l/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693967951; x=1694572751; h=content-transfer-encoding:mime-version:user-agent:message-id :in-reply-to:date:references:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=4Lnqhcl06XNrecvvZiR/+kmZV+S3p9vQ6+Ff6I3IRjY=; b=LE98a2of/HooX4aoKIpjYyaHm+b+60lnlzbkzbGJ8bLBN51SxRlt7djJIE5N2oiVT2 AxfAjB4P+PivuadhJeG9rnGNbGCCnjlEz9haXQ+a++DTwzjD562jyXDZJtDOmxmdSabC CvKlma+ZPc/r5RYIrF65RyvP3P5zNdZIf2VF9bphHPuJbuLry9mbtPAviZ8qhvNyNMZK HeMRlFOH+PdxTxAMe8LE3E74NbWAKN1+yrAW3j5M7ohegk+Mt83hKQ7vFOI/AmFFDGqC neE2ktxzeKzAqLe3yw98GIFsOdFVe0UhHNuKXSpXl+9j3HUHRNjPBcNMZV9MKrzaYRbU pHGw== X-Gm-Message-State: AOJu0Yyb3hpPLJ51yokS3413CGSZGcvHbGlfkGRfc9XidGSxaiX6d0bc c213cyvwZzlXXEurDMXsN2C1nckPIG9AmQ== X-Google-Smtp-Source: AGHT+IFF1A7P3ro6E+uPPGGHbulIz1HgNQK/1A+/M0F63+kpYzd9MwvN3iZ3gL2tlVJHRGmm75Xm0g== X-Received: by 2002:a05:620a:44d1:b0:76e:f2cc:294f with SMTP id y17-20020a05620a44d100b0076ef2cc294fmr17952819qkp.63.1693967951504; Tue, 05 Sep 2023 19:39:11 -0700 (PDT) Received: from hurd (dsl-153-125.b2b2c.ca. [66.158.153.125]) by smtp.gmail.com with ESMTPSA id pi16-20020a05620a379000b0076f0744ff50sm4542582qkn.136.2023.09.05.19.39.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Sep 2023 19:39:10 -0700 (PDT) From: Maxim Cournoyer <maxim.cournoyer@HIDDEN> To: Simon Tournier <zimon.toutoune@HIDDEN> Subject: Re: [bug#65352] Fix time-machine and network References: <87fs4h4vb9.fsf@HIDDEN> <c5156f9a756c2a6a304dc789c00abf533c787fd8.1692281315.git.zimon.toutoune@HIDDEN> <87o7iiqo6d.fsf_-_@HIDDEN> <87y1hkfj7j.fsf_-_@HIDDEN> <864jk8qqz8.fsf@HIDDEN> Date: Tue, 05 Sep 2023 22:39:09 -0400 In-Reply-To: <864jk8qqz8.fsf@HIDDEN> (Simon Tournier's message of "Tue, 05 Sep 2023 22:56:11 +0200") Message-ID: <874jk8dnzm.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: 65352 Cc: 65352 <at> debbugs.gnu.org, Ludovic =?utf-8?Q?Court=C3=A8s?= <ludo@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) Hi, Simon Tournier <zimon.toutoune@HIDDEN> writes: > Hi Maxim, > > On Tue, 05 Sep 2023 at 16:39, Maxim Cournoyer <maxim.cournoyer@HIDDEN>= wrote: > >> I've reviewed this thread and the code, and I agree. This is a special >> case. I've added a comment so we aren't tempted to use >> 'resolve-reference' there again. > > I disagree. There is no special case. The culprit is the procedure > =E2=80=99validate-guix-channel=E2=80=99 as explained in: I was referring to the special case of resolved-reference? (that it mustn't trust tags or branches in a git cache -- at least currently, compared to resolve-reference. Maybe we want to change that? > [bug#65352] Fix time-machine and network > Simon Tournier <zimon.toutoune@HIDDEN> > Mon, 04 Sep 2023 19:37:08 +0200 > id:87wmx5on5n.fsf@HIDDEN > https://issues.guix.gnu.org//65352 > https://issues.guix.gnu.org/msgid/87wmx5on5n.fsf@HIDDEN > https://yhetil.org/guix/87wmx5on5n.fsf@HIDDEN > > >> Will install shortly. > > I do not know what you will install shortly. The fix belong to > validate-guix-channel, something like: > > (let* ((guix-channel (find guix-channel? channels)) > (reference (or ref > (match (channel-commit guix-channel) > (#f `(branch . ,(channel-branch guix-cha= nnel))) > (commit `(tag-or-commit . ,commit))))) > (checkout commit relation (update-cached-checkout > (channel-url guix-channel) > #:ref reference > #:starting-commit > %oldest-possible-commit))) > > and that would avoid to break the =E2=80=9Ccontract=E2=80=9D of resolve-r= eference. > Before committing something, I was testing. That's orthogonal to the other issue discussed, right? What I was referring to about 'installing' was c3d48d02, which implements the above (with let-bound variables and 'if' instead of match, but the logic is the same). I feel like we need to agree on what reference-available? is supposed to achieve, and where it needs to differentiate from resolve-reference. --=20 Thanks, Maxim
guix-patches@HIDDEN:bug#65352; Package guix-patches.
Full text available.Debbugs Internal Request <help-debbugs@HIDDEN>
to internal_control <at> debbugs.gnu.org.
Full text available.Received: (at 65352) by debbugs.gnu.org; 6 Sep 2023 02:00:27 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Tue Sep 05 22:00:27 2023 Received: from localhost ([127.0.0.1]:60278 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1qdhqF-0007Qs-Bh for submit <at> debbugs.gnu.org; Tue, 05 Sep 2023 22:00:27 -0400 Received: from mail-qv1-xf29.google.com ([2607:f8b0:4864:20::f29]:50312) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <maxim.cournoyer@HIDDEN>) id 1qdhqB-0006zi-7L; Tue, 05 Sep 2023 22:00:24 -0400 Received: by mail-qv1-xf29.google.com with SMTP id 6a1803df08f44-64b98479a66so18563916d6.0; Tue, 05 Sep 2023 19:00:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693965616; x=1694570416; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=fThKFD/Xndaikz1+58QN3w6ePxpWDkIjv+Si5x9YdV0=; b=jzT6Od92VPjcGw8HKyPJXg8zlCvFCuZH/oi7ijVoPtHAIUpwRZdg+b8HEYH4h6YhMY nRoMoVpWigWMvXyP1Y3t/89hJmhNAvo1K8qlHI+MFkRflbS3qQi4KygmRtiLQVrGm2aF W87uheiN+FQ1G83ZdVvMFndi4YRbqx6iLuEgrgShNmoMQnpZkB+6PCUpGi7+iZSkUlfA AWeb1fFQ3X+QedzXSuJs3eRCzfyWMS5cgSkMuzxSklCPQVnNIUGvrjMqW53pOW4WZRmT /3Tq1tt/HS1WqA2F40Mn1CnaIgmuEdLeUHnJpnFcHCLP58H5uQq4xsYxATVTa+6SzKmX y5MA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693965616; x=1694570416; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=fThKFD/Xndaikz1+58QN3w6ePxpWDkIjv+Si5x9YdV0=; b=XPkfVM0uO50LKpnmzIU9/Bj7+Spfl/uHFh4fPGbwj+n5v5tugS9TOOB32na/egkSDB CNfq8Jr+UqeVU1a0kje32ERHf1y8EE2RayX5B3FfR5s8o7R8vogegx1hLIpE5VITxiqg 8RTrJsbifZ65uX8ehJ/SuwX4l6uf4kIPabjJnWPf5oQd6dJ64CQdM/4SgDg5+o2R46pR j8H6IT7FMGkNu8eKzBfU6Q6fnVY8YyMxhVMMtrgVkU8Zw+78cKkW33b+OyEBk5voAFgD /LERv1/Hhb8LZBm0RGDANY3xWAoDQjCNpuuMH+3tGuMAELJiaYEIKZFHd1OUJyNvNAdw TGFA== X-Gm-Message-State: AOJu0YwyAhzSfGpmSgcqCS58UfxN3Q/Mv9BeWd8REHDoJFDeTanQYo+a 0w9I3UrEUfmtvJvhLU1J37N6uYbs/HYTww== X-Google-Smtp-Source: AGHT+IEF9TcsE/Peug4mfvK+WQA6D9VFh8XpWlK15qkDHX4TlIwSz96CftAoALAfWQq8CbEro4QpVA== X-Received: by 2002:a0c:a98b:0:b0:64a:a5f8:6314 with SMTP id a11-20020a0ca98b000000b0064aa5f86314mr14097186qvb.0.1693965616390; Tue, 05 Sep 2023 19:00:16 -0700 (PDT) Received: from hurd (dsl-153-125.b2b2c.ca. [66.158.153.125]) by smtp.gmail.com with ESMTPSA id u16-20020a0cf1d0000000b0063d281e22f1sm4995301qvl.17.2023.09.05.19.00.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Sep 2023 19:00:15 -0700 (PDT) From: Maxim Cournoyer <maxim.cournoyer@HIDDEN> To: Simon Tournier <zimon.toutoune@HIDDEN> Subject: Re: bug#65352: Fix time-machine and network References: <87fs4h4vb9.fsf@HIDDEN> <c5156f9a756c2a6a304dc789c00abf533c787fd8.1692281315.git.zimon.toutoune@HIDDEN> <87fs3slplq.fsf_-_@HIDDEN> <CAJ3okZ3xkUMZnGvUcM8WSxDu0dkOZ0Cfp+qtauYJc7wTsR2xyQ@HIDDEN> <87tts8f9p7.fsf@HIDDEN> <CAJ3okZ17LnExcT32HwW1i86tS7fUD3WJqUURwMi=X3AXZ-1YZA@HIDDEN> Date: Tue, 05 Sep 2023 22:00:11 -0400 In-Reply-To: <CAJ3okZ17LnExcT32HwW1i86tS7fUD3WJqUURwMi=X3AXZ-1YZA@HIDDEN> (Simon Tournier's message of "Wed, 6 Sep 2023 02:58:08 +0200") Message-ID: <878r9kdpsk.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65352 Cc: 65352 <at> debbugs.gnu.org, GNU Debbugs <control <at> debbugs.gnu.org> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) reopen 65352 quit Hi Simon, Simon Tournier <zimon.toutoune@HIDDEN> writes: > Hi Maxim, > > On Wed, 6 Sept 2023 at 02:04, Maxim Cournoyer <maxim.cournoyer@HIDDEN> wrote: > >> I had indeed missed its continuation! I've reverted a789dd5865 with >> 756e336fa0 and installed c3d48d024, which should now validate the >> branch/commit of a channel file as well. > > Thanks for the follow up. > > The other issue about the order of the progress bar and the message > "Updating guix ..." is not yet fixed. :-) I am fine to open another > issue for that but since it appears to me the same patch series as > this one. Well you are applying patches faster than I am able to > process my emails or comment your messages. ;-) Anyway, I will open a > report for that order issue. OK, thank you. It's a bit hard to keep track of multiple issues and their resolutions in a longish thread. > However, this bug #65352 is not done. > > https://issues.guix.gnu.org/65352#0 > > The bug I report is, for instance, consider "guix time-machine > --commit=v1.4.0", this will pass (tag-or-commit . "v1.4.0") as REF to > reference-available? which is not a commit-id? if I read correctly. > And so reference-available? will return #f triggered an network update > when the reference if already in the cache checkout. I don't know if we want to consider tags are immutable or not; the safest is to consider them an *not* immutable, which is what we had been doing. I agree it doesn't cover all the potential git refspecs; we can get there if we want (although I suppose it's uncommon for someone to try 'guix time-machine --commit=v1.3.0-47405-ge0767a24d0' or similar). > It is similar with short commit hash as "guix time-machine > --commit=4a027d2". That's what I reported. I'm not sure if short commit IDs should be treated as immutable, since in theory they can collide; the safest would be to check if there are collisions and report an error if there is; and this requires fetching new objects first. So, what is the behavior that we want? -- Thanks, Maxim
guix-patches@HIDDEN:bug#65352; Package guix-patches.
Full text available.
Received: (at 65352-done) by debbugs.gnu.org; 6 Sep 2023 00:58:30 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Sep 05 20:58:30 2023
Received: from localhost ([127.0.0.1]:60167 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qdgsH-0004QP-JC
for submit <at> debbugs.gnu.org; Tue, 05 Sep 2023 20:58:30 -0400
Received: from mail-lf1-x130.google.com ([2a00:1450:4864:20::130]:40096)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <zimon.toutoune@HIDDEN>) id 1qdgsF-0004Q8-N2
for 65352-done <at> debbugs.gnu.org; Tue, 05 Sep 2023 20:58:28 -0400
Received: by mail-lf1-x130.google.com with SMTP id
2adb3069b0e04-4ffd3c9330dso783070e87.0
for <65352-done <at> debbugs.gnu.org>; Tue, 05 Sep 2023 17:58:26 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20221208; t=1693961900; x=1694566700; darn=debbugs.gnu.org;
h=cc:to:subject:message-id:date:from:in-reply-to:references
:mime-version:from:to:cc:subject:date:message-id:reply-to;
bh=BKn2h4oIy9JqYnzcpiyDAwABu0rIVF6JTcXbQBYXbqg=;
b=EzBRFxnnuDVJREZRxCx4ucB8QralRy1IauzbSe37Avu3UOBDTXekF+6YvkIeZGZ1rv
7eIyL6Y2hCrvNtri/0FNFyYM+prNBOxq19Mx9b0Sc39TlB8uuEuU7J4ZU/OPsVO4F+8t
vSzsmE6BSXxF5DVaSg973X6lwawCTV3kqdch5iEbQ0f11iCJ27AuFuUY41PQox0GEHFk
dKNO+l4pBGRooznEjPcuJVNhvDPDlxjAZnDkWtHo+jfILc3BZEh9u5SWjQHwy+P8HgAC
/RkKmlxFMAQWkWQlr6f5sWA1W84oZ/yF6Aao14hs2M55sHG6EtIZ5LVrhINmM6UccBuR
+ZEw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20221208; t=1693961900; x=1694566700;
h=cc:to:subject:message-id:date:from:in-reply-to:references
:mime-version:x-gm-message-state:from:to:cc:subject:date:message-id
:reply-to;
bh=BKn2h4oIy9JqYnzcpiyDAwABu0rIVF6JTcXbQBYXbqg=;
b=h43hyVYI40L6p1pI7pbJHi+WM9qwUgUb9U9Zsas6L1UcAflEQPl0rOEHpChZXk1pXP
a+8xw3fHB1HMasiGX43gENuTkyTM9XPSK1++noXggar6pninrje1NAJvkI7vGTAHPryd
f0sRhPyfIkeCqgkCOQdtri0uUxW2/aDIgHxCQAmphrE/2S4U0LqUy5bH2/2EuMsF2s2s
BK3+NsoQSGSWAHHINXl/u7DyUzJoV2HkzH3ooKEYNMh4q3IfnOUGc7/2NZBk8F7vBSwi
LW8ztmtfvUShjStp31Tto2v0AMuprBeehIVOv00RbLUXsL5OF21vHJ8b+3UG++9t2vLF
nr/A==
X-Gm-Message-State: AOJu0YxgHNgdFnE0zzg7jib28XTNGUVu1trGxe0f5crBkKCrwEoyHSzd
JYQdGD0HN5jfvjkblFsZ8lan939Y4u118DAgTC8=
X-Google-Smtp-Source: AGHT+IEp7IxaEx4UjwGY8ZtDpkBjAW3wd/IpqJVOu0j/4DBm9a70YB7TUYMj2vuegL9CwMBqF8NOZ/kFHXIU5S5elp4=
X-Received: by 2002:ac2:5628:0:b0:4f6:a2f:beb with SMTP id
b8-20020ac25628000000b004f60a2f0bebmr8715166lff.5.1693961900386;
Tue, 05 Sep 2023 17:58:20 -0700 (PDT)
MIME-Version: 1.0
References: <87fs4h4vb9.fsf@HIDDEN>
<c5156f9a756c2a6a304dc789c00abf533c787fd8.1692281315.git.zimon.toutoune@HIDDEN>
<87fs3slplq.fsf_-_@HIDDEN>
<CAJ3okZ3xkUMZnGvUcM8WSxDu0dkOZ0Cfp+qtauYJc7wTsR2xyQ@HIDDEN>
<87tts8f9p7.fsf@HIDDEN>
In-Reply-To: <87tts8f9p7.fsf@HIDDEN>
From: Simon Tournier <zimon.toutoune@HIDDEN>
Date: Wed, 6 Sep 2023 02:58:08 +0200
Message-ID: <CAJ3okZ17LnExcT32HwW1i86tS7fUD3WJqUURwMi=X3AXZ-1YZA@HIDDEN>
Subject: Re: bug#65352: Fix time-machine and network
To: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
Content-Type: text/plain; charset="UTF-8"
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 65352-done
Cc: 65352-done <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
Hi Maxim,
On Wed, 6 Sept 2023 at 02:04, Maxim Cournoyer <maxim.cournoyer@HIDDEN> wrote:
> I had indeed missed its continuation! I've reverted a789dd5865 with
> 756e336fa0 and installed c3d48d024, which should now validate the
> branch/commit of a channel file as well.
Thanks for the follow up.
The other issue about the order of the progress bar and the message
"Updating guix ..." is not yet fixed. :-) I am fine to open another
issue for that but since it appears to me the same patch series as
this one. Well you are applying patches faster than I am able to
process my emails or comment your messages. ;-) Anyway, I will open a
report for that order issue.
However, this bug #65352 is not done.
https://issues.guix.gnu.org/65352#0
The bug I report is, for instance, consider "guix time-machine
--commit=v1.4.0", this will pass (tag-or-commit . "v1.4.0") as REF to
reference-available? which is not a commit-id? if I read correctly.
And so reference-available? will return #f triggered an network update
when the reference if already in the cache checkout.
It is similar with short commit hash as "guix time-machine
--commit=4a027d2". That's what I reported.
I am fine with the revert 756e336fa008c2469b4a7317ad5c641ed48f25d6
waiting my fix for what I am reporting. But I disagree with the
comment because that's incorrect.
In order to detect the tag or commit string, the procedure
reference-available? needs to implement the string tag case and the
short commit hash case, something like:
(('tag-or-commit . str)
(cond ((and (string-contains str "-g")
(match (string-split str #\-)
((version ... revision g+commit)
(if (and (> (string-length g+commit) 4)
(string-every char-set:digit revision)
(string-every char-set:hex-digit
(string-drop g+commit 1)))
;; Looks like a 'git describe' style ID, like
;; v1.3.0-7-gaa34d4d28d.
(string-drop g+commit 1)
#f))
(_ #f)))
=> (lambda (commit) (resolve `(commit . ,commit))))
((or (> (string-length str) 40)
(not (string-every char-set:hex-digit str)))
(resolve `(tag . ,str))) ;definitely a tag
(else
(catch 'git-error
(lambda ()
(resolve `(tag . ,str)))
(lambda _
;; There's no such tag, so it must be a commit ID.
(resolve `(commit . ,str)))))))
which is the same as resolve-reference. ;-) Hence my proposal.
I agree with your words: if REF passed to reference-available? is not
a valid REF defined by the docstring of update-cached-checkout, it
means that the "contract" is broken and so there is a bug.
It appears to me inconsistent to allow the clause (_ #f) in
reference-available? and not in resolve-reference.
Therefore, the change I proposed that is now reverted has just exposed
the bug. :-)
All in all, this issue should be kept open.
Cheers,
simon
guix-patches@HIDDEN:bug#65352; Package guix-patches.
Full text available.Received: (at 65352-done) by debbugs.gnu.org; 6 Sep 2023 00:22:35 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Tue Sep 05 20:22:35 2023 Received: from localhost ([127.0.0.1]:60043 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1qdgJW-0003Jh-B9 for submit <at> debbugs.gnu.org; Tue, 05 Sep 2023 20:22:35 -0400 Received: from mail-qk1-x729.google.com ([2607:f8b0:4864:20::729]:59647) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <maxim.cournoyer@HIDDEN>) id 1qdgJH-0003J6-DW for 65352-done <at> debbugs.gnu.org; Tue, 05 Sep 2023 20:22:32 -0400 Received: by mail-qk1-x729.google.com with SMTP id af79cd13be357-76dbe786527so154774485a.2 for <65352-done <at> debbugs.gnu.org>; Tue, 05 Sep 2023 17:22:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693959732; x=1694564532; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=zuSzZopP8XjjWd+B/7WJyK8l7J04WFnjoV7zmWdIlcA=; b=eT1dbyo9ap0UFafOjr1ZCFjhedon/NORI3wbgrQrqEnmkn5l0140BNHmeFE42k+aA8 gtvgTEHnzDm4XFlQK9vY5MyfJjE5Nu7r89gxVQljxE0WsdluGBm3JkykckLvT7xcPVCb fgHL5ppbz08Lgy3OEFFXN4XM6/1RMwZWb3KToaVjaC2EDzwcEqr5f4LwCiUmlKaBXTea 4YdOWj+8G6OBor1fCmmSwP30uCzR2bpnykQ8REXUsRNjqoKCrTOMNFoKivI/n8rdBTTX J/1eFraXAy9R9UEkWz9OQB59w/8s99z1L+q8FP7v92ugycamKiJ7Hnb2fCO/fU5n/VU3 6ytQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693959732; x=1694564532; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=zuSzZopP8XjjWd+B/7WJyK8l7J04WFnjoV7zmWdIlcA=; b=Sjoym50/i/WelrRRJ2udPrS+MQP7cV40qDx/CYPs8cFAyu0ujkL1OSWJFLoAiYyQ7C b44iTqLM7KhXiNURgRNcd8HU+k+Oy50l+GMgR+bohSYnf1CkOPamVsdbOL7uPYSeboI0 22yn6R0Ri+zgMZp9mPDgBXkmD+nG90yct4/uTodkWWckaZv8NUc4qPkCO7D3y71CGyoT MJqlTsKRDyWbqUdEm+Mfypf0U1P0pItVnhQrvVSI7lEGFfOLVRkoQ9m4tBdorTcxzfrg N3kTlXWLcpxZREPbZlItCnsz3zbjWTswh7YycBCPTquA7icHb+hO5De4y98DcM9lX/Pn Jr+w== X-Gm-Message-State: AOJu0Yz3uYfXWPIqdaO3urc53ulqpaYaEwAeZQyoN6pZ7++th0YAuMUO ajo64ufuHv3Vh31KwPd9dk5Wb9GRgdrp5w== X-Google-Smtp-Source: AGHT+IHnX3sFRcuPiLYeqjhZVSmq9XsNTDw/5nWQ0j8+Cp5R/O1kzU/dW6qjwXDUwkMDEakN1ow1kA== X-Received: by 2002:a05:620a:29ca:b0:76f:1828:4f36 with SMTP id s10-20020a05620a29ca00b0076f18284f36mr15963315qkp.27.1693959732684; Tue, 05 Sep 2023 17:22:12 -0700 (PDT) Received: from hurd (dsl-153-125.b2b2c.ca. [66.158.153.125]) by smtp.gmail.com with ESMTPSA id q13-20020ae9e40d000000b0076f1d8b1c2dsm4505368qkc.12.2023.09.05.17.22.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Sep 2023 17:22:12 -0700 (PDT) From: Maxim Cournoyer <maxim.cournoyer@HIDDEN> To: Simon Tournier <zimon.toutoune@HIDDEN> Subject: Re: bug#65352: Fix time-machine and network References: <87fs4h4vb9.fsf@HIDDEN> <c5156f9a756c2a6a304dc789c00abf533c787fd8.1692281315.git.zimon.toutoune@HIDDEN> <87o7iiqo6d.fsf_-_@HIDDEN> <87wmx5on5n.fsf@HIDDEN> Date: Tue, 05 Sep 2023 20:22:10 -0400 In-Reply-To: <87wmx5on5n.fsf@HIDDEN> (Simon Tournier's message of "Mon, 04 Sep 2023 19:37:08 +0200") Message-ID: <87pm2wf8wd.fsf_-_@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65352-done Cc: 65352-done <at> debbugs.gnu.org, Ludovic =?utf-8?Q?Court=C3=A8s?= <ludo@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) Hi Simon, Simon Tournier <zimon.toutoune@HIDDEN> writes: [...] > Well, instead, the correct something like: > > (let* ((guix-channel (find guix-channel? channels)) > (reference (or ref > (match (channel-commit guix-channel) > (#f `(branch . ,(channel-branch guix-channel))) > (commit `(tag-or-commit . ,commit))))) > (checkout commit relation (update-cached-checkout > (channel-url guix-channel) > #:ref reference > #:starting-commit > %oldest-possible-commit))) > > which works using my tests (with or without network). I've installed something along this with c3d48d0. If there are other issues, I think it'd be best if they are described clearly in a new issue, as that one is getting crowded :-). -- Thanks, Maxim
guix-patches@HIDDEN:bug#65352; Package guix-patches.
Full text available.Received: (at 65352-done) by debbugs.gnu.org; 6 Sep 2023 00:05:05 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Tue Sep 05 20:05:05 2023 Received: from localhost ([127.0.0.1]:59980 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1qdg2b-00008V-DE for submit <at> debbugs.gnu.org; Tue, 05 Sep 2023 20:05:05 -0400 Received: from mail-qk1-x72f.google.com ([2607:f8b0:4864:20::72f]:50266) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <maxim.cournoyer@HIDDEN>) id 1qdg2X-000075-1h for 65352-done <at> debbugs.gnu.org; Tue, 05 Sep 2023 20:05:04 -0400 Received: by mail-qk1-x72f.google.com with SMTP id af79cd13be357-770627a7316so204170185a.0 for <65352-done <at> debbugs.gnu.org>; Tue, 05 Sep 2023 17:05:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693958694; x=1694563494; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:user-agent:message-id :in-reply-to:date:references:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=33HpZ3NB4jRsIEedmN4kkYxe1mq6gqpil8eX1OW0Fqk=; b=ACtbYhoPcx7GFfSyhVZK14S2aTNNrrtgTnjYH2AsTCSrPNnwSd4AKhEnoygSYSKnIU djc2baMNA+LBLMixktapzCKVIKyNQ8VyTuQ7ldecpCXwIFtqeVtUIddSGT6nfsg8PCWQ w5Idl0Sd9WkoajuEikT9Mz/HG7uHZHim0EKT3/CqUMDzF+QlGkclg+DUkKd66m4zbDum vkLmZF85RFGlPebIPzMPeKuuKRzmOWW3rlDLPL2D/1vb8mJEn9y8YHlK3JV+Ys5UAMCv ZgWXpE6X6OdJUHwX/0j8mytFtqNbzHBGAQD+mBF7RMJVPl7h4tUtmGLw56suY1PQ2he5 yvPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693958694; x=1694563494; h=content-transfer-encoding:mime-version:user-agent:message-id :in-reply-to:date:references:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=33HpZ3NB4jRsIEedmN4kkYxe1mq6gqpil8eX1OW0Fqk=; b=cmRTflPsS3PTJ78bD1vzHYrRAbYo+Ffd99dbLTmazsnvvsEQYarFe8rLKysSBOjqIc Ts4kIjhZ4gTpphnJku/+OdqXaeuYxhLF+xVL5aeJvxiWQdNhQxmYZbjS5/NwoeZ7A5R+ 00Jad/dauMxqZ19kSOzvnf4eBZ0I8uOaBRr2MKIvHqXwH8nr95Zv3RRS/RBOH4N/B/2M ITndhBS+5catrS+gMze7/En1k0RjxgN2WkU9GcOGncYpWp8R+DdIQVaS2QD99zxvj637 xBtemLsWAgmlG5GOtZ/K6jyn5VWGnCruEHACuASlN3Sxpue+iXWJYfY05Z3g4Cjnnsap HcdQ== X-Gm-Message-State: AOJu0YxJqGPO3MfkFimdEVtKdqZy+7n77+N3uP1hpcF/SoZd6VBLrXS6 Uxyd/GcBgBoqaJ6MYcxej0m8tQqp/pBOwQ== X-Google-Smtp-Source: AGHT+IEM7IhPYbwzEP1h0H2QpQgcnolWlZf90XtQ+mOn1WJGTUWFLrCdCwIxMpXq026hsfEKmqZEpA== X-Received: by 2002:a05:620a:468b:b0:76f:1aec:f8ef with SMTP id bq11-20020a05620a468b00b0076f1aecf8efmr17064048qkb.53.1693958694228; Tue, 05 Sep 2023 17:04:54 -0700 (PDT) Received: from hurd (dsl-153-125.b2b2c.ca. [66.158.153.125]) by smtp.gmail.com with ESMTPSA id s1-20020ae9f701000000b0076d25b11b62sm4501032qkg.38.2023.09.05.17.04.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Sep 2023 17:04:53 -0700 (PDT) From: Maxim Cournoyer <maxim.cournoyer@HIDDEN> To: Simon Tournier <zimon.toutoune@HIDDEN> Subject: Re: bug#65352: Fix time-machine and network References: <87fs4h4vb9.fsf@HIDDEN> <c5156f9a756c2a6a304dc789c00abf533c787fd8.1692281315.git.zimon.toutoune@HIDDEN> <87fs3slplq.fsf_-_@HIDDEN> <CAJ3okZ3xkUMZnGvUcM8WSxDu0dkOZ0Cfp+qtauYJc7wTsR2xyQ@HIDDEN> Date: Tue, 05 Sep 2023 20:04:52 -0400 In-Reply-To: <CAJ3okZ3xkUMZnGvUcM8WSxDu0dkOZ0Cfp+qtauYJc7wTsR2xyQ@HIDDEN> (Simon Tournier's message of "Tue, 5 Sep 2023 15:43:54 +0200") Message-ID: <87tts8f9p7.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65352-done Cc: 65352-done <at> debbugs.gnu.org X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) Hi Simon, Simon Tournier <zimon.toutoune@HIDDEN> writes: > Hi Maxim, > > On Tue, 5 Sept 2023 at 15:24, Maxim Cournoyer <maxim.cournoyer@HIDDEN>= wrote: > >> This was applied some time ago as >> a789dd58656d5f7f1b8edf790d77753fc71670af. > > Thanks for having applied it. > >> Closing. > > However, I do not think it should be closed. Maybe you have missed: > > [bug#65352] Fix time-machine and network > Ludovic Court=C3=A8s <ludo@HIDDEN> > Mon, 04 Sep 2023 10:49:24 +0200 > id:87wmx6qq5n.fsf_-_@HIDDEN > https://issues.guix.gnu.org//65352 > https://issues.guix.gnu.org/msgid/87wmx6qq5n.fsf_-_@HIDDEN > https://yhetil.org/guix/87wmx6qq5n.fsf_-_@HIDDEN > > And this thread contains some fixes. Well, from my point of view, the > discussion is still pending... I had indeed missed its continuation! I've reverted a789dd5865 with 756e336fa0 and installed c3d48d024, which should now validate the branch/commit of a channel file as well. --=20 Thanks, Maxim
Simon Tournier <zimon.toutoune@HIDDEN>:Maxim Cournoyer <maxim.cournoyer@HIDDEN>:
Received: (at 65352) by debbugs.gnu.org; 5 Sep 2023 20:56:27 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Sep 05 16:56:27 2023
Received: from localhost ([127.0.0.1]:59606 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qdd62-0001CT-Ic
for submit <at> debbugs.gnu.org; Tue, 05 Sep 2023 16:56:26 -0400
Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:40328)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <zimon.toutoune@HIDDEN>) id 1qdd5y-0001Bv-Er
for 65352 <at> debbugs.gnu.org; Tue, 05 Sep 2023 16:56:22 -0400
Received: by mail-wr1-x42b.google.com with SMTP id
ffacd0b85a97d-31c3f574ef8so391981f8f.1
for <65352 <at> debbugs.gnu.org>; Tue, 05 Sep 2023 13:56:21 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20221208; t=1693947376; x=1694552176; darn=debbugs.gnu.org;
h=content-transfer-encoding:mime-version:message-id:date:references
:in-reply-to:subject:cc:to:from:from:to:cc:subject:date:message-id
:reply-to; bh=0AEj7qJMCI1MK38VmnES5ZwzGp5DJ91JxYww6Y7AXQQ=;
b=Js7z9iiDwBzmKONP5C9SUMS7JTzZFWueHkoFJn9LnelzVcVCXnjCWm2UdZ6N2TAX80
7WFs0cOhbyyDEmra+Ij++s0EED1/IDD9CIdvMrt94K3lNM96//nSupfSORrXRgl6Z8iy
GdmOgjmzSrb/3Pu3fCNj8bFYQI/TbsrejqhUob4W9LI+DLBSGv5YiSELmHTXwrh36a4O
d8QGW43F3rEuC9hwqkpDxjFamFOmk1HZcNgGGYUxnYjztSfJrEaUr284Pi5TzUk3dNNR
c2J53mRBDBYlsKPua4a1eS5mq22x/BrcQvp59yC93f+WMhDAfEQueGvyZiBsqTOzNs60
nPzA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20221208; t=1693947376; x=1694552176;
h=content-transfer-encoding:mime-version:message-id:date:references
:in-reply-to:subject:cc:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=0AEj7qJMCI1MK38VmnES5ZwzGp5DJ91JxYww6Y7AXQQ=;
b=AM+wZJhwnoPpylER0D4NxWpjEiXIq/Lb3qEhkD770jjN9q1X/IYfyQtEKLJAEcnmAf
hehiCEwnJo1G+tOiHtEQ7Y/oQF53s8zBByCckAV1m+sRwEuTaBAQQ86nKZ0bbSYkplfx
kp6AlCN9B0V85ePHoD2RUQRwQKGpNAShim/d2XPcJzZROozaa0tgAsyP1poRovha30U5
VgdDP42keHa1EtSJ6b4vTJe2DRFwsEzqACc3MpauLcIiuuxlzQSazXtmLRUU4kMa+iJq
Vvmmc6CvMnPM7beA0tbcxWOJWJlih461dG1VrKjKNWqJCU6fTG24j9RWeKmCb12HiaX5
/Jjg==
X-Gm-Message-State: AOJu0YwZ5s5JIvP7nEOe6sUKihL8v0nxP8Lh5GHXsaI+Bbyper1TVDC7
tMmkX33CEtfMIJLOVH3gOqjCCLQHGyo=
X-Google-Smtp-Source: AGHT+IF+SZE5PI8nwAd2660ATIvNwJlSm0W/8ij1nbZ0Tvt+HrrCWL1/d9rROKgWwH0c57szl98OGg==
X-Received: by 2002:adf:d08d:0:b0:317:3d36:b2c1 with SMTP id
y13-20020adfd08d000000b003173d36b2c1mr10284314wrh.7.1693947375714;
Tue, 05 Sep 2023 13:56:15 -0700 (PDT)
Received: from lili ([2a01:e0a:59b:9120:65d2:2476:f637:db1e])
by smtp.gmail.com with ESMTPSA id
y3-20020a5d4ac3000000b003141a3c4353sm18431469wrs.30.2023.09.05.13.56.15
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Tue, 05 Sep 2023 13:56:15 -0700 (PDT)
From: Simon Tournier <zimon.toutoune@HIDDEN>
To: Maxim Cournoyer <maxim.cournoyer@HIDDEN>, Ludovic =?utf-8?Q?Court?=
=?utf-8?Q?=C3=A8s?= <ludo@HIDDEN>
Subject: Re: [bug#65352] Fix time-machine and network
In-Reply-To: <87y1hkfj7j.fsf_-_@HIDDEN>
References: <87fs4h4vb9.fsf@HIDDEN>
<c5156f9a756c2a6a304dc789c00abf533c787fd8.1692281315.git.zimon.toutoune@HIDDEN>
<87o7iiqo6d.fsf_-_@HIDDEN> <87y1hkfj7j.fsf_-_@HIDDEN>
Date: Tue, 05 Sep 2023 22:56:11 +0200
Message-ID: <864jk8qqz8.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 65352
Cc: 65352 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
Hi Maxim,
On Tue, 05 Sep 2023 at 16:39, Maxim Cournoyer <maxim.cournoyer@HIDDEN> w=
rote:
> I've reviewed this thread and the code, and I agree. This is a special
> case. I've added a comment so we aren't tempted to use
> 'resolve-reference' there again.
I disagree. There is no special case. The culprit is the procedure
=E2=80=99validate-guix-channel=E2=80=99 as explained in:
[bug#65352] Fix time-machine and network
Simon Tournier <zimon.toutoune@HIDDEN>
Mon, 04 Sep 2023 19:37:08 +0200
id:87wmx5on5n.fsf@HIDDEN
https://issues.guix.gnu.org//65352
https://issues.guix.gnu.org/msgid/87wmx5on5n.fsf@HIDDEN
https://yhetil.org/guix/87wmx5on5n.fsf@HIDDEN
> Will install shortly.
I do not know what you will install shortly. The fix belong to
validate-guix-channel, something like:
(let* ((guix-channel (find guix-channel? channels))
(reference (or ref
(match (channel-commit guix-channel)
(#f `(branch . ,(channel-branch guix-chann=
el)))
(commit `(tag-or-commit . ,commit)))))
(checkout commit relation (update-cached-checkout
(channel-url guix-channel)
#:ref reference
#:starting-commit
%oldest-possible-commit)))
and that would avoid to break the =E2=80=9Ccontract=E2=80=9D of resolve-ref=
erence.
Before committing something, I was testing.
Cheers,
simon
guix-patches@HIDDEN:bug#65352; Package guix-patches.
Full text available.
Received: (at 65352) by debbugs.gnu.org; 5 Sep 2023 20:56:23 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Sep 05 16:56:23 2023
Received: from localhost ([127.0.0.1]:59604 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qdd5z-0001CJ-5E
for submit <at> debbugs.gnu.org; Tue, 05 Sep 2023 16:56:23 -0400
Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]:38169)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <zimon.toutoune@HIDDEN>) id 1qdd5x-0001Bs-Fe
for 65352 <at> debbugs.gnu.org; Tue, 05 Sep 2023 16:56:22 -0400
Received: by mail-wm1-x32a.google.com with SMTP id
5b1f17b1804b1-401ef656465so9623155e9.1
for <65352 <at> debbugs.gnu.org>; Tue, 05 Sep 2023 13:56:20 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20221208; t=1693947375; x=1694552175; darn=debbugs.gnu.org;
h=mime-version:message-id:date:references:in-reply-to:subject:cc:to
:from:from:to:cc:subject:date:message-id:reply-to;
bh=d+cinxnS59QJ+Yq59+Bx6K/2u0ycnJa/rhv27ZPS+W8=;
b=iCk9kuXzGHuFOMdc+BIJ94AOWZYvJpit821PCMMIKANN90/L1fpixhbC7RbsbES4tf
iibSXajd50F16iqJRWpkBB+BbMkOIN4LjbGsf+02qCImW6+xDEYSNLTOupYh0/8sQoZL
PgeP1Jx6k5DN8swTaPSx0C0Ec+MovkIfCbwG3S2fufmF7452vYmyWZQ5ViYxCL01NBnP
+fdq3Ozxhtp6UX5BzddTXQvzT2iF9HgqkR10/6iAlf7l+BWSjkrHUFcy8mRUkM119o2m
xdlXFcMLaPCUNdMCbXVRHunUghsgR+lhwldygbb+Q6Dn/ypWdZ9Xfm4iTaC2fpK4FBAL
TJog==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20221208; t=1693947375; x=1694552175;
h=mime-version:message-id:date:references:in-reply-to:subject:cc:to
:from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to;
bh=d+cinxnS59QJ+Yq59+Bx6K/2u0ycnJa/rhv27ZPS+W8=;
b=kPB1nO63UpcfBGf4drOxqiPXlLS2nQXLPTAX4Yrr9PgH0G1wOj5kA35pT7QNNupyf4
v7ABg1SdC49Cyb8kWHAwvv/jF+lQijleKgAfhlK8SILLGmIButUlo8qnRCOeIcyJZz7O
vVFqIUyY0TlSxh3IjggrYEqkuLYNZpzGGZD2KsJxKCRNdGXeCTbBkywnEJvSGlq7v07J
eSfzeHExzFElsHnIIx0EkoRkT4pBnYgUeqhf9Dp2RTR5gIYnbh5byTbwYc8CjuDlQCFi
XYtF1UcvlzcIxzXslYf7jCQkTq3GUs2HHaTcPwF89emnIDfQpeePQm5bQZ3HDS6RSxo0
mV2g==
X-Gm-Message-State: AOJu0YzvgFYkwpkPRnHvAheVResoIE3Eo6gH8EMBhnIP1fieIBUEe1aT
QDAe8bfz23D64IwiXe2zB9o=
X-Google-Smtp-Source: AGHT+IEqB+WGSTyWgRuB6hONhbnqvt7y7umhKBmC5N5iGjVgzDjUE7h4m3FpzyN74FVp8uKDVIjabQ==
X-Received: by 2002:adf:ded2:0:b0:319:7c84:c1bc with SMTP id
i18-20020adfded2000000b003197c84c1bcmr9405393wrn.4.1693947374702;
Tue, 05 Sep 2023 13:56:14 -0700 (PDT)
Received: from lili ([2a01:e0a:59b:9120:65d2:2476:f637:db1e])
by smtp.gmail.com with ESMTPSA id
m6-20020adfa3c6000000b0031f300a4c26sm13302514wrb.93.2023.09.05.13.56.14
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Tue, 05 Sep 2023 13:56:14 -0700 (PDT)
From: Simon Tournier <zimon.toutoune@HIDDEN>
To: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
Subject: Re: [bug#65352] Fix time-machine and network
In-Reply-To: <8734zsgy2k.fsf_-_@HIDDEN>
References: <87fs4h4vb9.fsf@HIDDEN>
<c5156f9a756c2a6a304dc789c00abf533c787fd8.1692281315.git.zimon.toutoune@HIDDEN>
<87wmx6qq5n.fsf_-_@HIDDEN> <87edjep3xq.fsf@HIDDEN>
<8734zsgy2k.fsf_-_@HIDDEN>
Date: Tue, 05 Sep 2023 22:48:54 +0200
Message-ID: <86a5u0qrbd.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 65352
Cc: 65352 <at> debbugs.gnu.org, Ludovic =?utf-8?Q?Court=C3=A8s?= <ludo@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
Hi Maxim,
On Tue, 05 Sep 2023 at 16:33, Maxim Cournoyer <maxim.cournoyer@HIDDEN> wrote:
>> - obj))))))
>> + obj)))
>> + (_ #f))))
>
> This doesn't look right to me; the contract of resolve-reference is to
> accept a REF, which is well defined. It's not supposed fall into cracks
> and return #f. The problem lies elsewhere.
Yes, the problem lies elsewhere! By the code you introduced with
79ec651a286c71a3d4c72be33a1f80e76a560031. As explained here:
[bug#65352] Fix time-machine and network
Simon Tournier <zimon.toutoune@HIDDEN>
Mon, 04 Sep 2023 19:37:08 +0200
id:87wmx5on5n.fsf@HIDDEN
https://issues.guix.gnu.org//65352
https://issues.guix.gnu.org/msgid/87wmx5on5n.fsf@HIDDEN
https://yhetil.org/guix/87wmx5on5n.fsf@HIDDEN
Because of this code, you are breaking the contract and passing '() as
REF. Hence my patch.
Cheers,
simon
guix-patches@HIDDEN:bug#65352; Package guix-patches.
Full text available.
Received: (at 65352) by debbugs.gnu.org; 5 Sep 2023 20:39:44 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Sep 05 16:39:44 2023
Received: from localhost ([127.0.0.1]:59572 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qdcpr-0000gX-On
for submit <at> debbugs.gnu.org; Tue, 05 Sep 2023 16:39:44 -0400
Received: from mail-qv1-xf30.google.com ([2607:f8b0:4864:20::f30]:54427)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <maxim.cournoyer@HIDDEN>) id 1qdcpn-0000gF-7h
for 65352 <at> debbugs.gnu.org; Tue, 05 Sep 2023 16:39:42 -0400
Received: by mail-qv1-xf30.google.com with SMTP id
6a1803df08f44-64f5aeb81d1so17074336d6.0
for <65352 <at> debbugs.gnu.org>; Tue, 05 Sep 2023 13:39:38 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20221208; t=1693946373; x=1694551173; darn=debbugs.gnu.org;
h=content-transfer-encoding:mime-version:user-agent:message-id
:in-reply-to:date:references:subject:cc:to:from:from:to:cc:subject
:date:message-id:reply-to;
bh=56HY9M/sB2WjMVldfikly6ZoaSD5s2m/3OS3sz/tsPY=;
b=st8m8XOZGml09yFzxELs0Z+mTJAunDNapVL0tC4D68erXwIkF7H86cUmJHeS2pp6gu
zJiPJZLTOzGYAhHcwziz+kWx8GFed8H9G21ty0P8Tjm3XsoDIgVySHRY5tp9o+GBY78Y
aFAlIvyKsvw5O/0xAUhnFodSDIcxy0NZiBWq3XRIkPzh2i8DP39cbiFfWW66BBqYL2vc
GoYUhSQzQxDEarMFwZ7wV3qCedHd1R6AIbthUk9xk5IToNt+hKO7GAE8+z2O1LdjA7A3
sNctv5pVu/0TRVgaymC86q6MimMvHM1dFmur6/nRGXwI+GNxEMu9kS+dBi/klaYNrZLc
2xPg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20221208; t=1693946373; x=1694551173;
h=content-transfer-encoding:mime-version:user-agent:message-id
:in-reply-to:date:references:subject:cc:to:from:x-gm-message-state
:from:to:cc:subject:date:message-id:reply-to;
bh=56HY9M/sB2WjMVldfikly6ZoaSD5s2m/3OS3sz/tsPY=;
b=Ssafz5XVmYqO26dPRAsPA314F9OOSP+TZFSinG5lVjAteV7O/zs5/1bzcAvx8UR5Eh
njgiI5ILuHTaByCT8M1z46Trj7DLWpdUf4O6AYvju04C/s/rv9SYFdXUCRvSBuO6ZYTL
KP6R7YRTmdospYvcnpFif/J1anoXbbmGEOqASJSF+hy1A40YCegkIzM5IcgwRKcj8Rzv
l50hKxKmOQxgL2MozdnGPM9GZTcUUfpre1JxuBBuUyMc3rQ4garYm2oe1Av178e4nLzF
rLHV0F684vsPznNnq8yFujcCaUjUaprtGmI0S/IweuHxQVB+2gW6CMp/slFZxJamdC22
v4ig==
X-Gm-Message-State: AOJu0Yz1EwgZ0LTc96DJ3dRZly+6hCnAFyL7Q16sAYRVkFH+EoxTuNep
Vig7W+qFgpcE5MOIYisotVs77IGkvqq+hA==
X-Google-Smtp-Source: AGHT+IFSSjUK/SB4hM5bwufVz1a8ZieadOpdNygpTEVBhX0E3gvvX6kdDxWlNFxl2yNNeQrknnsobg==
X-Received: by 2002:a0c:f182:0:b0:651:6bcc:7781 with SMTP id
m2-20020a0cf182000000b006516bcc7781mr12891016qvl.64.1693946372748;
Tue, 05 Sep 2023 13:39:32 -0700 (PDT)
Received: from hurd (dsl-153-125.b2b2c.ca. [66.158.153.125])
by smtp.gmail.com with ESMTPSA id
j9-20020a0ce009000000b0064f72988fecsm4776144qvk.127.2023.09.05.13.39.30
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Tue, 05 Sep 2023 13:39:31 -0700 (PDT)
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
To: Ludovic =?utf-8?Q?Court=C3=A8s?= <ludo@HIDDEN>
Subject: Re: bug#65352: Fix time-machine and network
References: <87fs4h4vb9.fsf@HIDDEN>
<c5156f9a756c2a6a304dc789c00abf533c787fd8.1692281315.git.zimon.toutoune@HIDDEN>
<87o7iiqo6d.fsf_-_@HIDDEN>
Date: Tue, 05 Sep 2023 16:39:28 -0400
In-Reply-To: <87o7iiqo6d.fsf_-_@HIDDEN> ("Ludovic =?utf-8?Q?Court=C3=A8s?=
=?utf-8?Q?=22's?= message of "Mon, 04 Sep 2023 11:32:10 +0200")
Message-ID: <87y1hkfj7j.fsf_-_@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 65352
Cc: 65352 <at> debbugs.gnu.org, Simon Tournier <zimon.toutoune@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
Hi,
Ludovic Court=C3=A8s <ludo@HIDDEN> writes:
> Hi again,
>
> Simon Tournier <zimon.toutoune@HIDDEN> skribis:
>
>> * guix/git/scm (reference-available?): Rely of the procedure resolve-ref=
erence
>> to determine if the reference belongs to the local Git checkout.
>> ---
>> guix/git.scm | 13 ++-----------
>> 1 file changed, 2 insertions(+), 11 deletions(-)
>>
>> 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))))
>>=20=20
>> (define (clone-from-swh url tag-or-commit output)
>> "Attempt to clone TAG-OR-COMMIT (a string), which originates from URL=
, using
>>
>> base-commit: 1b2d43fe016848ea2ec16ff18cbc14340944fc4e
>
> In fact, now I recall why that procedure was written that way: it=E2=80=
=99s
> meant to say whether a given commit (and only a commit) is already in
> the checkout, meaning we don=E2=80=99t need to pull. By definition, it=
=E2=80=99s an
> answer that can only be given for a specific commit; we cannot tell
> whether =E2=80=9Cmaster=E2=80=9D or =E2=80=9CHEAD=E2=80=9D is available, =
that wouldn=E2=80=99t make sense.
>
> Thus, I think we need to revert
> a789dd58656d5f7f1b8edf790d77753fc71670af, and probably add a comment
> explaining why it=E2=80=99s written this way.
>
> Thoughts?
I've reviewed this thread and the code, and I agree. This is a special
case. I've added a comment so we aren't tempted to use
'resolve-reference' there again.
Will install shortly.
--=20
Thanks,
Maxim
guix-patches@HIDDEN:bug#65352; Package guix-patches.
Full text available.Received: (at 65352) by debbugs.gnu.org; 5 Sep 2023 20:33:21 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Tue Sep 05 16:33:21 2023 Received: from localhost ([127.0.0.1]:59568 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1qdcjg-0000XW-Rh for submit <at> debbugs.gnu.org; Tue, 05 Sep 2023 16:33:21 -0400 Received: from mail-qv1-xf35.google.com ([2607:f8b0:4864:20::f35]:59596) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <maxim.cournoyer@HIDDEN>) id 1qdcjb-0000XF-PX for 65352 <at> debbugs.gnu.org; Tue, 05 Sep 2023 16:33:19 -0400 Received: by mail-qv1-xf35.google.com with SMTP id 6a1803df08f44-64bb576b8abso14425266d6.2 for <65352 <at> debbugs.gnu.org>; Tue, 05 Sep 2023 13:33:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693945989; x=1694550789; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:user-agent:message-id :in-reply-to:date:references:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=Ld+HAw1znWDtLkc+DeuUXCs7zMhU54Y+TgXK0QgN7ts=; b=KquDPniW6pCzu15IcgrT02TZ/W34gcIO/mGUakfGu6ZAHsNQ1KZvseqJYawX2TkePq PddDQ3qRLA/8EPk0135eM+Nl6mGXbY1khd6YzligJCwYntYs2Fd78bz5xKq+CNSASr9q GlrIin431IuANUU3HyIf8bLAoPBPOHxI6yiE2cMrlSsOLAAgDHlaVdYlnruGqds0+QpO iVUgvN+zjx5hxP0sojp2zvUsEpUqvQSJV4v9MB3GESdBMruPaZV+24woMdJt1fY5cehA VLwksoaWVYmQI5x5FGxJJ3WOJhVd4NUPFTQGzGvQbi/SHQcQv2O7rtKNDRZoWZRBjXDV DXaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693945989; x=1694550789; h=content-transfer-encoding:mime-version:user-agent:message-id :in-reply-to:date:references:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=Ld+HAw1znWDtLkc+DeuUXCs7zMhU54Y+TgXK0QgN7ts=; b=dPwsk9DdCy2hDtA02wbxic2r/fcoJuFyn8EcJqgFGavhi1AwkMpxrVfeSHo2AVHO5F tgHYwO7+q4mYu/LOF0S5RwRfVNhTFKSMgy61Yy6vdwS1csWHmAubvq0oJyKQ5YeBhgjA 2BFrsUOgZJC+X53S25XY2L4srcCzj+m48xsi6JSDRtYVu5m2FQcnU11uJD/7kr2Gar8u dZBosCiR1udbmfwgClgU5/I7k/eNdVQjm82yzB3YjOFO+E/tbbbyRoP2g50HeCYCf6r0 js7vbC2C4GM8FG65dlWtYHC5qMRL+FCrxHSIB27WjM4J2hSy74vVvxjXHRkB32fSj+uz geLw== X-Gm-Message-State: AOJu0YxDMvRWzgLyPMj6ES5oa5nQlnC2pfAYX2aSddYlF3oJ4y0QXHha 5k4/1xxnmA0RZrskhLHiJcrv1EFWmYCipw== X-Google-Smtp-Source: AGHT+IE+NkJlYBttJdklL95o1oTLh8NnlzAAuuldxuWRiNGQWjTvzBQORoMmvRAxn4R1v632DNAMNA== X-Received: by 2002:a0c:e483:0:b0:651:69d9:237c with SMTP id n3-20020a0ce483000000b0065169d9237cmr12521908qvl.30.1693945989220; Tue, 05 Sep 2023 13:33:09 -0700 (PDT) Received: from hurd (dsl-153-125.b2b2c.ca. [66.158.153.125]) by smtp.gmail.com with ESMTPSA id b12-20020a0ccd0c000000b0064f59ca89basm4779865qvm.45.2023.09.05.13.33.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Sep 2023 13:33:08 -0700 (PDT) From: Maxim Cournoyer <maxim.cournoyer@HIDDEN> To: Simon Tournier <zimon.toutoune@HIDDEN> Subject: Re: bug#65352: Fix time-machine and network References: <87fs4h4vb9.fsf@HIDDEN> <c5156f9a756c2a6a304dc789c00abf533c787fd8.1692281315.git.zimon.toutoune@HIDDEN> <87wmx6qq5n.fsf_-_@HIDDEN> <87edjep3xq.fsf@HIDDEN> Date: Tue, 05 Sep 2023 16:33:07 -0400 In-Reply-To: <87edjep3xq.fsf@HIDDEN> (Simon Tournier's message of "Mon, 04 Sep 2023 13:34:41 +0200") Message-ID: <8734zsgy2k.fsf_-_@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65352 Cc: 65352 <at> debbugs.gnu.org, Ludovic =?utf-8?Q?Court=C3=A8s?= <ludo@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) Hi Simon, Simon Tournier <zimon.toutoune@HIDDEN> writes: [...] >>From e1fdd6748ebb1088fb805d77cfb176758bab5618 Mon Sep 17 00:00:00 2001 > Message-Id: <e1fdd6748ebb1088fb805d77cfb176758bab5618.1693826861.git.zimo= n.toutoune@HIDDEN> > From: Simon Tournier <zimon.toutoune@HIDDEN> > Date: Mon, 4 Sep 2023 13:23:59 +0200 > Subject: [PATCH] guix: git: Add default case when resolving reference. > MIME-Version: 1.0 > Content-Type: text/plain; charset=3DUTF-8 > Content-Transfer-Encoding: 8bit > > Reported by Ludovic Court=C3=A8s <ludo@HIDDEN>. > > * guix/git.scm (resolve-reference): Return #false when the reference is n= ot > resolved. > --- > guix/git.scm | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/guix/git.scm b/guix/git.scm > index ebe2600209d4..d4076d4a0a0c 100644 > --- a/guix/git.scm > +++ b/guix/git.scm > @@ -282,7 +282,8 @@ (define (resolve-reference repository ref) > (if (=3D OBJ-TAG (object-type obj)) > (object-lookup repository > (tag-target-id (tag-lookup repository oid))) > - obj)))))) > + obj))) > + (_ #f)))) This doesn't look right to me; the contract of resolve-reference is to accept a REF, which is well defined. It's not supposed fall into cracks and return #f. The problem lies elsewhere. --=20 Thanks, Maxim
guix-patches@HIDDEN:bug#65352; Package guix-patches.
Full text available.Debbugs Internal Request <help-debbugs@HIDDEN>
to internal_control <at> debbugs.gnu.org.
Full text available.
Received: (at 65352-done) by debbugs.gnu.org; 5 Sep 2023 13:44:17 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Sep 05 09:44:16 2023
Received: from localhost ([127.0.0.1]:55203 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qdWLo-0006Ow-KL
for submit <at> debbugs.gnu.org; Tue, 05 Sep 2023 09:44:16 -0400
Received: from mail-lf1-x12a.google.com ([2a00:1450:4864:20::12a]:39190)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <zimon.toutoune@HIDDEN>) id 1qdWLl-0006Of-8g
for 65352-done <at> debbugs.gnu.org; Tue, 05 Sep 2023 09:44:14 -0400
Received: by mail-lf1-x12a.google.com with SMTP id
2adb3069b0e04-500c5660771so689338e87.1
for <65352-done <at> debbugs.gnu.org>; Tue, 05 Sep 2023 06:44:12 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20221208; t=1693921446; x=1694526246; darn=debbugs.gnu.org;
h=content-transfer-encoding:cc:to:subject:message-id:date:from
:in-reply-to:references:mime-version:from:to:cc:subject:date
:message-id:reply-to;
bh=3Etvxer9c5fUiUbnpH/P2MO4FbIlovXyHSBdPgyGBco=;
b=DxkgqRhWvwHLXVxzo9Ym7n71kuo2k4jThF7nNl/XOX28QHQaoFLxzfHmsILmrBD1Nw
g/BrdYrG6vAZe4DmpvWEPGBswtu2sE074oOqGzKKSlaqmlauhFu0ci86ZrmdpQOTg+DS
0O1h+/qgqRMZtCIrl+ykPrut1rrX6tzqM6ki+xhQhqxLgaus3n1zU+sN2vRkJ+orUuKr
T7b/KmExjn3Gilw5+TzN0txK6V7p6wK07rjA2Szf1hRMSc9mRksVzoLoQ85WEjneYTM8
c6AaCa6eTRkVTwC7zHKlM5Ha9ZBUQ15o6Dif7Vc/FdvKZVaCg9c/TskS45K4ZmyTR074
IBTw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20221208; t=1693921446; x=1694526246;
h=content-transfer-encoding:cc:to:subject:message-id:date:from
:in-reply-to:references:mime-version:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=3Etvxer9c5fUiUbnpH/P2MO4FbIlovXyHSBdPgyGBco=;
b=ZdbTZGOFWk9tiHBi3UNAOkW9aaSvBoDzUshsS2XDcFDUo6iJ+1NfBDYZLYwNvktT2n
Ko3PRMbM96iF2V08FlYVwcsfsSZLGAocrJU9mIZEwsMZIeFKAdTsVaaQTvuzrH6yEVnT
K0lOePQrNyjF81vb6o02M2FwITGoZ4DrF0Bh+POBwdUebXig+F4JoxpZ78aE6gaRCUA4
hIutxFOc8d+R/2L9NRIHXfqvpazfy2S6n5SL3QDF23ppzGaBSKDSZa/ysrD1986klR0H
2p4TUReUUdzWY8Ca0+HKg57oELi69ZCUlO65/PruzC+tMLKVmjVuVaB5BLjPlLS94D7V
fPiA==
X-Gm-Message-State: AOJu0Yy9RJwhTrOfUm2NMmc+5WymRcjIKoEUdZkMDuOCwn5VppsHxW5Q
cxwx/IbZwzqvfEAfeMnnYJU8oBZNx+8glQ+lyew=
X-Google-Smtp-Source: AGHT+IEYlaseEgHW9twPVtGQfSQAJsCv8GbIc3MzfaReiNgfpLAvAHTZ0wAPTkIpP5BkM6Ev7uiHjBzq+kuwbpfyNnQ=
X-Received: by 2002:ac2:43c9:0:b0:4fb:9477:f713 with SMTP id
u9-20020ac243c9000000b004fb9477f713mr7132459lfl.6.1693921446321; Tue, 05 Sep
2023 06:44:06 -0700 (PDT)
MIME-Version: 1.0
References: <87fs4h4vb9.fsf@HIDDEN>
<c5156f9a756c2a6a304dc789c00abf533c787fd8.1692281315.git.zimon.toutoune@HIDDEN>
<87fs3slplq.fsf_-_@HIDDEN>
In-Reply-To: <87fs3slplq.fsf_-_@HIDDEN>
From: Simon Tournier <zimon.toutoune@HIDDEN>
Date: Tue, 5 Sep 2023 15:43:54 +0200
Message-ID: <CAJ3okZ3xkUMZnGvUcM8WSxDu0dkOZ0Cfp+qtauYJc7wTsR2xyQ@HIDDEN>
Subject: Re: bug#65352: Fix time-machine and network
To: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 65352-done
Cc: 65352-done <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
Hi Maxim,
On Tue, 5 Sept 2023 at 15:24, Maxim Cournoyer <maxim.cournoyer@HIDDEN> w=
rote:
> This was applied some time ago as
> a789dd58656d5f7f1b8edf790d77753fc71670af.
Thanks for having applied it.
> Closing.
However, I do not think it should be closed. Maybe you have missed:
[bug#65352] Fix time-machine and network
Ludovic Court=C3=A8s <ludo@HIDDEN>
Mon, 04 Sep 2023 10:49:24 +0200
id:87wmx6qq5n.fsf_-_@HIDDEN
https://issues.guix.gnu.org//65352
https://issues.guix.gnu.org/msgid/87wmx6qq5n.fsf_-_@HIDDEN
https://yhetil.org/guix/87wmx6qq5n.fsf_-_@HIDDEN
And this thread contains some fixes. Well, from my point of view, the
discussion is still pending...
Cheers,
simon
guix-patches@HIDDEN:bug#65352; Package guix-patches.
Full text available.
Received: (at 65352-done) by debbugs.gnu.org; 5 Sep 2023 13:25:00 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Sep 05 09:24:59 2023
Received: from localhost ([127.0.0.1]:55117 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qdW39-0003IL-La
for submit <at> debbugs.gnu.org; Tue, 05 Sep 2023 09:24:59 -0400
Received: from mail-qt1-x831.google.com ([2607:f8b0:4864:20::831]:51226)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <maxim.cournoyer@HIDDEN>) id 1qdW37-0003I4-LV
for 65352-done <at> debbugs.gnu.org; Tue, 05 Sep 2023 09:24:58 -0400
Received: by mail-qt1-x831.google.com with SMTP id
d75a77b69052e-41243a67b62so17034671cf.2
for <65352-done <at> debbugs.gnu.org>; Tue, 05 Sep 2023 06:24:57 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20221208; t=1693920291; x=1694525091; darn=debbugs.gnu.org;
h=mime-version:user-agent:message-id:in-reply-to:date:references
:subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to;
bh=xTzCsrIgy1+WD94jNViRkxTKQcHUaTOkBqJGqFD35ss=;
b=fIFdx5f+zVAFgiYnqxxW/fUXKy2Imo9ycV9iEVtWtc8c5tt0uTx6IzNeUWvZwz9/t9
vOXOZ2Fns6ppBMyeQD6KzpR+SgQuw+ND0u7bN+aheN1UnIBeBO7n2PakejApjN5o+VV+
zOdmqHdoc7Z7ANh82ZqSGnqmRGPlNyYQiJkKspmBFD/YVXEI9NUZMwpMNg7LunvL3uKS
yP7NzP+elpVeCWiku+Vg5iev7+EjOom/dNf+FPdo4nyc0gzW/WH6majbgUXyXZ3BO/DJ
ZB6mi6IcYDKEaWZxTRv1HTTj7JNXjVy1C/nrgQSu983V40wGZU0tSZWQzqQxRfYwGXTH
jdhw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20221208; t=1693920291; x=1694525091;
h=mime-version:user-agent:message-id:in-reply-to:date:references
:subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date
:message-id:reply-to;
bh=xTzCsrIgy1+WD94jNViRkxTKQcHUaTOkBqJGqFD35ss=;
b=MuQvaxRJjSd1eHYGSt6z7csVJzpz3XMVXzZ/Syr1GXcEs2UV40IDhck0beBZ96i6KQ
f59PIjQWmYiRXZxEBv7nfG8DDrlkQ56DBg77otmTQ11AHIcq5Y7LnznYzxKJ1vTqyhLp
Q3QATrjlHYTWwvtFj+1Uq37nfutAMcnfyaI/LtCibN1UOweoBC1LbGvTAmISn+KfPIjY
IDEAo1tWHOChIhQcgta3Fe8qIEyqGj67EpDyb8iAmh6vayQCErRQqaX5b7+8nJ4As1AC
VEi4TJlt5TVbZqOX6/7uf3Xnq6niusJzp+hKJadTVkoVP0r2kfAJakH+nJNPDfc0aEMG
hfCw==
X-Gm-Message-State: AOJu0YwibN0Jo9v6HJQnFznEyFdi+aOOP2Uam4/0ZuapjAreM8JN0ZNT
USdQOnI+gQQlvWxQiV9Q9drIkDfTR6TcNw==
X-Google-Smtp-Source: AGHT+IHb7Ytbg98AXyR+pFkPrwg/zez2Kttg67Jsu4XMKpdOBvq1nsTIMj755t9r9R9AE9SL239BDQ==
X-Received: by 2002:a0c:f508:0:b0:651:5bf4:22d with SMTP id
j8-20020a0cf508000000b006515bf4022dmr11248889qvm.32.1693920291330;
Tue, 05 Sep 2023 06:24:51 -0700 (PDT)
Received: from hurd (dsl-153-125.b2b2c.ca. [66.158.153.125])
by smtp.gmail.com with ESMTPSA id
r18-20020a0cb292000000b0064f5daff23fsm4472678qve.15.2023.09.05.06.24.50
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Tue, 05 Sep 2023 06:24:50 -0700 (PDT)
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
To: Simon Tournier <zimon.toutoune@HIDDEN>
Subject: Re: bug#65352: Fix time-machine and network
References: <87fs4h4vb9.fsf@HIDDEN>
<c5156f9a756c2a6a304dc789c00abf533c787fd8.1692281315.git.zimon.toutoune@HIDDEN>
Date: Tue, 05 Sep 2023 09:24:49 -0400
In-Reply-To: <c5156f9a756c2a6a304dc789c00abf533c787fd8.1692281315.git.zimon.toutoune@HIDDEN>
(Simon Tournier's message of "Thu, 17 Aug 2023 16:09:16 +0200")
Message-ID: <87fs3slplq.fsf_-_@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 65352-done
Cc: 65352-done <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
Hi,
Simon Tournier <zimon.toutoune@HIDDEN> writes:
> * 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(-)
>
> 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))))
This was applied some time ago as
a789dd58656d5f7f1b8edf790d77753fc71670af.
Closing.
--
Thanks,
Maxim
Simon Tournier <zimon.toutoune@HIDDEN>:Maxim Cournoyer <maxim.cournoyer@HIDDEN>:
Received: (at 65352) by debbugs.gnu.org; 4 Sep 2023 17:37:36 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Mon Sep 04 13:37:35 2023
Received: from localhost ([127.0.0.1]:52502 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qdDW3-0000ih-Ez
for submit <at> debbugs.gnu.org; Mon, 04 Sep 2023 13:37:35 -0400
Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:41076)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <zimon.toutoune@HIDDEN>) id 1qdDVq-0000ht-6c
for 65352 <at> debbugs.gnu.org; Mon, 04 Sep 2023 13:37:22 -0400
Received: by mail-wr1-x432.google.com with SMTP id
ffacd0b85a97d-31f4629aaaaso123580f8f.0
for <65352 <at> debbugs.gnu.org>; Mon, 04 Sep 2023 10:37:22 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20221208; t=1693849036; x=1694453836; darn=debbugs.gnu.org;
h=content-transfer-encoding:mime-version:message-id:date:references
:in-reply-to:subject:cc:to:from:from:to:cc:subject:date:message-id
:reply-to; bh=lUXJq4UUNufQ2q54G9zlvGFfklQ2x8XWGdKR4dtYc3I=;
b=SB2XSRL/a7fk3I/8gjnaWOrS45iSlbD/hqkhc0n64dG16mXqlanjtqtfFTJSq0AbhF
V+QttzSUu0sbpKnWXiRwHmJwA7W5gPvN30sJ89BNi9S2y/xDQlZvs1YEUpw85q22U1YB
XP58jV+n6LzujGZ9Buo7HjPyX8HLdr3MzjdGSTsdXxrbDtrr1t5KBs3xhdRfVrXuYKs1
NRcFsf92LW+CHC9dk0BcYy3F2oFot7vP75Lp/PjmFz74knkQXT7TJb1+kjsWugL7o84v
ysaC43hj8Ip4CO6IdaDJ0M5I686WV/DxkipQaC7xlCD5VfHap50sRVKxfFt4sIsFh2dc
bMwA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20221208; t=1693849036; x=1694453836;
h=content-transfer-encoding:mime-version:message-id:date:references
:in-reply-to:subject:cc:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=lUXJq4UUNufQ2q54G9zlvGFfklQ2x8XWGdKR4dtYc3I=;
b=IP8L17oZtvCr5VemluCN24+9qqzsKP7ttBekszPJnQaCnDHgXpMyXJFcVobRCYBRZi
dCc5iOVZ5UiTLSP7Li5W13WvBdikocrrccuEJ688AIzD8WF+odThWVAUEdmGZp/VTopg
Qb1k01eyoKU4YrVd1MlX580HjeC66vjSTs3BlUU4MFeimPOq0lBD+Q7IQNVbaqDDHh++
vjhz9XZ/1Xv1UjP0XT8Juzn1QkjtcTIWDm1lGI5GhXCJlsP4Lkdm4kCezzgAR97nfxlP
LWUA/jri+bjotSJAbTXIvq+x60R2pmjGQplaUQ29PcEkaTpiiPC5wj7nhQ56EhqReWgE
jkKQ==
X-Gm-Message-State: AOJu0YwrbVLar+tVrNSeaqLC5V0/Yrupoq42r0TQZ2Gsd7Iim7xxuVBE
l+hY0enMn1xP+TR1/LaPHjhH0xs2/Ac=
X-Google-Smtp-Source: AGHT+IGVfrS/fJhk9w5qVM+XCRZkwjz395wt7oCP4AfU+HH/9ROYMhEzWXhGBHR1PAagf7r9dD0/rg==
X-Received: by 2002:a5d:62c5:0:b0:31a:e772:ddf9 with SMTP id
o5-20020a5d62c5000000b0031ae772ddf9mr7103014wrv.4.1693849036396;
Mon, 04 Sep 2023 10:37:16 -0700 (PDT)
Received: from pfiuh07 ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id
b17-20020a5d6351000000b0030fd03e3d25sm15291196wrw.75.2023.09.04.10.37.15
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Mon, 04 Sep 2023 10:37:15 -0700 (PDT)
From: Simon Tournier <zimon.toutoune@HIDDEN>
To: Ludovic =?utf-8?Q?Court=C3=A8s?= <ludo@HIDDEN>
Subject: Re: [bug#65352] Fix time-machine and network
In-Reply-To: <87o7iiqo6d.fsf_-_@HIDDEN>
References: <87fs4h4vb9.fsf@HIDDEN>
<c5156f9a756c2a6a304dc789c00abf533c787fd8.1692281315.git.zimon.toutoune@HIDDEN>
<87o7iiqo6d.fsf_-_@HIDDEN>
Date: Mon, 04 Sep 2023 19:37:08 +0200
Message-ID: <87wmx5on5n.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 65352
Cc: 65352 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
Hi,
On Mon, 04 Sep 2023 at 11:32, Ludovic Court=C3=A8s <ludo@HIDDEN> wrote:
> In fact, now I recall why that procedure was written that way: it=E2=80=
=99s
> meant to say whether a given commit (and only a commit) is already in
> the checkout, meaning we don=E2=80=99t need to pull. By definition, it=
=E2=80=99s an
> answer that can only be given for a specific commit; we cannot tell
> whether =E2=80=9Cmaster=E2=80=9D or =E2=80=9CHEAD=E2=80=9D is available, =
that wouldn=E2=80=99t make sense.
Yeah, that=E2=80=99s the job of =E2=80=99reference-available?=E2=80=99 to s=
ay if a given
reference is or not in the repository, IMHO.
The patch I proposed earlier fixes the issue you reported, I guess.
When debugging, I have noticed that this update-cached-checkout is
called many times. For instance,
79ec651a286c71a3d4c72be33a1f80e76a560031 introduced a call.
Investigating, I notice that this new procedure is incorrect:
--8<---------------cut here---------------start------------->8---
(define (validate-guix-channel channels)
"Finds the Guix channel among CHANNELS, and validates that REF as
captured from the closure, a git reference specification such as a commit h=
ash
or tag associated to CHANNEL, is valid and new enough to satisfy the 'guix
time-machine' requirements. A `formatted-message' condition is raised
otherwise."
(let* ((guix-channel (find guix-channel? channels))
(checkout commit relation (update-cached-checkout
(channel-url guix-channel)
#:ref (or ref '())
#:starting-commit
%oldest-possible-commit)))
--8<---------------cut here---------------end--------------->8---
Here, the symbol =E2=80=99ref=E2=80=99 is bound by:
(ref (assoc-ref opts 'ref))
which comes from:
(option '("commit") #t #f
(lambda (opt name arg result)
(alist-cons 'ref `(tag-or-commit . ,arg) result)))
(option '("branch") #t #f
(lambda (opt name arg result)
(alist-cons 'ref `(branch . ,arg) result)))
Therefore, it means that when none of the options --commit=3D or --branch=3D
is provided by the user at the CLI, this =E2=80=99ref=E2=80=99 is bounded t=
o #false.
Therefore, it can lead to unexpected behaviour when providing a
channels.scm file.
Well, instead, the correct something like:
(let* ((guix-channel (find guix-channel? channels))
(reference (or ref
(match (channel-commit guix-channel)
(#f `(branch . ,(channel-branch guix-chann=
el)))
(commit `(tag-or-commit . ,commit)))))
(checkout commit relation (update-cached-checkout
(channel-url guix-channel)
#:ref reference
#:starting-commit
%oldest-possible-commit)))
which works using my tests (with or without network).
The remaining issue is the order when displaying messages. This
=E2=80=99validate-guix-channel=E2=80=99 happens before =E2=80=9CUpdating ch=
annel 'guix'=E2=80=9D
therefore the progress bar appears before etc.
I have not investigated how to improve cached-channel-instance. Let me
know if the current tiny fix tweaking resolve-interface is enough for
now waiting some rework of validate-guix-channel. :-)
Cheers,
simon
guix-patches@HIDDEN:bug#65352; Package guix-patches.
Full text available.
Received: (at 65352) by debbugs.gnu.org; 4 Sep 2023 11:34:54 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Mon Sep 04 07:34:54 2023
Received: from localhost ([127.0.0.1]:48951 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qd7r3-0001bC-Lq
for submit <at> debbugs.gnu.org; Mon, 04 Sep 2023 07:34:53 -0400
Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:39227)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <zimon.toutoune@HIDDEN>) id 1qd7r1-0001al-BC
for 65352 <at> debbugs.gnu.org; Mon, 04 Sep 2023 07:34:52 -0400
Received: by mail-wr1-x435.google.com with SMTP id
ffacd0b85a97d-3175e1bb38cso111210f8f.1
for <65352 <at> debbugs.gnu.org>; Mon, 04 Sep 2023 04:34:51 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20221208; t=1693827285; x=1694432085; darn=debbugs.gnu.org;
h=mime-version:message-id:date:references:in-reply-to:subject:cc:to
:from:from:to:cc:subject:date:message-id:reply-to;
bh=Rcpl3fY1LXY/pf7TP+7F6W9c9x5Gm0gKEtcqhlKImxI=;
b=Hk+M/RV0J7T2oObciaSn02WcsWU5klcHsS9yu+gpZ8LClLN8opJF3sLngeikhxNdUN
s0C/hAaR6upZe+DpwY8FuW81IUc15cgr6BAbuI/f2RrL8YJm50avgO5DbNUBThaniAJp
wWaSLAguAi59bBbaeWuicHODRik9mvrYbpE0hCEyWwrM04l/bGoC66tHBJqiB/1nDxAW
96/ofLiotrvAx4yX7rdNHZA4mHfWjEMV7hApn9fO2vxakISWNyJr21PjFNUHSfhXCUyy
Vz7q0I2Yl7ryu8iQjre8OjWc9/jBgN0hAHBCI+1DY/rqp5+iz8sYgP4YB5ZNLHenghBS
tX7A==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20221208; t=1693827285; x=1694432085;
h=mime-version:message-id:date:references:in-reply-to:subject:cc:to
:from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to;
bh=Rcpl3fY1LXY/pf7TP+7F6W9c9x5Gm0gKEtcqhlKImxI=;
b=KdIghqDO1XpPdiVg3NLZ6oGFStFyI2Ru7M6Fmgiea9C2B0QYwsjLaxcU8rSKED4rL8
bkddb50OO4MwsZLSEO+oYogz555PkD2SdpU8fBkhK39LyFYdlTAeIbP2+6rIsVAHIyc/
UIOG0VbAD8yccA7zxk/xCONOMQL1Mn9IOz14FRB2NbMx0xogO5wPEyAd82RNETqyIfUg
YQEZuoWePCB/GTdCZbmWsXktEma+TwVt+Haw9y9R8viIvRyFRHUE32qsxw20/LKJnrTy
dBj80rBQVVjZTfVQ9fKGpmEZQ4gQK2wGxvVn0HUE01WghppHGE2xROjR40W8+YCaR83l
nLuQ==
X-Gm-Message-State: AOJu0YyiEWVdk4f5R0+B1E8A8iZNJkGiWEYRkjEOK2WcjhhxlmBA6Hr4
8U636afM+fSg2y6vuuG8eVRwHnmrv1o=
X-Google-Smtp-Source: AGHT+IF01qc4RKJq7F/FW5P6aVKYGGRwDHQxzYKit0WgW1Smas5vVQNIEgrBmdzkBNx0R6fLQQwR3A==
X-Received: by 2002:adf:e5c7:0:b0:31d:3669:1c48 with SMTP id
a7-20020adfe5c7000000b0031d36691c48mr6440343wrn.7.1693827285302;
Mon, 04 Sep 2023 04:34:45 -0700 (PDT)
Received: from pfiuh07 ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id
h8-20020adff4c8000000b0031c3ee933b5sm14132379wrp.108.2023.09.04.04.34.44
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Mon, 04 Sep 2023 04:34:44 -0700 (PDT)
From: Simon Tournier <zimon.toutoune@HIDDEN>
To: Ludovic =?utf-8?Q?Court=C3=A8s?= <ludo@HIDDEN>
Subject: Re: [bug#65352] Fix time-machine and network
In-Reply-To: <87wmx6qq5n.fsf_-_@HIDDEN>
References: <87fs4h4vb9.fsf@HIDDEN>
<c5156f9a756c2a6a304dc789c00abf533c787fd8.1692281315.git.zimon.toutoune@HIDDEN>
<87wmx6qq5n.fsf_-_@HIDDEN>
Date: Mon, 04 Sep 2023 13:34:41 +0200
Message-ID: <87edjep3xq.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="=-=-="
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 65352
Cc: 65352 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
--=-=-=
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Hi Ludo,
On Mon, 04 Sep 2023 at 10:49, Ludovic Court=C3=A8s <ludo@HIDDEN> wrote:
> Houston, we have a problem:
This is Houston. Say again, please. :-)
> diff --git a/guix/git.scm b/guix/git.scm
> index ebe2600209..5fa604f9a0 100644
> --- a/guix/git.scm
> +++ b/guix/git.scm
> + (()
> + (resolve-reference repository
> + '(symref . "refs/remotes/origin/HEAD"))))))
The fix is to simple return #false when the reference is not resolved.
Well, let me now if the attached patch fixes the issue.
Cheers,
simon
--=-=-=
Content-Type: text/x-diff; charset=utf-8
Content-Disposition: inline;
filename=0001-guix-git-Add-default-case-when-resolving-reference.patch
Content-Transfer-Encoding: quoted-printable
Content-Description: p.patch
From e1fdd6748ebb1088fb805d77cfb176758bab5618 Mon Sep 17 00:00:00 2001
Message-Id: <e1fdd6748ebb1088fb805d77cfb176758bab5618.1693826861.git.zimon.=
toutoune@HIDDEN>
From: Simon Tournier <zimon.toutoune@HIDDEN>
Date: Mon, 4 Sep 2023 13:23:59 +0200
Subject: [PATCH] guix: git: Add default case when resolving reference.
MIME-Version: 1.0
Content-Type: text/plain; charset=3DUTF-8
Content-Transfer-Encoding: 8bit
Reported by Ludovic Court=C3=A8s <ludo@HIDDEN>.
* guix/git.scm (resolve-reference): Return #false when the reference is not
resolved.
---
guix/git.scm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/guix/git.scm b/guix/git.scm
index ebe2600209d4..d4076d4a0a0c 100644
--- a/guix/git.scm
+++ b/guix/git.scm
@@ -282,7 +282,8 @@ (define (resolve-reference repository ref)
(if (=3D OBJ-TAG (object-type obj))
(object-lookup repository
(tag-target-id (tag-lookup repository oid)))
- obj))))))
+ obj)))
+ (_ #f))))
=20
(define (switch-to-ref repository ref)
"Switch to REPOSITORY's branch, commit or tag specified by REF. Return =
the
base-commit: bedcdf0fb5ac035f696790827679406c7146396c
--=20
2.38.1
--=-=-=--
guix-patches@HIDDEN:bug#65352; Package guix-patches.
Full text available.
Received: (at 65352) by debbugs.gnu.org; 4 Sep 2023 09:32:20 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Mon Sep 04 05:32:19 2023
Received: from localhost ([127.0.0.1]:48768 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qd5wR-0003yC-Ir
for submit <at> debbugs.gnu.org; Mon, 04 Sep 2023 05:32:19 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:59338)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <ludo@HIDDEN>) id 1qd5wQ-0003xs-A5
for 65352 <at> debbugs.gnu.org; Mon, 04 Sep 2023 05:32:19 -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 <ludo@HIDDEN>)
id 1qd5wK-0001B6-UZ; Mon, 04 Sep 2023 05:32:13 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To:
From; bh=HdzrdleY1+84oZ3jE7MYLwx5rgZLNuDy1XK9P26ds1E=; b=k3b7Jkk6mRYto8NaXxKE
uhU11u215EsRx/63SkrWxi88lPuUATz4y+4HNfI1B7tsTWMsO0eWEJruoUZ62PNrcVfIhp7i/toLh
OyIU4ej/odCmMknlh1H20yx/E8FC/0bb/Y8cxZOwVplKnUoLGYTnfw0AHbnW9379Y0iDLSYYfMeCQ
47VUjeKq9IyZuevcwkb0Nn3vqkbmxtIvmO2fIAfTCsaHkI0862U4dlogVONUuA/61iYXsqdUM4S/v
zm1Gbz9dlG+f55AGtwQPr9ddl054jR3k8kGYlfhzyuXgYvINnR5ycoaI6cNsmOFDnK41ABUau/sxr
5GfqyfTmPV3jFg==;
From: =?utf-8?Q?Ludovic_Court=C3=A8s?= <ludo@HIDDEN>
To: Simon Tournier <zimon.toutoune@HIDDEN>
Subject: Re: bug#65352: Fix time-machine and network
References: <87fs4h4vb9.fsf@HIDDEN>
<c5156f9a756c2a6a304dc789c00abf533c787fd8.1692281315.git.zimon.toutoune@HIDDEN>
Date: Mon, 04 Sep 2023 11:32:10 +0200
In-Reply-To: <c5156f9a756c2a6a304dc789c00abf533c787fd8.1692281315.git.zimon.toutoune@HIDDEN>
(Simon Tournier's message of "Thu, 17 Aug 2023 16:09:16 +0200")
Message-ID: <87o7iiqo6d.fsf_-_@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 65352
Cc: 65352 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
Hi again,
Simon Tournier <zimon.toutoune@HIDDEN> skribis:
> * guix/git/scm (reference-available?): Rely of the procedure resolve-refe=
rence
> to determine if the reference belongs to the local Git checkout.
> ---
> guix/git.scm | 13 ++-----------
> 1 file changed, 2 insertions(+), 11 deletions(-)
>
> 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))))
>=20=20
> (define (clone-from-swh url tag-or-commit output)
> "Attempt to clone TAG-OR-COMMIT (a string), which originates from URL,=
using
>
> base-commit: 1b2d43fe016848ea2ec16ff18cbc14340944fc4e
In fact, now I recall why that procedure was written that way: it=E2=80=99s
meant to say whether a given commit (and only a commit) is already in
the checkout, meaning we don=E2=80=99t need to pull. By definition, it=E2=
=80=99s an
answer that can only be given for a specific commit; we cannot tell
whether =E2=80=9Cmaster=E2=80=9D or =E2=80=9CHEAD=E2=80=9D is available, th=
at wouldn=E2=80=99t make sense.
Thus, I think we need to revert
a789dd58656d5f7f1b8edf790d77753fc71670af, and probably add a comment
explaining why it=E2=80=99s written this way.
Thoughts?
Ludo=E2=80=99.
guix-patches@HIDDEN:bug#65352; Package guix-patches.
Full text available.
Received: (at 65352) by debbugs.gnu.org; 4 Sep 2023 08:49:36 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Mon Sep 04 04:49:35 2023
Received: from localhost ([127.0.0.1]:48481 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qd5H5-0002vx-BU
for submit <at> debbugs.gnu.org; Mon, 04 Sep 2023 04:49:35 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:48626)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <ludo@HIDDEN>) id 1qd5H2-0002ve-Ew
for 65352 <at> debbugs.gnu.org; Mon, 04 Sep 2023 04:49:34 -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 <ludo@HIDDEN>)
id 1qd5Gx-0008K2-8l; Mon, 04 Sep 2023 04:49:27 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To:
From; bh=Ab/atSdWFCjP1hS72wmrDNWPxAsay5Ki2X1h1y+Fqm0=; b=evJfqos/+9hVrwCZoFU+
WkN/HetLxYnI3bYdtMpIAT6hf9fn7o/my9PjboxvafaMZn1llTO0eIUtC27GEsEH9N34avLa9yqNQ
uPN4re527IkgHAMxPEGY13Up65pryy5jUSo0id4w0sU3dvLGs61kwYSrFeIGgJxOFP9GAMPY5LwVX
eaCXmjFV1VbJtIS5KGpRblCtevu8bZzYeU1oRkH+e4n4WbPlwtxqPujLTsLp0iWONZ/o071TMwPMI
jQ3TkA8aoxDXxCBvk7iJh1JoJEuaUwN/zQXUKk5wyftvM0LZxp3iVpEOq5GqVVk0jEMZamzrdypcx
J0UeJ7k3D9r/tQ==;
From: =?utf-8?Q?Ludovic_Court=C3=A8s?= <ludo@HIDDEN>
To: Simon Tournier <zimon.toutoune@HIDDEN>
Subject: Re: bug#65352: Fix time-machine and network
References: <87fs4h4vb9.fsf@HIDDEN>
<c5156f9a756c2a6a304dc789c00abf533c787fd8.1692281315.git.zimon.toutoune@HIDDEN>
Date: Mon, 04 Sep 2023 10:49:24 +0200
In-Reply-To: <c5156f9a756c2a6a304dc789c00abf533c787fd8.1692281315.git.zimon.toutoune@HIDDEN>
(Simon Tournier's message of "Thu, 17 Aug 2023 16:09:16 +0200")
Message-ID: <87wmx6qq5n.fsf_-_@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux)
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="=-=-="
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 65352
Cc: 65352 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
--=-=-=
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Hi,
Simon Tournier <zimon.toutoune@HIDDEN> skribis:
> * guix/git/scm (reference-available?): Rely of the procedure resolve-refe=
rence
> to determine if the reference belongs to the local Git checkout.
> ---
> guix/git.scm | 13 ++-----------
> 1 file changed, 2 insertions(+), 11 deletions(-)
>
> 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))))
Houston, we have a problem:
--8<---------------cut here---------------start------------->8---
$ guix time-machine -C <(echo %default-channels) -- describe
Backtrace:
17 (primitive-load "/home/ludo/.config/guix/current/bin/gu=E2=80=
=A6")
In guix/ui.scm:
2323:7 16 (run-guix . _)
2286:10 15 (run-guix-command _ . _)
In ice-9/boot-9.scm:
1752:10 14 (with-exception-handler _ _ #:unwind? _ # _)
1747:15 13 (with-exception-handler #<procedure 7f987de73fc0 at ic=E2=80=
=A6> =E2=80=A6)
In guix/store.scm:
672:3 12 (_)
In ice-9/boot-9.scm:
1752:10 11 (with-exception-handler _ _ #:unwind? _ # _)
In guix/store.scm:
659:37 10 (thunk)
In guix/status.scm:
839:4 9 (call-with-status-report _ _)
In guix/store.scm:
1298:8 8 (call-with-build-handler #<procedure 7f987de84420 at g=E2=80=
=A6> =E2=80=A6)
In guix/inferior.scm:
932:10 7 (cached-channel-instance #<store-connection 256.99 7f9=E2=80=
=A6> =E2=80=A6)
In guix/scripts/time-machine.scm:
171:42 6 (validate-guix-channel _)
In guix/git.scm:
471:21 5 (update-cached-checkout _ #:ref _ #:recursive? _ # _ # _ =E2=
=80=A6)
In ice-9/boot-9.scm:
1747:15 4 (with-exception-handler #<procedure 7f987de900c0 at ic=E2=80=
=A6> =E2=80=A6)
In guix/git.scm:
364:11 3 (_)
235:4 2 (resolve _)
In ice-9/boot-9.scm:
1685:16 1 (raise-exception _ #:continuable? _)
1685:16 0 (raise-exception _ #:continuable? _)
ice-9/boot-9.scm:1685:16: In procedure raise-exception:
Throw to key `match-error' with args `("match" "no matching pattern" ())'.
$ guix describe
Generation 272 Sep 03 2023 23:46:47 (current)
guix e365c26
repository URL: https://git.savannah.gnu.org/git/guix.git
branch: master
commit: e365c26a34fa485f9af46538fcea128db681c33d
--8<---------------cut here---------------end--------------->8---
I=E2=80=99m testing the fix below:
--=-=-=
Content-Type: text/x-patch; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
diff --git a/guix/git.scm b/guix/git.scm
index ebe2600209..5fa604f9a0 100644
--- a/guix/git.scm
+++ b/guix/git.scm
@@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright =C2=A9 2017, 2020 Mathieu Othacehe <m.othacehe@HIDDEN>
-;;; Copyright =C2=A9 2018-2022 Ludovic Court=C3=A8s <ludo@HIDDEN>
+;;; Copyright =C2=A9 2018-2023 Ludovic Court=C3=A8s <ludo@HIDDEN>
;;; Copyright =C2=A9 2021 Kyle Meyer <kyle@HIDDEN>
;;; Copyright =C2=A9 2021 Marius Bakke <marius@HIDDEN>
;;; Copyright =C2=A9 2022 Maxime Devos <maximedevos@HIDDEN>
@@ -282,7 +282,10 @@ (define (resolve-reference repository ref)
(if (=3D OBJ-TAG (object-type obj))
(object-lookup repository
(tag-target-id (tag-lookup repository oid)))
- obj))))))
+ obj)))
+ (()
+ (resolve-reference repository
+ '(symref . "refs/remotes/origin/HEAD"))))))
=20
(define (switch-to-ref repository ref)
"Switch to REPOSITORY's branch, commit or tag specified by REF. Return =
the
--=-=-=
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: base64
DQpMdWRv4oCZLg0K
--=-=-=--
guix-patches@HIDDEN:bug#65352; Package guix-patches.
Full text available.
Received: (at 65352) by debbugs.gnu.org; 23 Aug 2023 20:25:36 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Aug 23 16:25:36 2023
Received: from localhost ([127.0.0.1]:35244 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qYuQ4-00017i-HD
for submit <at> debbugs.gnu.org; Wed, 23 Aug 2023 16:25:36 -0400
Received: from mail-qt1-x830.google.com ([2607:f8b0:4864:20::830]:62816)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <maxim.cournoyer@HIDDEN>) id 1qYuQ1-00017T-NL
for 65352 <at> debbugs.gnu.org; Wed, 23 Aug 2023 16:25:35 -0400
Received: by mail-qt1-x830.google.com with SMTP id
d75a77b69052e-410ad0ae052so1143791cf.1
for <65352 <at> debbugs.gnu.org>; Wed, 23 Aug 2023 13:25:30 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20221208; t=1692822324; x=1693427124;
h=mime-version:user-agent:message-id:in-reply-to:date:references
:subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to;
bh=y5xLHz0Y1tK1NO1lfVf/GMYkjscqjhp9tjkdePTUMos=;
b=Hyz7frH1WT9Cin4h2UCplOxDORp1hvSLUbzfiJeEXR4dVnF46J5U9va//aBpqOpoPk
T9onBujOTnY5WtS0soTcISMIgPV/RvugW6cN81DvVYE/FvVMp/dl+/MkHgOLYttvbREI
LJeldZyxQSz8EMbH64QsDqjwQ2zVz9HAcDwg+Pzrw1HBylQq/YEBMbK0jIiJENHFCmwD
usuGE/AIrgPS/hBQx5oclY5oLHMZ6nGHRCAGyHXgNlZdoX6uaydxMeTOJ/u7cWSf5weq
sNxOGOasJs3+ymNQMx/tmXWByGik7eoTHgzPtml4uXTca4elBiB6gx2zSlweBxjogWyi
MXBw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20221208; t=1692822324; x=1693427124;
h=mime-version:user-agent:message-id:in-reply-to:date:references
:subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date
:message-id:reply-to;
bh=y5xLHz0Y1tK1NO1lfVf/GMYkjscqjhp9tjkdePTUMos=;
b=aqS3n08R8CT0MWgxnM+wJLfcuxUatbnJHTKXoZn37EGP3I5kCR1uCU7otvWY9whOY9
xRH+SBDMibxK6CLzGWEHwfX7B9Ok3wl33BanTIBOWBuz/GseGvQKhYcFLEguMVlaDDJA
oSOaKgjbybyjg9K5tY1ljpBeswmM00BEmhTuNATgtZKRGlBCZJTMi2QxBgd8qskPHlLa
uYYY4/g2BYgBL7y9iTEGXhVmQpnbUa2gpcQGGLtNzuC3mWbMQ3bktu2urxaKM+se/e38
42A6z/I+hvpJf/sFeywOruV0C59xkn6W6fBvUWiQz+E3+Q7toN2lT/v4TNJ6UZJAvfkO
574w==
X-Gm-Message-State: AOJu0YxyIZOIw3DU7hUAmZhzaaxBYKTOd5HW0oRnbyev1za6Meeobe/u
DvyBTD/1xfvhgdHlbDnhJvCBmE1FdJN9Vg==
X-Google-Smtp-Source: AGHT+IEidDi+UuRZpuPNuI2WQBhl5scxKDmMmikql5pdzKaBbGfom28s8YrujJkHp/Jyw4Uwj4awkA==
X-Received: by 2002:ac8:5716:0:b0:410:976f:f6b6 with SMTP id
22-20020ac85716000000b00410976ff6b6mr13257409qtw.1.1692822324185;
Wed, 23 Aug 2023 13:25:24 -0700 (PDT)
Received: from hurd (dsl-158-129.b2b2c.ca. [66.158.158.129])
by smtp.gmail.com with ESMTPSA id
r9-20020ac87ee9000000b0040ff6194ef3sm3916343qtc.70.2023.08.23.13.25.23
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Wed, 23 Aug 2023 13:25:23 -0700 (PDT)
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
To: Simon Tournier <zimon.toutoune@HIDDEN>
Subject: Re: [bug#65352] Fix time-machine and network
References: <c5156f9a756c2a6a304dc789c00abf533c787fd8.1692281315.git.zimon.toutoune@HIDDEN>
<444e7e32d49b56ba6cb0a132e97d63560d8de437.1692281315.git.zimon.toutoune@HIDDEN>
<87o7j5fzg8.fsf_-_@HIDDEN>
<CAJ3okZ0NHQ0z1-+VB+bONKL2y85rb00dc9zjj98MeC9o9C86TQ@HIDDEN>
<87ttsqa2km.fsf@HIDDEN> <86jztm40r2.fsf@HIDDEN>
Date: Wed, 23 Aug 2023 16:25:22 -0400
In-Reply-To: <86jztm40r2.fsf@HIDDEN> (Simon Tournier's message of "Wed, 23
Aug 2023 10:32:49 +0200")
Message-ID: <87lee1a4lp.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 65352
Cc: 65352 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
Hi Simon,
Simon Tournier <zimon.toutoune@HIDDEN> writes:
> Hi Maxim,
>
> On Tue, 22 Aug 2023 at 22:56, Maxim Cournoyer <maxim.cournoyer@HIDDEN> wrote:
>
>>> or b)
>>> (match ref
>>> ((or ('commit . commit)
>>> ('tag-or-commit . commit)
>>> ('tag . commit))
>>> (channel (inherit c)
>>> (url url) (commit commit) (branch #f)))
>>> (('branch . branch)
>>> (channel (inherit c)
>>> (url url) (commit #f) (branch branch)))
>>> (#f
>>> (channel (inherit c) (url url)))))
>>>
>>> but not ecab937897385fce3e3ce0c5f128afba4304187c. :-)
>>
>> I was driven by my use case where adding support for tag-or-commit was
>> enough, but I think it'd be a good idea to cover all the potential ref
>> types documented in update-cached-checkout, so b) makes sense to me.
>
> Ok, b) is fine with me.
>
> Sorry for not being clear in #64746 but this consistency was the subject
> of my comment [1]. :-)
I'm glad we finally came to a common understanding, ah!
--
Thanks,
Maxim
guix-patches@HIDDEN:bug#65352; Package guix-patches.
Full text available.
Received: (at 65352) by debbugs.gnu.org; 23 Aug 2023 16:40:35 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Aug 23 12:40:35 2023
Received: from localhost ([127.0.0.1]:34990 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qYquI-0000s2-Tp
for submit <at> debbugs.gnu.org; Wed, 23 Aug 2023 12:40:35 -0400
Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]:40351)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <zimon.toutoune@HIDDEN>) id 1qYqu9-0000r0-M2
for 65352 <at> debbugs.gnu.org; Wed, 23 Aug 2023 12:40:29 -0400
Received: by mail-wm1-x336.google.com with SMTP id
5b1f17b1804b1-3fe8d816a40so9909745e9.1
for <65352 <at> debbugs.gnu.org>; Wed, 23 Aug 2023 09:40:22 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20221208; t=1692808816; x=1693413616;
h=mime-version:message-id:date:references:in-reply-to:subject:cc:to
:from:from:to:cc:subject:date:message-id:reply-to;
bh=Me8PUebjNtZqGhCByD5YjyX71zskLZ2oNPyfNhB8RsA=;
b=HXPUoaLy+pJ79JL2mWIbSW7zAYUfXzw90B1W4FfgobMK0DL1jhM291wVgL38MaaDr1
4XP8z4EhPBgfFjhUhlZ12IIcBEIFTCoV9vQyt20TIW3GFSwvQINScWboFty8swpS/zx9
yb55czhfQN14CwdrvmxU5gZcJhvF1EZo9kz3UxBkh5VdlnaINxaaHC2NGEJSeIB2E9Bc
wEOeAUdXkBjZfGBO0ICdpIqaXZqMFxIMt9NMkYxP8T6P/qI9Q0CqRyWu5g4ACZzD35zB
tFb+MoCWsPNDpgnMGNTg3ixA/3w4SQFN95IFI55MnngTK/OUyloqCuAQ2DWLEZZxQWTx
+hfA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20221208; t=1692808816; x=1693413616;
h=mime-version:message-id:date:references:in-reply-to:subject:cc:to
:from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to;
bh=Me8PUebjNtZqGhCByD5YjyX71zskLZ2oNPyfNhB8RsA=;
b=Oupv/TPGlzhJlANn4AAIRrwaRGLQaVIMpuB9BY5LXowxKbblOtDToWepkEKw5lpvhH
bAXZWziQrXCsAUVWmihKS9TLbqhOFd5MuQLfN/VnQkre7GYIv9Pn2CZZGWV4tZLnbXub
aodm+8i2qAJLVfuktPX74A04Kr2wQjNTed7yN9nEt8dO7xGN1FXIHIInD+P8xMf5BSJ5
mQjFoZSbPMKP4DbThWUAJh/aEnjW9AGJQn/sXxoDE9evOKGAuRS44eF/6MqHxcw5AtqO
Fyv6BqVa9xFDvAJr6e1ZHvIh8AQM33pHligAQ58XVHYhl6VAXt9Dy33dEpaUm/yTr4hg
5Hpg==
X-Gm-Message-State: AOJu0YyT3+h/ndu2lSo7IfGDV5ZMIvs9iO2zuZ9tN1t1dY7i28NeKW0B
8RtnlSjVqR6UFicoz6ygL3O98FY7gDo=
X-Google-Smtp-Source: AGHT+IFJL1gUVgLO0ofm34aNo0LWed40u1V6MQRUF6aK7VxTFXCb2JqmN3s+0rT9zG4EyzKDBVGroA==
X-Received: by 2002:a05:600c:15c2:b0:3fb:aadc:41dc with SMTP id
v2-20020a05600c15c200b003fbaadc41dcmr10485302wmf.4.1692808816350;
Wed, 23 Aug 2023 09:40:16 -0700 (PDT)
Received: from lili ([2a01:e0a:59b:9120:65d2:2476:f637:db1e])
by smtp.gmail.com with ESMTPSA id
r1-20020a05600c298100b003fe2b6d64c8sm87800wmd.21.2023.08.23.09.40.15
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Wed, 23 Aug 2023 09:40:16 -0700 (PDT)
From: Simon Tournier <zimon.toutoune@HIDDEN>
To: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
Subject: Re: [bug#65352] Fix time-machine and network
In-Reply-To: <87ttsqa2km.fsf@HIDDEN>
References: <c5156f9a756c2a6a304dc789c00abf533c787fd8.1692281315.git.zimon.toutoune@HIDDEN>
<444e7e32d49b56ba6cb0a132e97d63560d8de437.1692281315.git.zimon.toutoune@HIDDEN>
<87o7j5fzg8.fsf_-_@HIDDEN>
<CAJ3okZ0NHQ0z1-+VB+bONKL2y85rb00dc9zjj98MeC9o9C86TQ@HIDDEN>
<87ttsqa2km.fsf@HIDDEN>
Date: Wed, 23 Aug 2023 10:32:49 +0200
Message-ID: <86jztm40r2.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: 1.1 (+)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
has NOT identified this incoming email as spam. The original
message has been attached to this so you can view it or label
similar future email. If you have any questions, see
the administrator of that system for details.
Content preview: Hi Maxim, On Tue, 22 Aug 2023 at 22:56,
Maxim Cournoyer wrote:
>> or b) >> (match ref >> ((or ('commit . commit) >> ('tag-or-commit . commit)
>> ('tag . commit)) >> (channel (inherit c) >> (url url) (commit commit)
(branch #f))) >> (('branch . branch) >> (channel [...]
Content analysis details: (1.1 points, 10.0 required)
pts rule name description
---- ---------------------- --------------------------------------------------
-0.0 SPF_PASS SPF: sender matches SPF record
0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail
provider (zimon.toutoune[at]gmail.com)
1.1 DATE_IN_PAST_06_12 Date: is 6 to 12 hours before Received: date
0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record
-0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/,
no trust [2a00:1450:4864:20:0:0:0:336 listed in]
[list.dnswl.org]
X-Debbugs-Envelope-To: 65352
Cc: 65352 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: 0.1 (/)
Hi Maxim,
On Tue, 22 Aug 2023 at 22:56, Maxim Cournoyer <maxim.cournoyer@HIDDEN> wrote:
>> or b)
>> (match ref
>> ((or ('commit . commit)
>> ('tag-or-commit . commit)
>> ('tag . commit))
>> (channel (inherit c)
>> (url url) (commit commit) (branch #f)))
>> (('branch . branch)
>> (channel (inherit c)
>> (url url) (commit #f) (branch branch)))
>> (#f
>> (channel (inherit c) (url url)))))
>>
>> but not ecab937897385fce3e3ce0c5f128afba4304187c. :-)
>
> I was driven by my use case where adding support for tag-or-commit was
> enough, but I think it'd be a good idea to cover all the potential ref
> types documented in update-cached-checkout, so b) makes sense to me.
Ok, b) is fine with me.
Sorry for not being clear in #64746 but this consistency was the subject
of my comment [1]. :-)
Cheers,
simon
1: https://issues.guix.gnu.org/64746#13
guix-patches@HIDDEN:bug#65352; Package guix-patches.
Full text available.
Received: (at 65352) by debbugs.gnu.org; 23 Aug 2023 02:57:10 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Aug 22 22:57:10 2023
Received: from localhost ([127.0.0.1]:60755 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qYe3S-0003fR-BO
for submit <at> debbugs.gnu.org; Tue, 22 Aug 2023 22:57:10 -0400
Received: from mail-qk1-x72e.google.com ([2607:f8b0:4864:20::72e]:60501)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <maxim.cournoyer@HIDDEN>) id 1qYe3Q-0003fF-UJ
for 65352 <at> debbugs.gnu.org; Tue, 22 Aug 2023 22:57:09 -0400
Received: by mail-qk1-x72e.google.com with SMTP id
af79cd13be357-76dbd877cd9so19705485a.0
for <65352 <at> debbugs.gnu.org>; Tue, 22 Aug 2023 19:57:05 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20221208; t=1692759420; x=1693364220;
h=mime-version:user-agent:message-id:in-reply-to:date:references
:subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to;
bh=hRSQP5n1Hv53odESZ0GUgjXzNC4ri33yGZPPdx/cT7k=;
b=Pf8EDnLh9pkAVOPBqYQW8iu1jjIhDRM04H9YmP2Z5YI0RT4TZqKEXEARgM3qCiE01g
2jZ+r/oCLQv7H6KAdPCrkzjy/M2jJaRntRrPm03muCZ6UzpKsOO2i1/m8c1FbfSLh1em
AV+SgqCnRxWMR7KLuKkDn3pjToCjLkW+MwBjHJsVystRz8SkrJqQfcJfPTaP2JaeDrOl
b+28Mm7RHmPOCHprc8HysZkvJ4BU/3ZvBYVLYJBTdX36vAqhKF00QZG3EsVKAsYy3JJ5
yAXo51+GHwH2ZHaHXfyNvID4MLu3xs/vD/Xwen6rhlPa8J58p5nTuz8SOfHDJycjcPtP
ujcg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20221208; t=1692759420; x=1693364220;
h=mime-version:user-agent:message-id:in-reply-to:date:references
:subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date
:message-id:reply-to;
bh=hRSQP5n1Hv53odESZ0GUgjXzNC4ri33yGZPPdx/cT7k=;
b=daTLMowB2Dmnqogh75gt7YMTSG+DTsc0m8rZ0dstXTZ1jsH+qx0qp6qOtEWNkmKyTn
BtN8Hpflg6GsNH+eN2wK1jJC7qm8yTnb+wDaT5s3A4E9WfDlhHfqq+MK/blu42a8q012
hu3qzXaqJ7Jc+tKYvlmc42J/M8+IvD7pG6UOWPQpW/QiA0TZg8oxJY5rSI+VUWKkRmpg
0EeJ5afA/zltIVfDN3+Bh0HL4ZxAYsVarPVWz5HT1ZzvAf3obDTl7h0YfFNnU/SrE1oE
cnb0YkM2/274kHvSb8CwTuyCTVRgyEVHvHUea9vtFqvG5NHepGGZ9s5laQv799kLJh5m
oatA==
X-Gm-Message-State: AOJu0YwH7tjlaKqki1DqEZ2P4OGidn9Pb3wvYraswNORb2acnXksN+MN
zWPby50RD3ao3ngJkTym3gcPmoNU2h9SvA==
X-Google-Smtp-Source: AGHT+IE4u31o0ily8ohm6uPbQbBik5psuQRY+yD7K4PVtNn+Zz5ZDBblSHZIuEMzUQbW16Sb3WrvgA==
X-Received: by 2002:a05:620a:305:b0:76d:1223:10e8 with SMTP id
s5-20020a05620a030500b0076d122310e8mr12194042qkm.46.1692759419809;
Tue, 22 Aug 2023 19:56:59 -0700 (PDT)
Received: from hurd (dsl-158-129.b2b2c.ca. [66.158.158.129])
by smtp.gmail.com with ESMTPSA id
q8-20020a05620a038800b0076800354830sm3643030qkm.2.2023.08.22.19.56.58
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Tue, 22 Aug 2023 19:56:59 -0700 (PDT)
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
To: Simon Tournier <zimon.toutoune@HIDDEN>
Subject: Re: bug#65352: Fix time-machine and network
References: <c5156f9a756c2a6a304dc789c00abf533c787fd8.1692281315.git.zimon.toutoune@HIDDEN>
<444e7e32d49b56ba6cb0a132e97d63560d8de437.1692281315.git.zimon.toutoune@HIDDEN>
<87o7j5fzg8.fsf_-_@HIDDEN>
<CAJ3okZ0NHQ0z1-+VB+bONKL2y85rb00dc9zjj98MeC9o9C86TQ@HIDDEN>
Date: Tue, 22 Aug 2023 22:56:57 -0400
In-Reply-To: <CAJ3okZ0NHQ0z1-+VB+bONKL2y85rb00dc9zjj98MeC9o9C86TQ@HIDDEN>
(Simon Tournier's message of "Thu, 17 Aug 2023 18:08:38 +0200")
Message-ID: <87ttsqa2km.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 65352
Cc: 65352 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
Hi Simon,
Simon Tournier <zimon.toutoune@HIDDEN> writes:
> Hi Maxim,
>
> On Thu, 17 Aug 2023 at 17:42, Maxim Cournoyer <maxim.cournoyer@HIDDEN> wrote:
>
>> > (match ref
>> > - ((or ('commit . commit)
>> > - ('tag-or-commit . commit))
>> > + (('tag-or-commit . commit)
>
>> Not that channel-list is a public API, so this is effectively changing
>> the contract, no?
>
> Well, the contract is not clearly defined. ;-)
>
> The REF is defined by the docstring of update-cached-checkout,
>
> REF is pair whose key is [branch | commit | tag | tag-or-commit ] and value
> the associated data: [<branch name> | <sha1> | <tag name> | <string>].
> If REF is the empty list, the remote HEAD is used.
Good catch, it seems tag is not covered.
> Therefore, if we want to be compliant with the public API, we also
> need to add 'tag' to the 'or' match case; as I suggested when
> commenting your patch tweaking this part. :-)
>
> Well, from my point of view, the alternative is:
>
> a)
> (match ref
> (('tag-or-commit . commit)
> (channel (inherit c)
> (url url) (commit commit) (branch #f)))
> (('branch . branch)
> (channel (inherit c)
> (url url) (commit #f) (branch branch)))
> (#f
> (channel (inherit c) (url url))))
>
> or b)
> (match ref
> ((or ('commit . commit)
> ('tag-or-commit . commit)
> ('tag . commit))
> (channel (inherit c)
> (url url) (commit commit) (branch #f)))
> (('branch . branch)
> (channel (inherit c)
> (url url) (commit #f) (branch branch)))
> (#f
> (channel (inherit c) (url url)))))
>
> but not ecab937897385fce3e3ce0c5f128afba4304187c. :-)
I was driven by my use case where adding support for tag-or-commit was
enough, but I think it'd be a good idea to cover all the potential ref
types documented in update-cached-checkout, so b) makes sense to me.
--
Thanks,
Maxim
guix-patches@HIDDEN:bug#65352; Package guix-patches.
Full text available.
Received: (at 65352) by debbugs.gnu.org; 23 Aug 2023 02:15:01 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Aug 22 22:15:01 2023
Received: from localhost ([127.0.0.1]:60726 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qYdOe-0002ZW-PU
for submit <at> debbugs.gnu.org; Tue, 22 Aug 2023 22:15:01 -0400
Received: from mail-qt1-x830.google.com ([2607:f8b0:4864:20::830]:52523)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <maxim.cournoyer@HIDDEN>) id 1qYdOc-0002ZI-Hy
for 65352 <at> debbugs.gnu.org; Tue, 22 Aug 2023 22:14:59 -0400
Received: by mail-qt1-x830.google.com with SMTP id
d75a77b69052e-40849e69eb5so32267841cf.1
for <65352 <at> debbugs.gnu.org>; Tue, 22 Aug 2023 19:14:55 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20221208; t=1692756889; x=1693361689;
h=content-transfer-encoding:mime-version:user-agent:message-id
:in-reply-to:date:references:subject:cc:to:from:from:to:cc:subject
:date:message-id:reply-to;
bh=yMJMigvoDLLjVzRICTxYPpxxcEfEER9JFk0Vpe5IRgk=;
b=VSH2cZZFYbENTRT1M6Dx0vzC39jELbEoXeUPXzQsNvsyYcXaV4GRRzwjUF1kul2qCI
jHmDRN6bH4LcQhfEFxJaWEgwIQw14xBA+M2Wj8lgQCQ8rhM3/2AtKVEh4aFVrOhyneUo
Q3n0xaOd9SxE2RXLZE/NuiNVm9I2oPCMMCsPzt1++StYH5SNbaR+4SFBrZ+cnPP9p4qL
AulRNYKyE7NkrSbWzMDF+sHhdBirq6mDuu0aTpNN/LN7qn8/7qpRlWHbbEKk/RKhI7ZI
hIZBAtnzg1Wyol6JsG7KWkuQw/F5NtxFAc+6+RCgciYF1Jf4Qi1Tar0P5uGBzzKqLCZx
/SlQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20221208; t=1692756889; x=1693361689;
h=content-transfer-encoding:mime-version:user-agent:message-id
:in-reply-to:date:references:subject:cc:to:from:x-gm-message-state
:from:to:cc:subject:date:message-id:reply-to;
bh=yMJMigvoDLLjVzRICTxYPpxxcEfEER9JFk0Vpe5IRgk=;
b=Rc4yZ2MEPOnQnsA1Wg+zZSezM+U6eUs2A4iwoVy0FhESIvZrgXE1YH+HQ3dIk6EnrC
6jKoXa1WyzmD8Sg7Jzk2N8aY3Y2nifni2j3MzuJ7CYPz+MLRCnEKgczAc/zoyCbF20bL
M8ggQd6CjZueyjjXCj2JOR/CY+9Eh1FDJMHpbVxjwlsTxIVvXtYlEixYo0wE2n7bIBSB
m1L3Ixc9CYrjX38uJNHSZOI1zjlu198sx8DFf6IEYVo7/AyktiAKho9t5hgIkiK2qkSo
raERZTGHSYKCYojp3DN157/t4J/tVdRoxGjhNtTgyWhxzinK6EuyakclH85+FYMFERkg
YM3A==
X-Gm-Message-State: AOJu0YwwYtmLpHNSEByLoVcsslxBcaZnAMPZFitYWijDGux8CJG1wojj
zq4bGhdl/I2pEvsiYGBphKoUELKyvoDu8Q==
X-Google-Smtp-Source: AGHT+IFjmuBsUZL/oIYavMQlldaUsUZN11l7/HwJS4zce/+B7ZZVF9S6awP16OpuijplPrmyTxjW4g==
X-Received: by 2002:ac8:7d84:0:b0:403:df34:9575 with SMTP id
c4-20020ac87d84000000b00403df349575mr12449914qtd.34.1692756889564;
Tue, 22 Aug 2023 19:14:49 -0700 (PDT)
Received: from hurd (dsl-158-129.b2b2c.ca. [66.158.158.129])
by smtp.gmail.com with ESMTPSA id
y10-20020ac83e8a000000b00403ff38d855sm3493189qtf.4.2023.08.22.19.14.48
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Tue, 22 Aug 2023 19:14:48 -0700 (PDT)
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
To: Ludovic =?utf-8?Q?Court=C3=A8s?= <ludo@HIDDEN>
Subject: Re: bug#65352: Fix time-machine and network
References: <c5156f9a756c2a6a304dc789c00abf533c787fd8.1692281315.git.zimon.toutoune@HIDDEN>
<444e7e32d49b56ba6cb0a132e97d63560d8de437.1692281315.git.zimon.toutoune@HIDDEN>
<87o7j5fzg8.fsf_-_@HIDDEN> <87y1i4a42h.fsf_-_@HIDDEN>
<87350ce6b4.fsf@HIDDEN> <87fs4b3uvg.fsf@HIDDEN>
Date: Tue, 22 Aug 2023 22:14:46 -0400
In-Reply-To: <87fs4b3uvg.fsf@HIDDEN> ("Ludovic =?utf-8?Q?Court=C3=A8s=22'?=
=?utf-8?Q?s?= message of "Tue, 22 Aug 2023 18:27:31 +0200")
Message-ID: <87350abj3d.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 65352
Cc: 65352 <at> debbugs.gnu.org, Simon Tournier <zimon.toutoune@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
Hi,
Ludovic Court=C3=A8s <ludo@HIDDEN> writes:
> Hi,
>
> Maxim Cournoyer <maxim.cournoyer@HIDDEN> skribis:
>
>> Ludovic Court=C3=A8s <ludo@HIDDEN> writes:
>
> [...]
>
>>>> Not that channel-list is a public API, so this is effectively changing
>>>> the contract, no?
>>>
>>> Yes, but it=E2=80=99s really meant to be used internally, where it=E2=
=80=99s either
>>> 'tag-or-commit or 'branch in practice. So to me either way is fine.
>>
>> In this case, should we stop exporting it from the module? (and use it
>> via the (@ (...)) trick as needed). This would communicate the
>> intention best.
>
> Well, there are different levels of =E2=80=9Cinternal=E2=80=9D I guess. =
:-)
>
> @@ (double-at) should only be used as a last resort; whether it=E2=80=99s=
usable
> at all depends on inlining decisions made by the compiler. So in this
> case, I=E2=80=99m for plain #:export.
OK! Yes, whatever suites the bill best :-).
--=20
Thanks,
Maxim
guix-patches@HIDDEN:bug#65352; Package guix-patches.
Full text available.Received: (at 65352) by debbugs.gnu.org; 22 Aug 2023 16:27:46 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Tue Aug 22 12:27:46 2023 Received: from localhost ([127.0.0.1]:60277 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1qYUEM-0004HF-8z for submit <at> debbugs.gnu.org; Tue, 22 Aug 2023 12:27:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43752) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <ludo@HIDDEN>) id 1qYUEK-0004H2-KS for 65352 <at> debbugs.gnu.org; Tue, 22 Aug 2023 12:27:45 -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 <ludo@HIDDEN>) id 1qYUEC-0002ln-EW; Tue, 22 Aug 2023 12:27:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=Z2kO5Q7f5d74Fdk7Kr5a6CAnExKjkFztDyAwKl/Kgqw=; b=NzOD25evw+g9lx+zCJyP TzOljNdtqp2wnLvGU6YPVa+pVg/ANRD42rR6VLmiqPZhUEK/qiONPrO0WgoxvtlUqFIkRShqAZKwx WaZSFcFfw2ZCgpBSN8ubrseBcQzjsbALTPq3VOdyfIWLLzSeGG4IW9i2o2q8Ujo3w8GDXC4rk7evj wSWC+d4MgygyfIpcMF/BW1t1ae6XTpgq+gCKOzPTwqKKY9GWd017lYSi3aLrNij8Ex1/qX3UvD61F BifPB5jPu3488rnMmbYVu66ZeHdZkRmQvWL0U9ZfwuFktDAGRmEDb8eNJOUGKgLpn/fB84EYg1Buj 0SnwBi32TQiVYQ==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= <ludo@HIDDEN> To: Maxim Cournoyer <maxim.cournoyer@HIDDEN> Subject: Re: bug#65352: Fix time-machine and network References: <c5156f9a756c2a6a304dc789c00abf533c787fd8.1692281315.git.zimon.toutoune@HIDDEN> <444e7e32d49b56ba6cb0a132e97d63560d8de437.1692281315.git.zimon.toutoune@HIDDEN> <87o7j5fzg8.fsf_-_@HIDDEN> <87y1i4a42h.fsf_-_@HIDDEN> <87350ce6b4.fsf@HIDDEN> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: Quintidi 5 Fructidor an 231 de la =?utf-8?Q?R=C3=A9v?= =?utf-8?Q?olution=2C?= jour du Saumon 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: Tue, 22 Aug 2023 18:27:31 +0200 In-Reply-To: <87350ce6b4.fsf@HIDDEN> (Maxim Cournoyer's message of "Mon, 21 Aug 2023 11:58:07 -0400") Message-ID: <87fs4b3uvg.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 65352 Cc: 65352 <at> debbugs.gnu.org, Simon Tournier <zimon.toutoune@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -3.3 (---) Hi, Maxim Cournoyer <maxim.cournoyer@HIDDEN> skribis: > Ludovic Court=C3=A8s <ludo@HIDDEN> writes: [...] >>> Not that channel-list is a public API, so this is effectively changing >>> the contract, no? >> >> Yes, but it=E2=80=99s really meant to be used internally, where it=E2=80= =99s either >> 'tag-or-commit or 'branch in practice. So to me either way is fine. > > In this case, should we stop exporting it from the module? (and use it > via the (@ (...)) trick as needed). This would communicate the > intention best. Well, there are different levels of =E2=80=9Cinternal=E2=80=9D I guess. :-) @@ (double-at) should only be used as a last resort; whether it=E2=80=99s u= sable at all depends on inlining decisions made by the compiler. So in this case, I=E2=80=99m for plain #:export. Thanks, Ludo=E2=80=99.
guix-patches@HIDDEN:bug#65352; Package guix-patches.
Full text available.
Received: (at 65352) by debbugs.gnu.org; 21 Aug 2023 15:58:18 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Mon Aug 21 11:58:18 2023
Received: from localhost ([127.0.0.1]:57561 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qY7II-00015L-Gk
for submit <at> debbugs.gnu.org; Mon, 21 Aug 2023 11:58:18 -0400
Received: from mail-vs1-xe2c.google.com ([2607:f8b0:4864:20::e2c]:49582)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <maxim.cournoyer@HIDDEN>) id 1qY7IG-000158-Pd
for 65352 <at> debbugs.gnu.org; Mon, 21 Aug 2023 11:58:17 -0400
Received: by mail-vs1-xe2c.google.com with SMTP id
ada2fe7eead31-44768034962so741564137.3
for <65352 <at> debbugs.gnu.org>; Mon, 21 Aug 2023 08:58:14 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20221208; t=1692633488; x=1693238288;
h=content-transfer-encoding:mime-version:user-agent:message-id
:in-reply-to:date:references:subject:cc:to:from:from:to:cc:subject
:date:message-id:reply-to;
bh=FND9FoD+h44nSVLrILnnROKiBJh/hwzranAD8kTL5/Y=;
b=FEoqGQY3LE9zy4x1XVXFuDhvktHxR25xBIvw2gmbC+zcFbc/xTCOfzO7cDrqGN16He
1lOj8e7005VbABcqHIGhIQZp6WWdlA3mB1WU3yxhLa+/+uqn+hltppJlTYONOrqUM7a8
ky571V0QzyomK1MvzZx7d6D81LecbSbQpxXsFfIF7An7fZib0MCI3GCKAUmTwqPO1gRN
ZJE6CJYQ31UcWtBc5UpjUwmPzEByHjP/HP4IeQZ1kPiuTIEUIkPkyEfmrj5K6fu10dn0
15Y0/L7ChYk6oZka2qakWCj0cY5pifv8ba8plBJ9MHuq/XpKpDSYY01PGuoEvAjlgBF3
cM3A==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20221208; t=1692633488; x=1693238288;
h=content-transfer-encoding:mime-version:user-agent:message-id
:in-reply-to:date:references:subject:cc:to:from:x-gm-message-state
:from:to:cc:subject:date:message-id:reply-to;
bh=FND9FoD+h44nSVLrILnnROKiBJh/hwzranAD8kTL5/Y=;
b=IPlC3Y6wANmqhsF4b8pRpW5+Uw9FeyFJDMfGV6z0noeaXcw7weNmi8EF3VJJBjTzaK
d/MpEI8QEfb4O0qKIzvP2TO/6odSHrdweg3XO1cwxEYwH0IjXUqG3cbrYxRZEF61IcK0
b29GfsnkPeO8ulT8Bh2NnBqKXd8bWZBheHD/6K8ypWQP5Bg4fupvPqiMPFRZqhDmiHbt
owz3M18RCqHxEPEgUeZEy1HAWggYUt9TGIYhrE+JKZwbcoGztc+UzPBmn2y70ZtMRTo5
wjPrkXDKdM8Z7+i/4fC+Q9BcGdKfs1fpHga9HHXPLg//Vc/h50grdYPXK9aur60RpBEB
BYCA==
X-Gm-Message-State: AOJu0YxwwHrYjverlNl8HC6HbcaJopdfnrvkfN6sMrkJjAH6Yh0V1Cdu
6qZH7u5UDmO1PzLD9HmLTr6KLDmHVFU=
X-Google-Smtp-Source: AGHT+IGO9hT4hza1n+7Iv0FQt9rrFdF3LfxAs3QBIgVG97w2aLhAkb20TlMbwyYIPvJbH6yCFB+3eA==
X-Received: by 2002:a67:eb06:0:b0:44d:5298:5bfc with SMTP id
a6-20020a67eb06000000b0044d52985bfcmr1513510vso.17.1692633488622;
Mon, 21 Aug 2023 08:58:08 -0700 (PDT)
Received: from hurd (dsl-10-148-105.b2b2c.ca. [72.10.148.105])
by smtp.gmail.com with ESMTPSA id
oo23-20020a05620a531700b0076c98dad91dsm2560039qkn.120.2023.08.21.08.58.07
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Mon, 21 Aug 2023 08:58:08 -0700 (PDT)
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
To: Ludovic =?utf-8?Q?Court=C3=A8s?= <ludo@HIDDEN>
Subject: Re: bug#65352: Fix time-machine and network
References: <c5156f9a756c2a6a304dc789c00abf533c787fd8.1692281315.git.zimon.toutoune@HIDDEN>
<444e7e32d49b56ba6cb0a132e97d63560d8de437.1692281315.git.zimon.toutoune@HIDDEN>
<87o7j5fzg8.fsf_-_@HIDDEN> <87y1i4a42h.fsf_-_@HIDDEN>
Date: Mon, 21 Aug 2023 11:58:07 -0400
In-Reply-To: <87y1i4a42h.fsf_-_@HIDDEN> ("Ludovic =?utf-8?Q?Court=C3=A8s?=
=?utf-8?Q?=22's?= message of "Mon, 21 Aug 2023 16:00:06 +0200")
Message-ID: <87350ce6b4.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 65352
Cc: 65352 <at> debbugs.gnu.org, Simon Tournier <zimon.toutoune@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
Hi,
Ludovic Court=C3=A8s <ludo@HIDDEN> writes:
> Maxim Cournoyer <maxim.cournoyer@HIDDEN> skribis:
>
>> Simon Tournier <zimon.toutoune@HIDDEN> writes:
>>
>>> * 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)
>>
>> Not that channel-list is a public API, so this is effectively changing
>> the contract, no?
>
> Yes, but it=E2=80=99s really meant to be used internally, where it=E2=80=
=99s either
> 'tag-or-commit or 'branch in practice. So to me either way is fine.
In this case, should we stop exporting it from the module? (and use it
via the (@ (...)) trick as needed). This would communicate the
intention best.
--=20
Thanks,
Maxim
guix-patches@HIDDEN:bug#65352; Package guix-patches.
Full text available.
Received: (at 65352) by debbugs.gnu.org; 21 Aug 2023 14:00:38 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Mon Aug 21 10:00:38 2023
Received: from localhost ([127.0.0.1]:57358 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qY5SP-0008R2-Uy
for submit <at> debbugs.gnu.org; Mon, 21 Aug 2023 10:00:38 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:46288)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <ludo@HIDDEN>) id 1qY5SN-0008Qd-ND
for 65352 <at> debbugs.gnu.org; Mon, 21 Aug 2023 10:00:36 -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 <ludo@HIDDEN>)
id 1qY5SG-0004Ex-2r; Mon, 21 Aug 2023 10:00:28 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To:
From; bh=yicr2e0fs81AcjuR+JgfNkfAKF9Hoz4pPDeYMfD+z0M=; b=qNEbJ8qrXv1gc4es5Kpn
ZMUuRHDTbdw8mjZYfUcGrcGf9dZMGKzQqQgwRw099igN9qwoS3n2lVZwhbH44nBCg9i3wFUh2bOhZ
+hhQjlMiONc176cyAM7Q1H8AVM0NQjKUVYkZmwvyXFPMAVzY2WQqzhWypkpNhUoD3+v4fMGDLo00M
vQD7KCKtAiNaJ33NQif4+DnK68hgnKW9g74UCPeKXKuikPOZcvvcAM2EBZTy1rBcdqD44YyEDDV8T
XS2CKPeeAseUEVgBpCJYagtiMtafc9bXXIZjXK5wmIf7H64G2ra8uX0uttLfHP/YSCkVPGZrqeSll
CggEj2seYfym0g==;
From: =?utf-8?Q?Ludovic_Court=C3=A8s?= <ludo@HIDDEN>
To: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
Subject: Re: bug#65352: Fix time-machine and network
References: <c5156f9a756c2a6a304dc789c00abf533c787fd8.1692281315.git.zimon.toutoune@HIDDEN>
<444e7e32d49b56ba6cb0a132e97d63560d8de437.1692281315.git.zimon.toutoune@HIDDEN>
<87o7j5fzg8.fsf_-_@HIDDEN>
Date: Mon, 21 Aug 2023 16:00:06 +0200
In-Reply-To: <87o7j5fzg8.fsf_-_@HIDDEN> (Maxim Cournoyer's message of "Thu,
17 Aug 2023 11:41:59 -0400")
Message-ID: <87y1i4a42h.fsf_-_@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 65352
Cc: 65352 <at> debbugs.gnu.org, Simon Tournier <zimon.toutoune@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
Maxim Cournoyer <maxim.cournoyer@HIDDEN> skribis:
> Simon Tournier <zimon.toutoune@HIDDEN> writes:
>
>> * 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)
>
> Not that channel-list is a public API, so this is effectively changing
> the contract, no?
Yes, but it=E2=80=99s really meant to be used internally, where it=E2=80=99=
s either
'tag-or-commit or 'branch in practice. So to me either way is fine.
Thanks,
Ludo=E2=80=99.
guix-patches@HIDDEN:bug#65352; Package guix-patches.
Full text available.Received: (at 65352) by debbugs.gnu.org; 21 Aug 2023 13:57:32 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Mon Aug 21 09:57:31 2023 Received: from localhost ([127.0.0.1]:57349 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1qY5PP-0008Km-Ms for submit <at> debbugs.gnu.org; Mon, 21 Aug 2023 09:57:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36402) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <ludo@HIDDEN>) id 1qY5PN-0008KZ-Ua for 65352 <at> debbugs.gnu.org; Mon, 21 Aug 2023 09:57:30 -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 <ludo@HIDDEN>) id 1qY5PF-0003YH-D1; Mon, 21 Aug 2023 09:57:21 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=Rtc7ahk8jV7wNeQqSO0kjLEdrmWd54PGCmvQ3rQVaaI=; b=US0jTjEsTpvB8VJFGHNF DA9MTyEuxg0NFeolvko8XTlc0uKsgTija9OznX9cUatG8mzCtGteUmPliemKSsXzzwdy9DXcrKhGO ZCdzq3a1MvIPf0PzCC5egEfPfKSTs2r/bhsav4Y0J0xsSHGATBX8kUP0Fmu/e8E9VkMQG/cBIo17t qn1GLtglAnNLI6EOol6+Hfjbv9SNYvWdpI8jN9/uIw6BBXEAeHkJ0Mh5ZKC3wUrsnp4F/Gftu7mZB +P4+DW4yys3vWVVUkwPWRc3CXKkYuSPjP+jcKlcdaJK4gHPIZ2MVwRy6dInYHaeR6bkRWJ8LBnXk4 /jDUCsshecYBqA==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= <ludo@HIDDEN> To: Simon Tournier <zimon.toutoune@HIDDEN> Subject: Re: bug#65352: Fix time-machine and network References: <87fs4h4vb9.fsf@HIDDEN> <c5156f9a756c2a6a304dc789c00abf533c787fd8.1692281315.git.zimon.toutoune@HIDDEN> Date: Mon, 21 Aug 2023 15:57:19 +0200 In-Reply-To: <c5156f9a756c2a6a304dc789c00abf533c787fd8.1692281315.git.zimon.toutoune@HIDDEN> (Simon Tournier's message of "Thu, 17 Aug 2023 16:09:16 +0200") Message-ID: <87350cbirk.fsf_-_@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 65352 Cc: 65352 <at> debbugs.gnu.org X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -3.3 (---) Hi! Simon Tournier <zimon.toutoune@HIDDEN> skribis: > * guix/git/scm (reference-available?): Rely of the procedure resolve-refe= rence > to determine if the reference belongs to the local Git checkout. LGTM too, thanks! Ludo=E2=80=99.
guix-patches@HIDDEN:bug#65352; Package guix-patches.
Full text available.
Received: (at 65352) by debbugs.gnu.org; 17 Aug 2023 16:08:59 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Aug 17 12:08:59 2023
Received: from localhost ([127.0.0.1]:45403 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qWfYR-0004ys-3O
for submit <at> debbugs.gnu.org; Thu, 17 Aug 2023 12:08:59 -0400
Received: from mail-lj1-x235.google.com ([2a00:1450:4864:20::235]:37929)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <zimon.toutoune@HIDDEN>) id 1qWfYO-0004yd-32
for 65352 <at> debbugs.gnu.org; Thu, 17 Aug 2023 12:08:58 -0400
Received: by mail-lj1-x235.google.com with SMTP id
38308e7fff4ca-2b9cb0bb04bso21716631fa.0
for <65352 <at> debbugs.gnu.org>; Thu, 17 Aug 2023 09:08:56 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20221208; t=1692288530; x=1692893330;
h=cc:to:subject:message-id:date:from:in-reply-to:references
:mime-version:from:to:cc:subject:date:message-id:reply-to;
bh=HjO11gvKcp5CGFhetkz9p/9OiMR6HRwXQFEhO6aTmI8=;
b=SwZsAyyzFVoPoRXRahaeZRTuE33bW6WxgTQDE3mO7h/rDQPgvz4WmT3gOB9gYv7UK0
qzV0h4kNcu31jWBaQlvnwqKv7Qpc9mfBuLkwFveb+HToG+hegqoicXYI/wksuKcJESuh
ofNjlvWsNTFOvhMfM/APJTulE4kJ9tfX9uaGa9RmpUUfDNX9ldwqHieeCFbvGYGP1w9Y
UrPZFwGB2MVlyTgoweUGndipZn5D5nXo+h6cZYrwQZx2iXjF7NvRIwyal6x30PuZ2ETT
Yse8Dm6R4V4h5YGLV4AshFms/9roOiW33Ou8EgRP3+ZxzczyweMabO9wKCqmFne0EUmX
CZRQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20221208; t=1692288530; x=1692893330;
h=cc:to:subject:message-id:date:from:in-reply-to:references
:mime-version:x-gm-message-state:from:to:cc:subject:date:message-id
:reply-to;
bh=HjO11gvKcp5CGFhetkz9p/9OiMR6HRwXQFEhO6aTmI8=;
b=F2jGb8PFPWKeghBZy6Ez7EgfgvpPt071ziweZFzse6fnFB0Oul0qQglbWY2vJmnDKO
VS4iPsHxFJjuUpZik1bY525JV21b+ILVIDfnIqdt0SNR6NPIlqIthjGN7nrAFv9xH6Ya
L67+j+YTLpdCL9ss4krgQ88rM/fqia2Rjd2tHpePoPhdJ9ubmhwLACG1AsqYAn0sds0o
ITJqcLxkYC+R4U+FouOQNPeqACRwsOAvCy5O1MoXX0OcgVk17oZDMUfxxIHpQM8+qtL1
9yoQ/y563dbNf/TZM9Cpgp5+7CUxEYGyfU3fp7CoaOIxvGnXxncnUMmG3xbIKHNJu9gQ
IsnA==
X-Gm-Message-State: AOJu0YzzUPfiSE2MXmgHfXPlLQbcPlzAWvVcB9cuVHAAJv2+5oDeMGv8
CdmKTYR8IgkqtaMaV2sla1iTJ2HPUGDLQ7Q+oz8=
X-Google-Smtp-Source: AGHT+IHFvzHpoVXkU5gso6STIaJwCOk94LzQQ9haUrnEb4PgYOTDypkHxq3pjqjaPd1LoNM2Vm4c9VJZoEhr+bKyy6c=
X-Received: by 2002:a05:651c:1506:b0:2b9:a156:6239 with SMTP id
e6-20020a05651c150600b002b9a1566239mr5529732ljf.1.1692288529628; Thu, 17 Aug
2023 09:08:49 -0700 (PDT)
MIME-Version: 1.0
References: <c5156f9a756c2a6a304dc789c00abf533c787fd8.1692281315.git.zimon.toutoune@HIDDEN>
<444e7e32d49b56ba6cb0a132e97d63560d8de437.1692281315.git.zimon.toutoune@HIDDEN>
<87o7j5fzg8.fsf_-_@HIDDEN>
In-Reply-To: <87o7j5fzg8.fsf_-_@HIDDEN>
From: Simon Tournier <zimon.toutoune@HIDDEN>
Date: Thu, 17 Aug 2023 18:08:38 +0200
Message-ID: <CAJ3okZ0NHQ0z1-+VB+bONKL2y85rb00dc9zjj98MeC9o9C86TQ@HIDDEN>
Subject: Re: bug#65352: Fix time-machine and network
To: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
Content-Type: text/plain; charset="UTF-8"
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 65352
Cc: 65352 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
Hi Maxim,
On Thu, 17 Aug 2023 at 17:42, Maxim Cournoyer <maxim.cournoyer@HIDDEN> wrote:
> > (match ref
> > - ((or ('commit . commit)
> > - ('tag-or-commit . commit))
> > + (('tag-or-commit . commit)
> Not that channel-list is a public API, so this is effectively changing
> the contract, no?
Well, the contract is not clearly defined. ;-)
The REF is defined by the docstring of update-cached-checkout,
REF is pair whose key is [branch | commit | tag | tag-or-commit ] and value
the associated data: [<branch name> | <sha1> | <tag name> | <string>].
If REF is the empty list, the remote HEAD is used.
Therefore, if we want to be compliant with the public API, we also
need to add 'tag' to the 'or' match case; as I suggested when
commenting your patch tweaking this part. :-)
Well, from my point of view, the alternative is:
a)
(match ref
(('tag-or-commit . commit)
(channel (inherit c)
(url url) (commit commit) (branch #f)))
(('branch . branch)
(channel (inherit c)
(url url) (commit #f) (branch branch)))
(#f
(channel (inherit c) (url url))))
or b)
(match ref
((or ('commit . commit)
('tag-or-commit . commit)
('tag . commit))
(channel (inherit c)
(url url) (commit commit) (branch #f)))
(('branch . branch)
(channel (inherit c)
(url url) (commit #f) (branch branch)))
(#f
(channel (inherit c) (url url)))))
but not ecab937897385fce3e3ce0c5f128afba4304187c. :-)
Cheers,
simon
guix-patches@HIDDEN:bug#65352; Package guix-patches.
Full text available.
Received: (at 65352) by debbugs.gnu.org; 17 Aug 2023 15:42:11 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Aug 17 11:42:11 2023
Received: from localhost ([127.0.0.1]:45358 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qWf8U-0001bp-Vw
for submit <at> debbugs.gnu.org; Thu, 17 Aug 2023 11:42:11 -0400
Received: from mail-qk1-x72d.google.com ([2607:f8b0:4864:20::72d]:53568)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <maxim.cournoyer@HIDDEN>) id 1qWf8R-0001bP-AN
for 65352 <at> debbugs.gnu.org; Thu, 17 Aug 2023 11:42:09 -0400
Received: by mail-qk1-x72d.google.com with SMTP id
af79cd13be357-76d77d2ee36so91168485a.3
for <65352 <at> debbugs.gnu.org>; Thu, 17 Aug 2023 08:42:07 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20221208; t=1692286921; x=1692891721;
h=mime-version:user-agent:message-id:in-reply-to:date:references
:subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to;
bh=EahWBKelENRPSUwO3lHZYu77Nf2BimXR1G4cSe3s3so=;
b=g15qJoPDhqlW77QB90T704ixy4XKYJEMO8gUufRjuembIb6WWVl+sLVm8M4DvOYRjE
6ahKbMjvlpraUzzth7xlKwzzERfOV+QBfp6Fyy19GpF+L3G8nJugzloXW4dqZiCg+fkO
FKluDHm7bQ10auECVXYZAyiX9J7yzsCk+iDuTqrW0ZB+Y56AgIhetrIXeQ7cY/6ESou7
Jj2GjU9HijhDHyw0Qd/kS/svJs499bdhFWHXsdiFdzjnuPQ7hFSnPjtuBa9NVrTNlZ57
v3Ee1Jn5X1PicIY9Qij89YxjE34Ce0A3XRbWcNBzstSLDDxKyl0HOgnl7b/nEwA66DfO
G2TA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20221208; t=1692286921; x=1692891721;
h=mime-version:user-agent:message-id:in-reply-to:date:references
:subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date
:message-id:reply-to;
bh=EahWBKelENRPSUwO3lHZYu77Nf2BimXR1G4cSe3s3so=;
b=BQ05MXhGTOIbx7A8zGqfHyfCJXOP6ZvvD1V2x8g4E1tTBIhxcrCcWSE0xwpW+THOqY
CS8niJwIursYSAwS+kDePm0FOFgPVsHFz3olIA3neo/c5Ur30yMwsQH6mqb3MiDDJDEc
4QLUj0otQTAE9/wOjitxsNnhjUKYIWtHWF7XFY4rnMpmVIRETg3C/gwJSO+QHKtSJ9IS
flpqHdCbTFrbwMmnTbUHhF2Ovc+YSiaEkQIGJX/pXMTnkAxc9RisZir3Ktjmy/7bsM/b
Jf4Gh5Kbefa3pSejZzsj1mQSOUcd8s6Qy6ibZGWrT02JJqOc/x3vBifU0nrgnN1m4AtA
EKvA==
X-Gm-Message-State: AOJu0YxnI7WSNizBGUP4mJDmigZy9kATjzT2aHz8C8MLhg62vXDUzTfF
IRdwU4YWOTN/nz6Gw7GBtNujrRvwYUoI6Lro
X-Google-Smtp-Source: AGHT+IFm9YRkyNMZ78aTP7uKKsGQkOLGHjDqcqfVyWrVVFmh9Qs3rPtZJuN0YSqMEmMtyjazCRASyQ==
X-Received: by 2002:a0c:f554:0:b0:647:2fa7:8e50 with SMTP id
p20-20020a0cf554000000b006472fa78e50mr5024092qvm.24.1692286921373;
Thu, 17 Aug 2023 08:42:01 -0700 (PDT)
Received: from hurd (dsl-152-182.b2b2c.ca. [66.158.152.182])
by smtp.gmail.com with ESMTPSA id
e15-20020a0caa4f000000b0064713c8fab7sm3921033qvb.59.2023.08.17.08.41.59
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Thu, 17 Aug 2023 08:42:00 -0700 (PDT)
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
To: Simon Tournier <zimon.toutoune@HIDDEN>
Subject: Re: bug#65352: Fix time-machine and network
References: <c5156f9a756c2a6a304dc789c00abf533c787fd8.1692281315.git.zimon.toutoune@HIDDEN>
<444e7e32d49b56ba6cb0a132e97d63560d8de437.1692281315.git.zimon.toutoune@HIDDEN>
Date: Thu, 17 Aug 2023 11:41:59 -0400
In-Reply-To: <444e7e32d49b56ba6cb0a132e97d63560d8de437.1692281315.git.zimon.toutoune@HIDDEN>
(Simon Tournier's message of "Thu, 17 Aug 2023 16:09:17 +0200")
Message-ID: <87o7j5fzg8.fsf_-_@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 65352
Cc: 65352 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
Hi Simon,
Simon Tournier <zimon.toutoune@HIDDEN> writes:
> * 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)
Not that channel-list is a public API, so this is effectively changing
the contract, no?
Otherwise, the series LGTM, thank you!
--
Thanks,
Maxim
guix-patches@HIDDEN:bug#65352; Package guix-patches.
Full text available.
Received: (at 65352) by debbugs.gnu.org; 17 Aug 2023 14:09:28 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Aug 17 10:09:28 2023
Received: from localhost ([127.0.0.1]:45278 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qWdgl-0007az-Rt
for submit <at> 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 <zimon.toutoune@HIDDEN>) id 1qWdgj-0007ae-Np
for 65352 <at> 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 <at> 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 <zimon.toutoune@HIDDEN>
To: 65352 <at> debbugs.gnu.org
Subject: [PATCH 2/2] scripts: pull: Remove unused reference pair.
Date: Thu, 17 Aug 2023 16:09:17 +0200
Message-Id: <444e7e32d49b56ba6cb0a132e97d63560d8de437.1692281315.git.zimon.toutoune@HIDDEN>
X-Mailer: git-send-email 2.39.2
In-Reply-To: <c5156f9a756c2a6a304dc789c00abf533c787fd8.1692281315.git.zimon.toutoune@HIDDEN>
References: <c5156f9a756c2a6a304dc789c00abf533c787fd8.1692281315.git.zimon.toutoune@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 65352
Cc: Simon Tournier <zimon.toutoune@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* 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)
--
2.38.1
guix-patches@HIDDEN:bug#65352; Package guix-patches.
Full text available.
Received: (at 65352) by debbugs.gnu.org; 17 Aug 2023 14:09:27 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Aug 17 10:09:27 2023
Received: from localhost ([127.0.0.1]:45276 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qWdgl-0007aw-II
for submit <at> 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 <zimon.toutoune@HIDDEN>) id 1qWdgj-0007ad-DP
for 65352 <at> 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 <at> 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 <zimon.toutoune@HIDDEN>
To: 65352 <at> debbugs.gnu.org
Subject: [PATCH 1/2] guix: git: Fix the procedure reference-available?.
Date: Thu, 17 Aug 2023 16:09:16 +0200
Message-Id: <c5156f9a756c2a6a304dc789c00abf533c787fd8.1692281315.git.zimon.toutoune@HIDDEN>
X-Mailer: git-send-email 2.39.2
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 65352
Cc: Simon Tournier <zimon.toutoune@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* 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(-)
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
base-commit: 1b2d43fe016848ea2ec16ff18cbc14340944fc4e
--
2.38.1
guix-patches@HIDDEN:bug#65352; Package guix-patches.
Full text available.
Received: (at submit) by debbugs.gnu.org; 17 Aug 2023 14:07:28 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Aug 17 10:07:28 2023
Received: from localhost ([127.0.0.1]:45258 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qWdep-0007Wd-VF
for submit <at> debbugs.gnu.org; Thu, 17 Aug 2023 10:07:28 -0400
Received: from lists.gnu.org ([2001:470:142::17]:57194)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <zimon.toutoune@HIDDEN>) id 1qWdem-0007WO-6r
for submit <at> debbugs.gnu.org; Thu, 17 Aug 2023 10:07:26 -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 <zimon.toutoune@HIDDEN>)
id 1qWdeb-0004IC-Cs
for guix-patches@HIDDEN; Thu, 17 Aug 2023 10:07:13 -0400
Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <zimon.toutoune@HIDDEN>)
id 1qWdeX-00064r-Ov
for guix-patches@HIDDEN; Thu, 17 Aug 2023 10:07:12 -0400
Received: by mail-wm1-x32d.google.com with SMTP id
5b1f17b1804b1-3fe5c552dd0so16677995e9.0
for <guix-patches@HIDDEN>; Thu, 17 Aug 2023 07:07:08 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20221208; t=1692281227; x=1692886027;
h=content-transfer-encoding:mime-version:message-id:date:references
:subject:to:from:from:to:cc:subject:date:message-id:reply-to;
bh=YYJuyaRyJLT5omVyNSNwnUYL7cbOXodIxSTQRdJNy4E=;
b=o8I4hMCDzDh5Qjp7ip/7/+LVAMCowNEbcl4lBWB1pXOZKj4faQFkzIzjMQR7AutCDn
tc58FTjDxfSVNttUNCMrM+uIBWAueQaizoCS4ta8f1PjcWTjbk7BxMGc4of3dCBDuaxo
ATHVfmG/H2QjNfqBxYWrj19ZcQ8pildwgzr0Lq5n4BBcu4IR5HVYC3rX27jF180hvJSU
uOJIa/9VBu11VKXWn4l7Nrg8kF+Yk3Xs36BI1DUtgKFnqWGFUMbUd6gJTVCbs3VNbBGw
TzoyJHqDDMx7mNwqFVdTOyeLi5VVnkSfTuZAKdP7iPiTeOMsRzN2cdc6696tkmn1WmfG
qxFA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20221208; t=1692281227; x=1692886027;
h=content-transfer-encoding:mime-version:message-id:date:references
:subject:to:from:x-gm-message-state:from:to:cc:subject:date
:message-id:reply-to;
bh=YYJuyaRyJLT5omVyNSNwnUYL7cbOXodIxSTQRdJNy4E=;
b=NfkKDXORTzwh3q++o61lz7rHRAR78SRcT3hwu5xkUuGoc7zMdHimER9QYZ9KAglpwg
Z2Ze/TxzfseZo6wbrARhkgvUe55uMHNuN1jnvnD4mQL6xVmK6RfBd/P2tfqOxDoiWm+z
vuqzXkNXmqgAVPyYtZAxOsBbHrncZVKEQFlRVqfuePfTqfH8td0EW/q2fv4o2yVaNvZU
YddCkyiLleq2ZbfPeSgDx7SDjn+BOjTK+EGTUSt+G1fXvHGsqTxuh/6DCADxNv/bEgAW
nlsnANpXTV33AtgzJINEE4k8PXDNTfUvs7K3xBr/eKU8tJUW24b09yauowrtrzBTz+mn
eksw==
X-Gm-Message-State: AOJu0YwGm+d5R06roqk0qPSYKjW/mHzGx97NKtgkJnNqZZ2XFUYzOkhZ
K6FdLJVjvKjvFnCGgWD2/AAAzeq4B9g=
X-Google-Smtp-Source: AGHT+IEJT/g0ATQp67Jd/B1wEq/ck1WwJnguz1dplDlYocJwYvviTVdDSgT7PuN+hQpgaUcb2WNSvw==
X-Received: by 2002:a05:600c:46d4:b0:3fe:5228:b78c with SMTP id
q20-20020a05600c46d400b003fe5228b78cmr4599907wmo.1.1692281227298;
Thu, 17 Aug 2023 07:07:07 -0700 (PDT)
Received: from pfiuh07 ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id
p12-20020a05600c204c00b003fe1ca92151sm3095711wmg.26.2023.08.17.07.07.06
for <guix-patches@HIDDEN>
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Thu, 17 Aug 2023 07:07:07 -0700 (PDT)
From: Simon Tournier <zimon.toutoune@HIDDEN>
To: guix-patches@HIDDEN
Subject: Fix time-machine and network
References: <87fs4ij0cs.fsf@HIDDEN>
X-Debbugs-CC: Maxim Cournoyer <maxim.cournoyer@HIDDEN>, ludo@HIDDEN
Date: Thu, 17 Aug 2023 16:06:50 +0200
Message-ID: <87fs4h4vb9.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Received-SPF: pass client-ip=2a00:1450:4864:20::32d;
envelope-from=zimon.toutoune@HIDDEN; helo=mail-wm1-x32d.google.com
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001,
RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001,
SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: 1.0 (+)
X-Debbugs-Envelope-To: submit
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.0 (/)
Hi,
As discussed in patch#64746, here the fix. :-)
-------------------- Start of forwarded message --------------------
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
Date: Wed, 16 Aug 2023 14:41:55 -0400
Simon Tournier <zimon.toutoune@HIDDEN> writes:
> Please note that if git.savannah.gnu.org is not reachable, then =E2=80=9C=
guix
> time-machine=E2=80=9D fails.
>
> Let start with the regular:
>
> $ guix describe
> Generation 26 Jul 12 2023 09:13:39 (current)
> guix 4a027d2
> repository URL: https://git.savannah.gnu.org/git/guix.git
> branch: master
> commit: 4a027d2b0ee68e39f21f6802a8cd1751d3065330
>
> $ guix time-machine --commit=3D4a027d2 -- describe
> Updating channel 'guix' from Git repository at 'https://git.savannah.gnu.=
org/git/guix.git'...
> substitute: updating substitutes from 'https://ci.guix.gnu.org'... 100.0%
> substitute: updating substitutes from 'https://bordeaux.guix.gnu.org'... =
100.0%
> building /gnu/store/sg8ca36rlbh4il6jy8dk2gr33lxm4z8q-compute-guix-derivat=
ion.drv...
> Computing Guix derivation for 'x86_64-linux'... |
> substitute: updating substitutes from 'https://ci.guix.gnu.org'... 100.0%
> substitute: updating substitutes from 'https://bordeaux.guix.gnu.org'... =
100.0%
> The following derivations will be built:
> [...]
> building profile with 1 package...
> guix 4a027d2
> repository URL: https://git.savannah.gnu.org/git/guix.git
> commit: 4a027d2b0ee68e39f21f6802a8cd1751d3065330
>
>
> So far, so good. Here all is cached and so on. Now, let make
> git.savannah.gnu.org unreachable by tweaking some stuff. Then,
>
> $ guix time-machine --commit=3D4a027d2 -- describe
> guix time-machine: error: Git error: failed to resolve address for git.sa=
vannah.gnu.org: Name or service not known
Interesting finding! I think it'd make sense to raise this issue
separately and discuss its resolution there, too keep things focused and
discoverable :-).
-------------------- End of forwarded message --------------------
The issue is introduced by commit
dce2cf311bc12dee4560329f53ccb53470d5793e in the procedure
reference-available?. The variable =E2=80=99ref=E2=80=99 is the pair
(tag-or-commit . "123abc")
and fails with commit-id? in
(match ref
((or ('commit . commit)
('tag-or-commit . (? commit-id? commit)))
Therefore, reference-available? returns #f and the =E2=80=99when=E2=80=99 b=
ranch is run
in update-cached-checkout.
;; Only fetch remote if it has not been cloned just before.
(when (and cache-exists?
(not (reference-available? repository ref)))
(remote-fetch (remote-lookup repository "origin")
#:fetch-options (make-default-fetch-options)))
Hence the network access required by remote-fetch.
Well, the heavy work to know if the reference is available or not in the
local checkout is done by =E2=80=99resolve-reference=E2=80=99 in (guix git)=
doing all
the cases, and especially dealing with tag-or-commit:
(match ref
(('branch . branch)
(let ((oid (reference-target
(branch-lookup repository branch BRANCH-REMOTE))))
(object-lookup repository oid)))
(('commit . commit)
(let ((len (string-length commit)))
;; 'object-lookup-prefix' appeared in Guile-Git in Mar. 2018, so=
we
;; can't be sure it's available. Furthermore, 'string->oid' use=
d to
;; read out-of-bounds when passed a string shorter than 40 chars,
;; which is why we delay calls to it below.
(if (< len 40)
(if (module-defined? (resolve-interface '(git object))
'object-lookup-prefix)
(object-lookup-prefix repository (string->oid commit) le=
n)
(raise (condition
(&message
(message "long Git object ID is required")))))
(object-lookup repository (string->oid commit)))))
(('tag-or-commit . str)
(if (or (> (string-length str) 40)
(not (string-every char-set:hex-digit str)))
(resolve `(tag . ,str)) ;definitely a tag
(catch 'git-error
(lambda ()
(resolve `(tag . ,str)))
(lambda _
;; There's no such tag, so it must be a commit ID.
(resolve `(commit . ,str))))))
(('tag . tag)
(let ((oid (reference-name->oid repository
(string-append "refs/tags/" tag))))
(object-lookup repository oid))))
Instead of duplicating, I propose to reuse it. See the trivial first
patch. I think it fixes the annoyance.
Aside, please note that (guix channels) provide commit-or-tag. It
change nothing but I would find more consistent to have the same
nomenclature.
--8<---------------cut here---------------start------------->8---
(define (sexp->channel-news-entry entry)
"Return the <channel-news-entry> record corresponding to ENTRY, an sexp."
(define (pair language message)
(cons (symbol->string language) message))
(match entry
(('entry ((and (or 'commit 'tag) type) commit-or-tag)
('title ((? symbol? title-tags) (? string? titles)) ...)
('body ((? symbol? body-tags) (? string? bodies)) ...)
_ ...)
(channel-news-entry (and (eq? type 'commit) commit-or-tag)
(and (eq? type 'tag) commit-or-tag)
--8<---------------cut here---------------end--------------->8---
WDYT about tag-or-commit everywhere?
Last, as I pointed in a naive comment [1], I do not think that
guix/scripts/pull.scm or guix/time-machine.scm need to support both the
pair (commit . x) and (tag-or-commit . x) because the value =E2=80=99ref=E2=
=80=99 is set
by the option. Hence the second patch.
1: https://yhetil.org/guix/87o7j7f2tb.fsf@HIDDEN
Let me know if I am not missing something.
Cheers,
simon
Simon Tournier <zimon.toutoune@HIDDEN>:maxim.cournoyer@HIDDEN, ludo@HIDDEN, guix-patches@HIDDEN.
Full text available.maxim.cournoyer@HIDDEN, ludo@HIDDEN, guix-patches@HIDDEN:bug#65352; Package guix-patches.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.