Maxim Cournoyer <maxim.cournoyer@HIDDEN>
to control <at> debbugs.gnu.org.
Full text available.
Received: (at submit) by debbugs.gnu.org; 21 Jul 2023 17:53:06 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Jul 21 13:53:06 2023
Received: from localhost ([127.0.0.1]:34831 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qMuJN-0000qr-QI
for submit <at> debbugs.gnu.org; Fri, 21 Jul 2023 13:53:06 -0400
Received: from lists.gnu.org ([2001:470:142::17]:49408)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <maxim.cournoyer@HIDDEN>) id 1qMuJJ-0000qD-Hj
for submit <at> debbugs.gnu.org; Fri, 21 Jul 2023 13:53:03 -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 <maxim.cournoyer@HIDDEN>)
id 1qMuJE-0001SM-3r
for guix-patches@HIDDEN; Fri, 21 Jul 2023 13:52:56 -0400
Received: from mail-qt1-x830.google.com ([2607:f8b0:4864:20::830])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <maxim.cournoyer@HIDDEN>)
id 1qMuJB-00033v-Tz
for guix-patches@HIDDEN; Fri, 21 Jul 2023 13:52:55 -0400
Received: by mail-qt1-x830.google.com with SMTP id
d75a77b69052e-40398ccdaeeso15758151cf.3
for <guix-patches@HIDDEN>; Fri, 21 Jul 2023 10:52:53 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20221208; t=1689961973; x=1690566773;
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=MMcW+mVTqL21dQ6c3FVqzihnu3X1pyBj2w8C/XKJHs4=;
b=livBftLR2y+EZvHCmeP8QKbR/ZayTWBulf88D5AymWs9HZLZltC/ddXdv1OTcShVEw
R+LDzmovlkANf34nIPvQys+Q3xAQUJDV0fdNAChhIlct1jM5TueSzUa5nMUBlyShTrUO
uWpOY0J9ZNxmRDuF/nGT5GQuxtIa3fimDNj4D9xWq3TttjGVxjhnU/W7mIbtXjG5GwIx
1SN40TCbuNXVgsQi8o/zbRdfcQh3QTlkg3hXYnsoXBK92zzFiR83+84MH5d+zX1/iQdZ
xW53xbSITHcDgb0v35ZjFjRqtpgohto9wiMYK8IV91eShVKs3qGHjsLVZGfOLPHaOJRb
tU4w==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20221208; t=1689961973; x=1690566773;
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=MMcW+mVTqL21dQ6c3FVqzihnu3X1pyBj2w8C/XKJHs4=;
b=F+C+s/R/j4dq0vjtnSVL5WuSsXKzQHsNmJURy3DjBmXszOBLGgKiLhnU0LYDxUlHHr
HIXngB8OnSW9cMfqWnzdw6QbhTf5Tx9w/uch6UtN1ZUfOgA/dHejjQyjnp/VvMtUnt3V
64nZn9SPag+B1PrVhdUF8tgsCD0eX+X41nsR3Y+nfWcp9t63M4l7ne2Lg6lZW71DD5gO
90zQ8kEOWM6NNvEx10D/qEpvf5tBEjMGN5WtV0IRobl6yHk0ewcfdVIs+ANv3dCpYF4E
Ib0fXX6KY7heb949KlsbtxqbtrWF8sa83dY1Ii+fypvwtPeScSgA+CdDBqTJzNZoKQ78
mu4A==
X-Gm-Message-State: ABy/qLZZtgAr7025M5b9A7MC/Q2faBMqj+c9X1iFqXpYN0I76m9O+Ccg
cK0qwOZGXb7vRx5jdx8U4Ag=
X-Google-Smtp-Source: APBJJlHFv5anDFE5YOC5xC5dUl6G4sNipCYaWhLEmda8WNfjEOfMf0L5p9NymtF69GCFf3kSwybHhw==
X-Received: by 2002:ac8:5f93:0:b0:400:a2b8:1c97 with SMTP id
j19-20020ac85f93000000b00400a2b81c97mr892819qta.17.1689961972674;
Fri, 21 Jul 2023 10:52:52 -0700 (PDT)
Received: from hurd (dsl-10-135-166.b2b2c.ca. [72.10.135.166])
by smtp.gmail.com with ESMTPSA id
l3-20020ac87243000000b003f394decd08sm1384827qtp.62.2023.07.21.10.52.52
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Fri, 21 Jul 2023 10:52:52 -0700 (PDT)
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
To: guix-patches@HIDDEN
Subject: Re: [PATCH 2/2] scripts: time-machine: Error when attempting to
visit too old commits.
References: <ba91013b705bcfd8a6e63c9921aa62ec9ed44283.1689823730.git.maxim.cournoyer@HIDDEN>
<a058a4de3330a6f9cf41456e0781c3865dff0553.1689823730.git.maxim.cournoyer@HIDDEN>
Date: Fri, 21 Jul 2023 13:52:51 -0400
In-Reply-To: <a058a4de3330a6f9cf41456e0781c3865dff0553.1689823730.git.maxim.cournoyer@HIDDEN>
(Maxim Cournoyer's message of "Wed, 19 Jul 2023 23:28:51 -0400")
Message-ID: <87351hi230.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
Received-SPF: pass client-ip=2607:f8b0:4864:20::830;
envelope-from=maxim.cournoyer@HIDDEN; helo=mail-qt1-x830.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,
T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: 1.0 (+)
X-Debbugs-Envelope-To: submit
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: -0.0 (/)
Hi,
Maxim Cournoyer <maxim.cournoyer@HIDDEN> writes:
> * doc/guix.texi (Invoking guix time-machine): Document limitation.
> * guix/scripts/time-machine.scm (%oldest-possible-commit): New variable.
> (guix-time-machine): Raise an error when the channel commit is too old.
So I did the following test:
$ guix time-machine --commit=3D2ca299caf -- shell hello -- hello
which after building Guile 2.2.4 crashed with:
--8<---------------cut here---------------start------------->8---
construction de /gnu/store/rj2g4x23lqyaq16471qm94xp90slxp3h-compute-guix-de=
rivation.drv...
|d=C3=A9chargement de la construction de /gnu/store/rj2g4x23lqyaq16471qm94x=
p90slxp3h-compute-guix-derivation.drv sur =C2=AB 10.0.0.7 =C2=BB
Computing Guix derivation for 'x86_64-linux'... Backtrace:
- 5 (primitive-load "/gnu/store/b70mihsj9xx0xxp6izliqb5vm4=E2=80=
=A6")
In ice-9/eval.scm:
155:9 4 (_ _)
159:9 3 (_ #(#(#(#(#(#(#(#(#(#(#(=E2=80=A6) =E2=80=A6) =E2=80=A6) =E2=
=80=A6) =E2=80=A6) =E2=80=A6) =E2=80=A6) =E2=80=A6) =E2=80=A6) =E2=80=A6) =
=E2=80=A6))
173:47 2 (_ #(#(#(#(#(#(#(#(#(#(#(=E2=80=A6) =E2=80=A6) =E2=80=A6) =E2=
=80=A6) =E2=80=A6) =E2=80=A6) =E2=80=A6) =E2=80=A6) =E2=80=A6) =E2=80=A6) =
=E2=80=A6))
In ./guix/self.scm:
932:4 1 (guix-derivation "/gnu/store/yfn2s94i5bvwr7j7r6xcnivwg=E2=80=
=A6" =E2=80=A6)
903:2 0 (guile-for-build "3.0")
./guix/self.scm:903:2: In procedure guile-for-build:
Throw to key `match-error' with args `("match" "no matching pattern" "3.0")=
'.
Backtrace:
In ice-9/boot-9.scm:
1752:10 19 (with-exception-handler _ _ #:unwind? _ # _)
In guix/store.scm:
659:37 18 (thunk)
In guix/status.scm:
839:4 17 (call-with-status-report _ _)
In guix/store.scm:
1298:8 16 (call-with-build-handler #<procedure 7fbf6ea46930 at g=E2=80=
=A6> =E2=80=A6)
2168:25 15 (run-with-store #<store-connection 256.99 7fbf7448ea50> =E2=80=
=A6)
In guix/inferior.scm:
927:8 14 (_ _)
In guix/channels.scm:
982:2 13 (_ _)
924:2 12 (_ _)
In ./guix/monads.scm:
487:9 11 (_ _)
In guix/store.scm:
1996:8 10 (_ _)
In guix/channels.scm:
675:14 9 (_ #<store-connection 256.99 7fbf7448ea50>)
In guix/store.scm:
2168:25 8 (run-with-store #<store-connection 256.99 7fbf7448ea50> =E2=80=
=A6)
1298:8 7 (call-with-build-handler _ _)
1298:8 6 (call-with-build-handler #<procedure 7fbf6f7bd8d0 at g=E2=80=
=A6> =E2=80=A6)
In guix/channels.scm:
690:14 5 (_)
In guix/store.scm:
2168:25 4 (run-with-store #<store-connection 256.99 7fbf7448ea50> =E2=80=
=A6)
In ice-9/eval.scm:
191:27 3 (_ #(#(#<directory (build-self) 7fbf6c40d960> #<pr=E2=80=A6>) =
=E2=80=A6))
In ice-9/boot-9.scm:
2007:7 2 (error _ . _)
1685:16 1 (raise-exception _ #:continuable? _)
1685:16 0 (raise-exception _ #:continuable? _)
ice-9/boot-9.scm:1685:16: In procedure raise-exception:
invalid build result (#<derivation /gnu/store/rj2g4x23lqyaq16471qm94xp90slx=
p3h-compute-guix-derivation.drv =3D> /gnu/store/b70mihsj9xx0xxp6izliqb5vm46=
2yifl-compute-guix-derivation 7fbf5bf82c30> "")
--8<---------------cut here---------------end--------------->8---
Thoughts?
--=20
Thanks,
Maxim
guix-patches@HIDDEN:bug#64737; Package guix-patches.
Full text available.
Received: (at submit) by debbugs.gnu.org; 20 Jul 2023 03:31:05 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Jul 19 23:31:05 2023
Received: from localhost ([127.0.0.1]:57417 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qMKNd-00067O-EB
for submit <at> debbugs.gnu.org; Wed, 19 Jul 2023 23:31:05 -0400
Received: from lists.gnu.org ([2001:470:142::17]:53674)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <maxim.cournoyer@HIDDEN>) id 1qMKNX-00066N-RY
for submit <at> debbugs.gnu.org; Wed, 19 Jul 2023 23:31:04 -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 <maxim.cournoyer@HIDDEN>)
id 1qMKNR-0008LD-PS
for guix-patches@HIDDEN; Wed, 19 Jul 2023 23:30:53 -0400
Received: from mail-qt1-x830.google.com ([2607:f8b0:4864:20::830])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <maxim.cournoyer@HIDDEN>)
id 1qMKNP-0002FE-WD
for guix-patches@HIDDEN; Wed, 19 Jul 2023 23:30:53 -0400
Received: by mail-qt1-x830.google.com with SMTP id
d75a77b69052e-4039a2b71c1so3177471cf.0
for <guix-patches@HIDDEN>; Wed, 19 Jul 2023 20:30:51 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20221208; t=1689823850; x=1690428650;
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=nNZ1aIR2FtJiGSwA7Zhg8LuLbfrjVr6S874lvlGoMEk=;
b=efn5hmgrOuWTq53ocblEzCYbliUS9HkPIXj9DVVldCzRmVSgwEmYbHzhy33WxX5eTF
3Md7Tmudwh1aPv2CpChrK1WvjB6lHvqkpZcyXHIDCwcNnQPCf4g8ZPPJCGRvSBTHCtLF
fSDhlHXDqszNn6xFsKq64cEgJ5x6+4ryIBZCQKZemd0OEOtazIjhsKqeJivrpO0LIfYX
Yj053QUolVIA+YoERiGF7OAeDJZGA6sQp281nxS+HQCV9TECvJjh9dao5iKUM0Hms6/2
sykkQeIiCV5ATIQ7TT0a+eGMYj3dY493+9JveCtMmcQ5pMAbglDhjE8ew/6taklkftW4
BdGA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20221208; t=1689823850; x=1690428650;
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=nNZ1aIR2FtJiGSwA7Zhg8LuLbfrjVr6S874lvlGoMEk=;
b=ZGm1hgKuRW5G5d+vhWjHONTaGRjkWPRp92zT/2EQUEp8Yen7JrCKEXWZsfwxDLYEhY
DWIbzujG08GAJphRRV17sRxsncTuN+AM4MbzpRtlYr7BTMv2owfnHxyPJnCxekk60Eox
ul2KvhdNKkUNV2LEEYrKMR5e5c6V8YqZKduPZwY2pVCjMeitIe8Pp3/0s9y2h9S40+09
F3QxXXndpQ8TqWTHh0ggB5IyBDeAKX+WMtQERRBDkjBLPVivZsF1qT40F/z3wEpoSD0o
1+t9PTe+m702l9UmZIh4UuupPnvtgPaD9ckBMN7j+S/uOHcRuiLvMeNk/R+fkakjFKzz
dpJA==
X-Gm-Message-State: ABy/qLZp1JQ9Q6lp+T4M888IAM9BDqqIOo6phwa3E8HHUo6NeADfu1tF
UVZH4PYuw11O/A44exJRqBEZQD/LKzY=
X-Google-Smtp-Source: APBJJlHO/xCM7o5V9EXYJNLFU1+C2pPySLVKnDhQsG0OS4nScydxqpdks5OnUvIbZYgnFOvQ3MHwfw==
X-Received: by 2002:ac8:5914:0:b0:403:ae76:d0a3 with SMTP id
20-20020ac85914000000b00403ae76d0a3mr23232139qty.8.1689823850392;
Wed, 19 Jul 2023 20:30:50 -0700 (PDT)
Received: from localhost.localdomain (dsl-159-145.b2b2c.ca. [66.158.159.145])
by smtp.gmail.com with ESMTPSA id
s15-20020ac8528f000000b003f9efa2ddb4sm31495qtn.66.2023.07.19.20.30.49
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Wed, 19 Jul 2023 20:30:50 -0700 (PDT)
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
To: guix-patches@HIDDEN,
maxim.cournoyer@HIDDEN
Subject: [PATCH 2/2] scripts: time-machine: Error when attempting to visit too
old commits.
Date: Wed, 19 Jul 2023 23:28:51 -0400
Message-ID: <a058a4de3330a6f9cf41456e0781c3865dff0553.1689823730.git.maxim.cournoyer@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <ba91013b705bcfd8a6e63c9921aa62ec9ed44283.1689823730.git.maxim.cournoyer@HIDDEN>
References: <ba91013b705bcfd8a6e63c9921aa62ec9ed44283.1689823730.git.maxim.cournoyer@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Christopher Baines <mail@HIDDEN>, Josselin Poiret <dev@HIDDEN>, Ludovic Courtès <ludo@HIDDEN>, Mathieu Othacehe <othacehe@HIDDEN>, Ricardo Wurmus <rekado@HIDDEN>, Simon Tournier <zimon.toutoune@HIDDEN>, Tobias Geerinckx-Rice <me@HIDDEN>
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
Received-SPF: pass client-ip=2607:f8b0:4864:20::830;
envelope-from=maxim.cournoyer@HIDDEN; helo=mail-qt1-x830.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,
T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: 1.0 (+)
X-Debbugs-Envelope-To: submit
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: -0.0 (/)
* doc/guix.texi (Invoking guix time-machine): Document limitation.
* guix/scripts/time-machine.scm (%oldest-possible-commit): New variable.
(guix-time-machine): Raise an error when the channel commit is too old.
Suggested-by: Simon Tournier <zimon.toutoune@HIDDEN>
---
doc/guix.texi | 6 ++++++
guix/scripts/time-machine.scm | 23 ++++++++++++++++++++++-
2 files changed, 28 insertions(+), 1 deletion(-)
diff --git a/doc/guix.texi b/doc/guix.texi
index 1d8ebcd72f..30fef813c0 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -5056,6 +5056,12 @@ Invoking guix time-machine
large number of packages; the result is cached though and subsequent
commands targeting the same commit are almost instantaneous.
+Due to @command{guix time-machine} relying on the ``inferiors''
+mechanism (@pxref{Inferiors}), the oldest commit it can travel to is
+commit @samp{2ca299caf} (``Add (guix inferior) and (guix scripts
+repl).''), dated July 10@sup{th}, 2018. An error is returned when
+attempting to navigate to older commits.
+
@quotation Note
The history of Guix is immutable and @command{guix time-machine}
provides the exact same software as they are in a specific Guix
diff --git a/guix/scripts/time-machine.scm b/guix/scripts/time-machine.scm
index d7c71ef705..36a40a1538 100644
--- a/guix/scripts/time-machine.scm
+++ b/guix/scripts/time-machine.scm
@@ -2,6 +2,7 @@
;;; Copyright © 2019 Konrad Hinsen <konrad.hinsen@HIDDEN>
;;; Copyright © 2019, 2020, 2021 Ludovic Courtès <ludo@HIDDEN>
;;; Copyright © 2021 Simon Tournier <zimon.toutoune@HIDDEN>
+;;; Copyright © 2023 Maxim Cournoyer <maxim.cournoyer@HIDDEN>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -19,13 +20,15 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (guix scripts time-machine)
+ #:use-module (guix channels)
+ #:use-module (guix diagnostics)
#:use-module (guix ui)
#:use-module (guix scripts)
#:use-module (guix inferior)
#:use-module (guix store)
#:use-module (guix status)
#:use-module ((guix git)
- #:select (with-git-error-handling))
+ #:select (update-cached-checkout with-git-error-handling))
#:use-module ((guix utils)
#:select (%current-system))
#:use-module ((guix scripts pull)
@@ -38,9 +41,16 @@ (define-module (guix scripts time-machine)
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-11)
#:use-module (srfi srfi-26)
+ #:use-module (srfi srfi-34)
#:use-module (srfi srfi-37)
+ #:use-module (srfi srfi-71)
#:export (guix-time-machine))
+;;; The commit introducing the 'inferiors' mechanism; it is the oldest commit
+;;; that can be travelled to.
+(define %oldest-possible-commit
+ "2ca299caf64489f4e1e665ec1158fb0309b0b565")
+
;;;
;;; Command-line options.
@@ -139,9 +149,20 @@ (define-command (guix-time-machine . args)
(with-git-error-handling
(let* ((opts (parse-args args))
(channels (channel-list opts))
+ (guix-channel (find guix-channel? channels))
(command-line (assoc-ref opts 'exec))
+ (ref (assoc-ref opts 'ref))
+ (checkout commit relation (update-cached-checkout
+ (channel-url guix-channel)
+ #:ref (or ref '())
+ #:starting-commit
+ %oldest-possible-commit))
(substitutes? (assoc-ref opts 'substitutes?))
(authenticate? (assoc-ref opts 'authenticate-channels?)))
+ (unless (memq relation '(ancestor self))
+ (raise (formatted-message
+ (G_ "cannot travel past commit `~a' from July 10th, 2018")
+ (string-take %oldest-possible-commit 12))))
(when command-line
(let* ((directory
(with-store store
--
2.41.0
mail@HIDDEN, dev@HIDDEN, ludo@HIDDEN, othacehe@HIDDEN, rekado@HIDDEN, zimon.toutoune@HIDDEN, me@HIDDEN, guix-patches@HIDDEN:bug#64737; Package guix-patches.
Full text available.
Received: (at submit) by debbugs.gnu.org; 20 Jul 2023 03:30:07 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Jul 19 23:30:07 2023
Received: from localhost ([127.0.0.1]:57407 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qMKMg-00064K-SU
for submit <at> debbugs.gnu.org; Wed, 19 Jul 2023 23:30:07 -0400
Received: from lists.gnu.org ([2001:470:142::17]:54382)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <maxim.cournoyer@HIDDEN>) id 1qMKMb-00063J-NQ
for submit <at> debbugs.gnu.org; Wed, 19 Jul 2023 23:30:04 -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 <maxim.cournoyer@HIDDEN>)
id 1qMKMV-0008Gu-1a
for guix-patches@HIDDEN; Wed, 19 Jul 2023 23:29:55 -0400
Received: from mail-qt1-x82c.google.com ([2607:f8b0:4864:20::82c])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <maxim.cournoyer@HIDDEN>)
id 1qMKMT-0001yC-Lj
for guix-patches@HIDDEN; Wed, 19 Jul 2023 23:29:54 -0400
Received: by mail-qt1-x82c.google.com with SMTP id
d75a77b69052e-403a840dc64so3378391cf.1
for <guix-patches@HIDDEN>; Wed, 19 Jul 2023 20:29:52 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20221208; t=1689823792; x=1690428592;
h=content-transfer-encoding:mime-version:message-id:date:subject:to
:from:from:to:cc:subject:date:message-id:reply-to;
bh=3F/dP1pNvRjizmMf7gYUgVhLR/8fTyiWwdqVlOAJ1rE=;
b=ZcWufrDZhc/MlPkuW0lmlt4XebJvQKOYkaAifK6seEJ4h/cbLU3lXGJFkXYe2BvbY8
lm1qITDMLNP7wpF2dcWpE45wUUEaWwli4EEhonalSzsdfOctZChISGufnhKIGQlKCfN/
/+U8bdeHeItDIr0+n3tzTaZObk3wB1mMXGRhoX8ItClcEL4kjVz33kPI/Tun/HXreNLr
oeEpPUfB+atpFSQbH/FCbMoVcdCKFxrWWL6bbvuJVGWGoaBSOW2/buZdYoXSEUDlJxUS
rqi59I6yFT6eQyN6GUuo8HklP14GNi3UNDQI68WIw1Kq4TEjAHKdmWtcyL/2CMFgSFct
me4w==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20221208; t=1689823792; x=1690428592;
h=content-transfer-encoding:mime-version:message-id:date:subject:to
:from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to;
bh=3F/dP1pNvRjizmMf7gYUgVhLR/8fTyiWwdqVlOAJ1rE=;
b=jq2xbF8CL9wiLLUk2O2BGMvgECAB+NSFLv2VQOG18d816ctKpXSXZEcBwXqYKHkqov
0yIMRBosv1jWTFpAq/Caq/QdGy4fgocWIL77Fd6nxtHIwq8EsqBFHDGq1OwOhXRAl+nR
r+giHgFhhA8rcxDEnwyrHg/N0gQVe+XThO9d7OLvNJEhwLb+IpGTgpZMvL4MhOlG1juk
g+/PWdUoumQYaJuqx58B9lM6QTKtdVkxXPt0ggDw+XRJ7vd3xwRguhnPujM14fof3bRx
Q4vLVvFaXFhg+TCjtC/nRWVmIql5YHnIqt6t2+/GczJWwjmHEQsWQDzQsVQ2/ZlZnyqb
kGzQ==
X-Gm-Message-State: ABy/qLZxhipiIagDYTg7rd7s2Jg4rf+0IrrxTgLVU+nAyXE2VeLIPf7Z
MfNMZ85LLesjH15Y50ZePfYIcwDFr2w=
X-Google-Smtp-Source: APBJJlHUbyX9FAYOTXcbesdRRbe2AtMKBfiZUoN4K3rf88zhKnb+TkscBfoMF7I+pNOPFuCN7vR3yQ==
X-Received: by 2002:a05:622a:30e:b0:403:8d8a:564e with SMTP id
q14-20020a05622a030e00b004038d8a564emr1096606qtw.62.1689823791988;
Wed, 19 Jul 2023 20:29:51 -0700 (PDT)
Received: from localhost.localdomain (dsl-159-145.b2b2c.ca. [66.158.159.145])
by smtp.gmail.com with ESMTPSA id
s15-20020ac8528f000000b003f9efa2ddb4sm31495qtn.66.2023.07.19.20.29.51
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Wed, 19 Jul 2023 20:29:51 -0700 (PDT)
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
To: guix-patches@HIDDEN,
maxim.cournoyer@HIDDEN
Subject: [PATCH 1/2] git: Clarify commit relation reference in doc.
Date: Wed, 19 Jul 2023 23:28:49 -0400
Message-ID: <ba91013b705bcfd8a6e63c9921aa62ec9ed44283.1689823730.git.maxim.cournoyer@HIDDEN>
X-Mailer: git-send-email 2.41.0
MIME-Version: 1.0
X-Debbugs-Cc: Christopher Baines <mail@HIDDEN>, Josselin Poiret <dev@HIDDEN>, Ludovic Courtès <ludo@HIDDEN>, Mathieu Othacehe <othacehe@HIDDEN>, Ricardo Wurmus <rekado@HIDDEN>, Simon Tournier <zimon.toutoune@HIDDEN>, Tobias Geerinckx-Rice <me@HIDDEN>
Content-Transfer-Encoding: 8bit
Received-SPF: pass client-ip=2607:f8b0:4864:20::82c;
envelope-from=maxim.cournoyer@HIDDEN; helo=mail-qt1-x82c.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,
T_SCC_BODY_TEXT_LINE=-0.01 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 (/)
* guix/git.scm (update-cached-checkout): Clarify that it is the relation of
STARTING-COMMIT that is returned, relative to the new commit, not the other
way around.
---
guix/git.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/guix/git.scm b/guix/git.scm
index be20cde019..dbc3b7caa7 100644
--- a/guix/git.scm
+++ b/guix/git.scm
@@ -439,7 +439,7 @@ (define* (update-cached-checkout url
#:recursive? recursive?)))
"Update the cached checkout of URL to REF in CACHE-DIRECTORY. Return three
values: the cache directory name, and the SHA1 commit (a string) corresponding
-to REF, and the relation of the new commit relative to STARTING-COMMIT (if
+to REF, and the relation of STARTING-COMMIT relative to the new commit (if
provided) as returned by 'commit-relation'.
REF is pair whose key is [branch | commit | tag | tag-or-commit ] and value
base-commit: 1d837aaa32a3a2de8f4a1ac391f92effba50834e
--
2.41.0
Maxim Cournoyer <maxim.cournoyer@HIDDEN>:mail@HIDDEN, dev@HIDDEN, ludo@HIDDEN, othacehe@HIDDEN, rekado@HIDDEN, zimon.toutoune@HIDDEN, me@HIDDEN, guix-patches@HIDDEN.
Full text available.mail@HIDDEN, dev@HIDDEN, ludo@HIDDEN, othacehe@HIDDEN, rekado@HIDDEN, zimon.toutoune@HIDDEN, me@HIDDEN, guix-patches@HIDDEN:bug#64737; Package guix-patches.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.