From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id aGY/M8cD3WQx0gAASxT56A (envelope-from ) for ; Wed, 16 Aug 2023 19:13:43 +0200 Received: from aspmx1.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id QCRfMscD3WQ1WgAAG6o9tA (envelope-from ) for ; Wed, 16 Aug 2023 19:13:43 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 8A8CB481D1 for ; Wed, 16 Aug 2023 19:13:43 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=BSds4Suu; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1692206023; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=xpaaZM7zd0QnCB8dq1tLd/bASjDcrPmsO8xp9q8P/nU=; b=MIZ6jLS3VGaNvZsRUYjnxa7/TUrf5fBjcfcVv3oL21pXpxhOyWYXWIMj36Lrg/HOj64b/p iJJSS1qoDQgcac4E+O5S8Plg4MfTf8JN9VD2gBAqyurt7QAZiAR5h3Ao3cQSqYhqTfm++O Zu+eKoChJ4hfbfe51vLrG7ROx9F6a26yu8EV/2HKQ38a64kga2MBrbi5voR2lNyDs6khwn bHOlqKDwgFUXWKaqkfrjDAlu9AgF3GvOtSjDcHJ3N5a8S+0DXxlG6OdsALdx2QNi4ekupa fW3ewps9A2EUojG7RUIcfIwSySJ1NYFVbM4Mv/C64NSbaUIgHxGIwUmBo2hLjQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=BSds4Suu; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1692206023; a=rsa-sha256; cv=none; b=qdfO1pEE/geccHvjtDmlxwhXL5RKgfp1bwVhTCr3bsu23IXWy0kVVli26K60xsQx4E+lHe XU9mhurx06JzEEhmT6HgyNMhzjb3KCwCia08J3dRbcHHJ8O07a951Qpv0ffds4+pOWwdzP QZzc3SR5GgjpmwOY/mJNjKftfGXtElAJKSRugxnvP0ioRt5bl6TuBBug47wDug4PRYu/fM QofoYZXJSdk3dYCfhcECfdi8wI87D2HIw6+BgZpFLreBay1uJ1XBA7HHNb1Oc4SD+/7c4S Xdtkb6MElMOo8UuRD1BxvMaIUhvD0MrQtJEwI4Q2BonO7DMP1Y0todExM/bIuw== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qWK4I-0001Nm-Uu; Wed, 16 Aug 2023 13:12: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 ) id 1qWK40-00018c-Su for guix-patches@gnu.org; Wed, 16 Aug 2023 13:12:12 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qWK40-0006UC-K1 for guix-patches@gnu.org; Wed, 16 Aug 2023 13:12:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qWK40-0005Ss-Dr for guix-patches@gnu.org; Wed, 16 Aug 2023 13:12:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65229] [PATCH 1/2] pull, time-machine: Add '-q' to ignore channel files. Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 16 Aug 2023 17:12:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65229 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?UTF-8?Q?Court=C3=A8s?= , 65229@debbugs.gnu.org Cc: Josselin Poiret , Tobias Geerinckx-Rice , maurice.bremond@inria.fr, Mathieu Othacehe , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Christopher Baines , Ricardo Wurmus , Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 65229-submit@debbugs.gnu.org id=B65229.169220590620682 (code B ref 65229); Wed, 16 Aug 2023 17:12:08 +0000 Received: (at 65229) by debbugs.gnu.org; 16 Aug 2023 17:11:46 +0000 Received: from localhost ([127.0.0.1]:41927 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qWK3d-0005NO-Hg for submit@debbugs.gnu.org; Wed, 16 Aug 2023 13:11:46 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]:40277) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qWK3a-0005Mi-3L for 65229@debbugs.gnu.org; Wed, 16 Aug 2023 13:11:44 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-3fe8d816a40so10390485e9.1 for <65229@debbugs.gnu.org>; Wed, 16 Aug 2023 10:11:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692205896; x=1692810696; 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=xpaaZM7zd0QnCB8dq1tLd/bASjDcrPmsO8xp9q8P/nU=; b=BSds4SuukTVT2tYhCCUjArwEa/W4m5fsF0Nsocl6cDMdWH1YTj/vIrFagZ7ZQ5mZkw 7N7eOjoMSAkf/EYzbxWZdBsj56GthHZlsaCrYZOVPrMX76b+uKykIKgymOKUEtmNLSvF V2MIfcH+CqIGyplyceLCVbNAigUCLHKRkgZYrxdxHxc8H9OG8kzvjU1G0WGrGRKsByRz xLuh34h2sBNlunYibfLnx6macNHycKGXgJX1jFFw0n6gstLvzIoQ3AjWZmW/Pt4S5OK9 s6EupOMcX66uZUoj6yM86MUFog5hLtkemLkvCktDNNbK0t2WP2PKb+ZiH/KtV+/w+Rf7 rdUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692205896; x=1692810696; 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=xpaaZM7zd0QnCB8dq1tLd/bASjDcrPmsO8xp9q8P/nU=; b=J3UdzXBvUr7Fh/Bzs7FRJ8KBGnafybDeF3adOijW9K8eSsfKVFEB9+rtFkQF7uKuzr elDj1fDJeMlsP05lS2IxTCUCYPz/sigYmUBn4sTlfUbCL/XHJBB1NSUJWJTB+1vvablZ 4c04N/W6n4TrvGbugeNb69U/d3/jObahNo4JWiLF6EXFDtvZrcC6moGuAklmxWzGrla4 w60xij7zgb6f/go4jcFpmuwnIl0MAQc+vuLzYFVHE5rEs/0Et+v0l0ScHBOJ7NMydVlQ 97lZWfVhedMWt7dPgjXmvbxs7Rnboq9tvcyNzNAV6tZldeJfGd5F2J668D+wykVaWre0 Pikw== X-Gm-Message-State: AOJu0YyKveID+yn0s5fQB7g4J5MnFLiW7RBxVJyUJ+enIPBHdVdc2otc 47IkYJjIbGuqqODObu14PaI= X-Google-Smtp-Source: AGHT+IHadyuC81wRLeSVqE5csfr7y7o+Qg5x7AJv8FVKyMCesmJqkZ1mRPpjRGem/ThIk884A9/LaQ== X-Received: by 2002:a5d:67cc:0:b0:317:3d36:b2c1 with SMTP id n12-20020a5d67cc000000b003173d36b2c1mr1873900wrw.7.1692205896049; Wed, 16 Aug 2023 10:11:36 -0700 (PDT) Received: from pfiuh07 ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id r13-20020a0560001b8d00b003143c6e09ccsm21775174wru.16.2023.08.16.10.11.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Aug 2023 10:11:35 -0700 (PDT) From: Simon Tournier In-Reply-To: <0ee5ee05ea81374342740f06915e9dadb1a92a63.1691767568.git.ludo@gnu.org> References: <0ee5ee05ea81374342740f06915e9dadb1a92a63.1691767568.git.ludo@gnu.org> Date: Wed, 16 Aug 2023 14:59:35 +0200 Message-ID: <87edk3gn2g.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -5.09 X-Spam-Score: -5.09 X-Migadu-Queue-Id: 8A8CB481D1 X-Migadu-Scanner: mx2.migadu.com X-TUID: ASLkrfHTLNNF Hi Ludo, Cool addition! On Fri, 11 Aug 2023 at 17:34, Ludovic Court=C3=A8s wrote: > -As for @command{guix pull}, the absence of any options means that the > -latest commit on the master branch will be used. The command > +As for @command{guix pull}, in the absence of any options, > +@command{time-machine} fetches the latest commits of the channels > +specified in @file{~/.config/guix/channels.scm}, > +@file{/etc/guix/channels.scm}, or the default channels; the @option{-q} > +option lets you ignore these configuration files. The command: >=20=20 > @example > -guix time-machine -- build hello > +guix time-machine -q -- build hello > @end example >=20=20 > -will thus build the package @code{hello} as defined in the master branch, > -which is in general a newer revision of Guix than you have installed. > -Time travel works in both directions! > +will thus build the package @code{hello} as defined in the main branch Why not the master branch? Is the branch renamed from =E2=80=99master=E2= =80=99 to =E2=80=99main=E2=80=99? If not, I would keep the explicit master branch in= order to avoid confusion. > +of Guix, without any additional channel, which is in general a newer > +revision of Guix than you have installed. Time travel works in both > +directions! Well, I would keep the previous example because the behaviour appears to me more prone-error. I mean, by default, there is no channels.scm file under ~/.config/guix/ or /etc/guix, therefore an explanation of the behaviour without any option at all appears to me worth. Moreover, since there is no channels.scm file by default, i.e., the default is %default-channels, it appears to me weird to explain the specific behaviour (without any option and reaching new revision) using an option turning off the channels.scm file. > diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm > + (display (G_ " > + -q inhibit loading of user and system 'channels.sc= m'")) [...] > diff --git a/guix/scripts/time-machine.scm b/guix/scripts/time-machine.scm > + (display (G_ " > + -q inhibit loading of user and system 'channels.sc= m'")) No long option? As --no-channel-files or --ignore-channel-files ? Cheers, simon