From patchwork Sat Sep 9 20:48:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Attila Lendvai X-Patchwork-Id: 53695 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id E9AA527BBEA; Sat, 9 Sep 2023 21:51:23 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 574F727BBE2 for ; Sat, 9 Sep 2023 21:51:23 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qf4v8-0000Ih-NP; Sat, 09 Sep 2023 16:51:10 -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 1qf4v6-0000IJ-E4 for guix-patches@gnu.org; Sat, 09 Sep 2023 16:51:08 -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 1qf4v0-0007Li-SU; Sat, 09 Sep 2023 16:51:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qf4uz-000289-T7; Sat, 09 Sep 2023 16:51:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64931] [PATCH v2] 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 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: Sat, 09 Sep 2023 20:51:01 +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.16942926128125 (code B ref 64931); Sat, 09 Sep 2023 20:51:01 +0000 Received: (at 64931) by debbugs.gnu.org; 9 Sep 2023 20:50:12 +0000 Received: from localhost ([127.0.0.1]:48536 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qf4uC-00026y-24 for submit@debbugs.gnu.org; Sat, 09 Sep 2023 16:50:12 -0400 Received: from mail-ej1-x630.google.com ([2a00:1450:4864:20::630]:53460) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qf4u8-00026h-Uq for 64931@debbugs.gnu.org; Sat, 09 Sep 2023 16:50:10 -0400 Received: by mail-ej1-x630.google.com with SMTP id a640c23a62f3a-9a9f139cd94so291830466b.2 for <64931@debbugs.gnu.org>; Sat, 09 Sep 2023 13:50:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1694292600; x=1694897400; 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=xGYnxPC23bq09PpjJWuPYoVnL51nuuIcbk0yoPmLtgU=; b=qA3ZeBMbvspUBInrkcsjWoJ1CYO6UsD4dhhD4NPQ/ysmK/fuD/nCS2I0gt9T+DzIDp ztvbsAVl2OLcLo2tPlZUcPW9bPFILeb5Nx1smm9QiuUP9QFKLxYs7arIYMKRmg+vJub6 xU1XPXNLVxeaI59wy+2qMaReK/HvXDGdFd8LH3Z6qnOTcXVNMDU/uO9SCRVozfgStmur 29MJtMu6i4wwOZlShWd4UflTPpwsnYSCSykPtGxM0dRrUegXUeBPKcI/DMH/Qsz1TYiZ INdKjMW67gKC28f2zP6TL4r81k9qtG50mwxX8E6biwAWUmqC8OlzhZFeT/VbuahaMPiK WqLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694292600; x=1694897400; 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=xGYnxPC23bq09PpjJWuPYoVnL51nuuIcbk0yoPmLtgU=; b=gbmRsRfaT3iOvJrp/Rms1j8dEyoN40eXdxW6G18gkhxX1LketAT63kw9d+UjQe9O1H IXyOOLGMGmUBQErN2a2NwJoMykIN4l+YACZSIExNLiNqasvjAaRWbk4KR2SM2vHK+Ggq G3LpvGn+Hvk4Lmd1TBQex6Cghs7P6ENQAR2M00TgiyY1J+pVgbLnyLzyCQ6RoF/FYQ1j KrLOEBDZPrg5Wsg18431iv/xxfQC5iRsyQ8BPLwWz+dw4xFXDJWKs/EOQgCSBC4v7DES zFObHTxddnjxHF7ZYb9J2F4WJyi5eYubQCRlaUVYqK+nWVhMmL2WwxCJIitwdscddwvG y54Q== X-Gm-Message-State: AOJu0YzcL5R4TkaCWbHFnVLturZcWQYdR8s+D8Af02HWcruBjMBo5mJx 0IR8RWjkQOVUOF5noGRVreN8kftRsDAXCg== X-Google-Smtp-Source: AGHT+IH7s2u0beJ1MnLFNI4EerjldY5xtPwWrSAFro7LmtDXwRG9taltNaXAz0xwWkoSTwUnfYL9Og== X-Received: by 2002:a17:906:d9:b0:9a1:ecb5:732e with SMTP id 25-20020a17090600d900b009a1ecb5732emr5337986eji.71.1694292599702; Sat, 09 Sep 2023 13:49:59 -0700 (PDT) Received: from lelap.lan (2a00-1f40-b161-2f0-6b9f-85-742e-f655.pool6.panelnet.hu. [2a00:1f40:b161:2f0:6b9f:85:742e:f655]) by smtp.gmail.com with ESMTPSA id a26-20020a170906369a00b0099cc1ffd8f5sm2793715ejc.53.2023.09.09.13.49.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 09 Sep 2023 13:49:58 -0700 (PDT) From: Attila Lendvai X-Google-Original-From: Attila Lendvai Date: Sat, 9 Sep 2023 22:48:44 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * guix/channels.scm (latest-channel-instances): Also print the branch name. --- v2: added conditional formatting to only print the branch name when it's specified. guix/channels.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) base-commit: e43cbeafd1b632f39b08b3644af5230d5350a656 diff --git a/guix/channels.scm b/guix/channels.scm index 681adafc6c..5b48d206c4 100644 --- a/guix/channels.scm +++ b/guix/channels.scm @@ -537,9 +537,15 @@ (define* (latest-channel-instances store channels (values 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. If + ;; --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