From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id WBkiKxbh3GULNwEAe85BDQ:P1 (envelope-from ) for ; Mon, 26 Feb 2024 20:05:58 +0100 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id WBkiKxbh3GULNwEAe85BDQ (envelope-from ) for ; Mon, 26 Feb 2024 20:05:58 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=f0bC6uac; 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=1708974358; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: 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=4UoFdNuUvayZJEjdYsE9jLWmsanJo41svusDbQP4ED4=; b=tJ3kyqaSuAFN4EM1MR3FlD6qMuEb3C5N8CGf8eMbamL3xnSP4NXBud3IULBxMtAjAdEFY7 Atvxj9jhHrfUWzUsYCXzx13z0fb1LS9VgXJb9swaQKx4kw9bVOn0mG7SQZx7Qkdt/irJe5 4grL7vRko5U6f5gCjOzYndzZ9QBlwrSyRRliclWQUhwE2MriENrwi3u1XXAgcs7wPWxR9H S1aLz2ITU1e/SgtHM+GB4GlmGzC5F0h/xsZU5wpFKJtarDocktMimf5uxv3sutT90P9eux r1tSmlc3jfRZhOWXweBSycxTKGd5v8TS88lYW6FbEH0bQvsN4j5xpV0AcOaleA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=f0bC6uac; 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=1708974358; a=rsa-sha256; cv=none; b=Jcl/+nbr04rvBtdtHdrOaMP3i4Hl/mh1Z4cLRA8hLoCy7K76lPP8ORl43Z2nXWqkn+i7ij MT0ntb/ATRmIeJNHMn6WRdxPZaFi1FjIPj3Du8qvL4QlOy/veMsFPduQXEh4HqiEmFXAZL JRmDGFmWDjHzJhfj7KHsw/9Zp0Lc3ytdB9Rroo36cYWJ5sP98xIcxChCo8+kA7QJiZQ5Fy t4OnP0A6RjP6K7lJQ5FuZbC+DJuyOcd2TbYBrIE5GnjqaMlU1ACm1sN/QIt7tfQEKFqBat cfMQZZ4/vSpieg3H3AJ3s/LWiIFvn6Q2b8N6aTtfFMVzVLTYAZfVe7NxA/3vRg== 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 736A9426F3 for ; Mon, 26 Feb 2024 20:05:58 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1regIM-0006TU-Cs; Mon, 26 Feb 2024 14:05:46 -0500 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 1regIH-0006Qv-Km for guix-patches@gnu.org; Mon, 26 Feb 2024 14:05:41 -0500 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 1regIG-0004tU-80; Mon, 26 Feb 2024 14:05:40 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1regIc-0007JX-HK; Mon, 26 Feb 2024 14:06:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#64931] [PATCH v3] guix: pull: Also print the name of the branch. References: <9428a39d118ff033fb117abdeaf7015c9bbf80e2.1690632263.git.attila@lendvai.name> In-Reply-To: <9428a39d118ff033fb117abdeaf7015c9bbf80e2.1690632263.git.attila@lendvai.name> Resent-From: attila.lendvai@gmail.com Original-Sender: "Debbugs-submit" Resent-CC: guix@cbaines.net, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, rekado@elephly.net, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Mon, 26 Feb 2024 19:06:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64931 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64931@debbugs.gnu.org Cc: Attila Lendvai , Christopher Baines , Josselin Poiret , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Christopher Baines , Josselin Poiret , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by 64931-submit@debbugs.gnu.org id=B64931.170897434828077 (code B ref 64931); Mon, 26 Feb 2024 19:06:02 +0000 Received: (at 64931) by debbugs.gnu.org; 26 Feb 2024 19:05:48 +0000 Received: from localhost ([127.0.0.1]:58287 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1regIN-0007Il-Ow for submit@debbugs.gnu.org; Mon, 26 Feb 2024 14:05:48 -0500 Received: from mail-wr1-f42.google.com ([209.85.221.42]:53459) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1regIM-0007IQ-3U for 64931@debbugs.gnu.org; Mon, 26 Feb 2024 14:05:46 -0500 Received: by mail-wr1-f42.google.com with SMTP id ffacd0b85a97d-33d6cc6d2fcso2187420f8f.2 for <64931@debbugs.gnu.org>; Mon, 26 Feb 2024 11:05:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708974255; x=1709579055; 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=4UoFdNuUvayZJEjdYsE9jLWmsanJo41svusDbQP4ED4=; b=f0bC6uacPr5gsyodzvTJaihNIXbwvcjmrX2gRaPH8DTm9jzp0VPVJspcDzZeuusLOW XQa0K+blHbPnrtsjqSc+MYIOnUdqygu9dG7MUdNR9ZXdAGcKGBkCHMAm17l/lGS7jx02 1hLpLnJS9YcdtZaNDkr0KAa6F+u3xIlqbEVO11gAFj93ak/cweUO+O9TGalzRW+6cPhE dMztK8vLvMGLq5GCAZDxsv5aLEG/k3PjUme9aurxYqLbr9XBHEKGISak9+p5rWgN+0AG jNMFuru5jmLWCiPvrQ25sSyGO9GpZqCeHiWeG6Zpi8TJtaPJJE5oxAzlsd2LQLMHAtIy pdlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708974255; x=1709579055; 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=4UoFdNuUvayZJEjdYsE9jLWmsanJo41svusDbQP4ED4=; b=EKmJtmWylWp7AcBXjkQl4DdVZGkWTER/0Ik+EeB2QDp/qBAu+znQ2Fh4qGEcZ+MT7A 1Ph0mMz3b/KT4v1kYwRSDzgMMA0dUTQnWUt3s62SNr59/6stNQrZ7LVJ5iEUsrP+1mzB Yvs9kxHuOgT2fCsjtHpNfqL/TFq5s205RaDUqdcfrfSjLMv5v5YO3c3RCAbmgysl8ufx UWoshF6xch9FCEE5CilpWzeXL76zW4XuGwqGMxFnWuf4HMNjstuavOLxnyugSw2zd6UG h7PxyonxU5Z0dHuGFdamlRpHbN2Ta/AttA7rOdhsIf4NQ83lmETBEaXgvyaLivQdVUhk IIbw== X-Gm-Message-State: AOJu0YwYeeOaapPVDQ9NzPlB4Z8ay8oelivBMGcXZLHwmWCxuXpCr9cP 2yNzfPc77nxnSj8AWmZH+2NOMq3lz0RV57NexWMcbxMLdnDHy5CYZVjDGjFY X-Google-Smtp-Source: AGHT+IEtvh8fKvLb1mjicAHdrTL/7gbm2/lOI6JT/HP7GBvFGxu0nk88VEspXnKRHo9x+fa63QXV8w== X-Received: by 2002:a5d:6b0f:0:b0:33d:c6de:5b51 with SMTP id v15-20020a5d6b0f000000b0033dc6de5b51mr3401285wrw.33.1708974254418; Mon, 26 Feb 2024 11:04:14 -0800 (PST) Received: from lelap.lan (2a00-1f40-b161-12b0--477.pool6.panelnet.hu. [2a00:1f40:b161:12b0::477]) by smtp.gmail.com with ESMTPSA id d9-20020a5d6449000000b0033d9ee8b5dcsm9053444wrw.15.2024.02.26.11.04.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Feb 2024 11:04:13 -0800 (PST) From: attila.lendvai@gmail.com X-Google-Original-From: attila@lendvai.name Date: Mon, 26 Feb 2024 20:03:12 +0100 Message-ID: <211349c1ec2a73efd21e349b2502b8d9e582d555.1708974191.git.attila@lendvai.name> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: 4.73 X-Spam-Score: 4.73 X-Migadu-Queue-Id: 736A9426F3 X-Migadu-Scanner: mx13.migadu.com X-TUID: NqXNV37P3gxQ From: Attila Lendvai * guix/channels.scm (latest-channel-instances): Also print the branch name, when it's not #f. --- v3: it has developed conflicts while waiting in the queue. rebased. guix/channels.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/guix/channels.scm b/guix/channels.scm index 1b07eb52210..2f6fabea998 100644 --- a/guix/channels.scm +++ b/guix/channels.scm @@ -544,9 +544,15 @@ (define* (latest-channel-instances store channels (loop rest previous-channels instances) (begin (format (current-error-port) - (G_ "Updating channel '~a' from Git repository at '~a'...~%") + (G_ "Updating channel '~a' from Git repository at \ + '~a'~:[~;, branch '~a'~]...~%") (channel-name channel) - (channel-url channel)) + (channel-url channel) + ;; Only conditionally print the branch name. When + ;; e.g. --commit is provided for channel-list in (guix + ;; scripts pull), then the branch is set to #f. + (channel-branch channel) + (channel-branch channel)) (let* ((current (current-commit (channel-name channel))) (instance (latest-channel-instance store channel base-commit: bf17a01e06abc100651ed643f2d5c7fea07d37ba -- 2.41.0