Received: (at 64931) by debbugs.gnu.org; 16 Aug 2023 17:11:58 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Wed Aug 16 13:11:58 2023 Received: from localhost ([127.0.0.1]:41955 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1qWK3q-0005Pj-2Z for submit <at> debbugs.gnu.org; Wed, 16 Aug 2023 13:11:58 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:41016) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <zimon.toutoune@HIDDEN>) id 1qWK3j-0005NV-5v for 64931 <at> debbugs.gnu.org; Wed, 16 Aug 2023 13:11:51 -0400 Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-31979a6df33so531377f8f.0 for <64931 <at> debbugs.gnu.org>; Wed, 16 Aug 2023 10:11:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692205905; x=1692810705; 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=qz9BG0anbhlGx68H6CVdroDM1vf6GXJ3o5hxedA8yv4=; b=H9IkJwXNPNObRfsoAlk3P+IZ4bplvbgypyXSbD9zmi9s5AIooAbG29PN20EySwVvMH XKWg5AfQLxd04e9B9vOTBqh7VxWRqVgCziksdOBgKkDQ93NVGnFE3YqDb1lvRdVWkXXa RJYrZnWqEtV3S0qVaFLA/2UANl6vo7OoLDUT5LcYc/jmx4+wCrCZ2ARee91H91jZ2t8J jxBtkb4+4tVgRx49y4cxzT585s66xORjfpeGgvZDUKGOe1B+UQwrK9ZMy/rQlQYoVTPm HAoKPeEkI9y9sB4PYZQPBH79ty5CwzCC5KOR9dzjazbypPaPiNEwIsXfld2SWyWsUVek Xihw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692205905; x=1692810705; 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=qz9BG0anbhlGx68H6CVdroDM1vf6GXJ3o5hxedA8yv4=; b=Pm5yzUtaxz0GkptY18sQMlnUnNtcFgsIYLDthKfKYWTzk4ycs9oS2Km854MzP8/8UF PB+LTMc+ee1tS1JOZSnv4gGcasUKjUFgeQ62wRAlBLCwqI6ool0d/o7P8urgPO3mNeLn QB03TWcjvaSkgoR8rWIeBilp4gPzncQWLX/dFNwVVXHJbxD/2OwOh5wmqXyuahYEF1qn 2TAOn3kHmc0RbuD84OoKE7HNznG35iRUYpjNamWzlCTKZT9AsKzy4ruKy783sTNFLh6b vdrqwtpm1klhxcR2Kj8JfCV9+PgJTGmxxFDItPfAk9F8o6aNYSQxjwZUIgjmd837j1LN IQXA== X-Gm-Message-State: AOJu0YzuDrHES4UGCdR+X7mEKaHC6zghP3Zn7g/Rf890VgK9RkBUK+sK m1JOiTXfnB4ImjWCEJ2jVII= X-Google-Smtp-Source: AGHT+IFQ0bImpbHAcpfc9sugGxz8ZYrs08rLYD9RrTcQGAXOuTi+TTyV+TMAJVC/Kd5I3eEjrODZyg== X-Received: by 2002:adf:dec4:0:b0:317:732e:d538 with SMTP id i4-20020adfdec4000000b00317732ed538mr1585682wrn.5.1692205905454; Wed, 16 Aug 2023 10:11:45 -0700 (PDT) Received: from pfiuh07 ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id v2-20020a5d6102000000b003141e629cb6sm21768147wrt.101.2023.08.16.10.11.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Aug 2023 10:11:45 -0700 (PDT) From: Simon Tournier <zimon.toutoune@HIDDEN> To: Attila Lendvai <attila.lendvai@HIDDEN>, 64931 <at> debbugs.gnu.org Subject: Re: [bug#64931] [PATCH] guix: pull: Also print the name of the branch. In-Reply-To: <9428a39d118ff033fb117abdeaf7015c9bbf80e2.1690632263.git.attila@HIDDEN> References: <9428a39d118ff033fb117abdeaf7015c9bbf80e2.1690632263.git.attila@HIDDEN> Date: Wed, 16 Aug 2023 18:41:34 +0200 Message-ID: <871qg3ey81.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: 64931 Cc: Josselin Poiret <dev@HIDDEN>, Tobias Geerinckx-Rice <me@HIDDEN>, Mathieu Othacehe <othacehe@HIDDEN>, Ludovic =?utf-8?Q?Court=C3=A8s?= <ludo@HIDDEN>, Christopher Baines <mail@HIDDEN>, Ricardo Wurmus <rekado@HIDDEN>, Attila Lendvai <attila@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 Sat, 29 Jul 2023 at 14:04, Attila Lendvai <attila.lendvai@HIDDEN> wro= te: > - (G_ "Updating channel '~a' from Git reposit= ory at '~a'...~%") > + (G_ "Updating channel '~a' from Git reposit= ory at \ > +'~a', branch '~a'...~%") > (channel-name channel) > - (channel-url channel)) > + (channel-url channel) > + (channel-branch channel)) That=E2=80=99s nice but I see a potential confusion when using =E2=80=9Cgui= x pull --commit=E2=80=9D or =E2=80=9Cguix time-machine --commit=E2=80=9D. Well, f= rom =E2=80=99channel-list=E2=80=99 in (guix scripts pull), if the option --commit is provided then the branch is set to #f. Therefore, it would display =E2=80=9C, branch #f...=E2=80=9D= which could be misleading. Somehow, this display should be conditional depending on if =E2=80=99channel-branch=E2=80=99 is not #f. WDYT? Cheers, simon
guix-patches@HIDDEN:bug#64931; Package guix-patches.
Full text available.
Received: (at submit) by debbugs.gnu.org; 29 Jul 2023 12:05:27 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sat Jul 29 08:05:27 2023
Received: from localhost ([127.0.0.1]:46555 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qPihL-0002vI-9J
for submit <at> debbugs.gnu.org; Sat, 29 Jul 2023 08:05:27 -0400
Received: from lists.gnu.org ([2001:470:142::17]:40208)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <attila.lendvai@HIDDEN>) id 1qPihJ-0002uz-Oq
for submit <at> debbugs.gnu.org; Sat, 29 Jul 2023 08:05: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 <attila.lendvai@HIDDEN>)
id 1qPihA-0004yr-8j
for guix-patches@HIDDEN; Sat, 29 Jul 2023 08:05:19 -0400
Received: from mail-ed1-x534.google.com ([2a00:1450:4864:20::534])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <attila.lendvai@HIDDEN>)
id 1qPih7-0003Gk-22
for guix-patches@HIDDEN; Sat, 29 Jul 2023 08:05:15 -0400
Received: by mail-ed1-x534.google.com with SMTP id
4fb4d7f45d1cf-522ab301692so1365392a12.2
for <guix-patches@HIDDEN>; Sat, 29 Jul 2023 05:05:12 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20221208; t=1690632311; x=1691237111;
h=content-transfer-encoding:mime-version:message-id:date:subject:cc
:to:from:from:to:cc:subject:date:message-id:reply-to;
bh=WFNrhyFDD7MlM1e0HOOyNH+a2iMxgGmhuVmZf1XgNE0=;
b=hWtRulxQzMpcUmvUAkmYyUkIg3W9/roruUdvF2DxjT15J8XBEvv29B1K/sUzv8wMPN
6+urZ9DHyvJTmjGUotxxQlrxAuL2CmiBQGiQemsn+cjLlLpasMKNj6FFF5P94fMXfMFP
TBoVhIkpfjbgC5PVRjyqt9KtUfAW8b3RshLG+tUXkpe4i0QGfRoOdgKQW00HYdHxTa1o
EUPqwywsvaUJ4A4lMfjKBveN8X7/+VvP2PBFzJhfbSK7wtLljISrsaG/scPzks11TqYI
TsbQma61+U2N9b9DSv8aUOO7HXbuUiIwoIzIuLA6sjWZg8s5WhH13Woa4dzJiOCQZUcn
O4xw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20221208; t=1690632311; x=1691237111;
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=WFNrhyFDD7MlM1e0HOOyNH+a2iMxgGmhuVmZf1XgNE0=;
b=JPhmoTYrPMZ5t9fey1wLkyviD6+0kK1Iuq6m1vozPTzSKRMc/3njEPgt8BiOgFJkvW
PIZlCTWaG7FBczHSY4PfNAbH+ogLns/3RWrI0KTfIhoExqH4FG4qNJOPEQ+jImLF0ISV
YHsDW2cz5T7f9HyCgS5yHXEkIqGjW3EUYPSrHcxnh7tSfq0oDypxxBUaSYfYvy1U4Exq
SAZAL94xpcmzgzpNcDCCaA5r76DuRWgFQwCVAvBUJRgzknzE9v9YFOHjxM6tChBoygii
O8DBIPQ5mohCJ7NyBq5uQZJFiG7DTw5+oW765xZmpbZ2uEFSMkjN0pt/VYukbmmd4/fg
DBHw==
X-Gm-Message-State: ABy/qLZd9N/PdG9aCVLmdsvu70zk2ZrYnJRN4qZL5Xme9UjzhebxO+xN
ULz3dPvCmv3vNuT4Ax21jpCsHanPVR0=
X-Google-Smtp-Source: APBJJlEAtsRyqMoAVb3ZppE4A+EP6gkULVk0PKEaCuLOEKrk+WVRUqrfdr8PmTpS+gY0EhxC8h3Akg==
X-Received: by 2002:a50:fc0e:0:b0:522:586b:7db6 with SMTP id
i14-20020a50fc0e000000b00522586b7db6mr4130812edr.34.1690632311254;
Sat, 29 Jul 2023 05:05:11 -0700 (PDT)
Received: from lelap.lan (catv-80-98-247-145.catv.fixed.vodafone.hu.
[80.98.247.145]) by smtp.gmail.com with ESMTPSA id
n10-20020aa7db4a000000b00522584bb58esm2804653edt.24.2023.07.29.05.05.10
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Sat, 29 Jul 2023 05:05:10 -0700 (PDT)
From: Attila Lendvai <attila.lendvai@HIDDEN>
X-Google-Original-From: Attila Lendvai <attila@HIDDEN>
To: guix-patches@HIDDEN
Subject: [PATCH] guix: pull: Also print the name of the branch.
Date: Sat, 29 Jul 2023 14:04:24 +0200
Message-Id: <9428a39d118ff033fb117abdeaf7015c9bbf80e2.1690632263.git.attila@HIDDEN>
X-Mailer: git-send-email 2.40.1
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=2a00:1450:4864:20::534;
envelope-from=attila.lendvai@HIDDEN; helo=mail-ed1-x534.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: Attila Lendvai <attila@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 (/)
---
i was missing this. maybe you will find it useful, too.
guix/channels.scm | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/guix/channels.scm b/guix/channels.scm
index 681adafc6c..731e0d90d3 100644
--- a/guix/channels.scm
+++ b/guix/channels.scm
@@ -537,9 +537,11 @@ (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)
+ (channel-branch channel))
(let* ((current (current-commit (channel-name channel)))
(instance
(latest-channel-instance store channel
base-commit: e43cbeafd1b632f39b08b3644af5230d5350a656
prerequisite-patch-id: 6793c8ad24215c5f14ce71a4741fff5f6ccd7eeb
--
2.40.1
Attila Lendvai <attila.lendvai@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#64931; Package guix-patches.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.