* [bug#64931] [PATCH] guix: pull: Also print the name of the branch.
@ 2023-07-29 12:04 Attila Lendvai
2023-08-16 16:41 ` Simon Tournier
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Attila Lendvai @ 2023-07-29 12:04 UTC (permalink / raw)
To: 64931
Cc: Attila Lendvai, Christopher Baines, Josselin Poiret,
Ludovic Courtès, Mathieu Othacehe, Ricardo Wurmus,
Simon Tournier, Tobias Geerinckx-Rice
---
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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [bug#64931] [PATCH] guix: pull: Also print the name of the branch.
2023-07-29 12:04 [bug#64931] [PATCH] guix: pull: Also print the name of the branch Attila Lendvai
@ 2023-08-16 16:41 ` Simon Tournier
2023-09-09 20:48 ` [bug#64931] [PATCH v2] " Attila Lendvai
2024-02-26 19:03 ` [bug#64931] [PATCH v3] " attila.lendvai
2 siblings, 0 replies; 4+ messages in thread
From: Simon Tournier @ 2023-08-16 16:41 UTC (permalink / raw)
To: Attila Lendvai, 64931
Cc: Josselin Poiret, Tobias Geerinckx-Rice, Mathieu Othacehe,
Ludovic Courtès, Christopher Baines, Ricardo Wurmus,
Attila Lendvai
Hi,
On Sat, 29 Jul 2023 at 14:04, Attila Lendvai <attila.lendvai@gmail.com> wrote:
> - (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))
That’s nice but I see a potential confusion when using “guix pull
--commit” or “guix time-machine --commit”. Well, from ’channel-list’ in
(guix scripts pull), if the option --commit is provided then the branch
is set to #f. Therefore, it would display “, branch #f...” which could
be misleading.
Somehow, this display should be conditional depending on if
’channel-branch’ is not #f. WDYT?
Cheers,
simon
^ permalink raw reply [flat|nested] 4+ messages in thread
* [bug#64931] [PATCH v2] guix: pull: Also print the name of the branch.
2023-07-29 12:04 [bug#64931] [PATCH] guix: pull: Also print the name of the branch Attila Lendvai
2023-08-16 16:41 ` Simon Tournier
@ 2023-09-09 20:48 ` Attila Lendvai
2024-02-26 19:03 ` [bug#64931] [PATCH v3] " attila.lendvai
2 siblings, 0 replies; 4+ messages in thread
From: Attila Lendvai @ 2023-09-09 20:48 UTC (permalink / raw)
To: 64931
Cc: Attila Lendvai, Christopher Baines, Josselin Poiret,
Ludovic Courtès, Mathieu Othacehe, Ricardo Wurmus,
Simon Tournier, Tobias Geerinckx-Rice
* 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(-)
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
base-commit: e43cbeafd1b632f39b08b3644af5230d5350a656
--
2.41.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [bug#64931] [PATCH v3] guix: pull: Also print the name of the branch.
2023-07-29 12:04 [bug#64931] [PATCH] guix: pull: Also print the name of the branch Attila Lendvai
2023-08-16 16:41 ` Simon Tournier
2023-09-09 20:48 ` [bug#64931] [PATCH v2] " Attila Lendvai
@ 2024-02-26 19:03 ` attila.lendvai
2 siblings, 0 replies; 4+ messages in thread
From: attila.lendvai @ 2024-02-26 19:03 UTC (permalink / raw)
To: 64931
Cc: Attila Lendvai, Christopher Baines, Josselin Poiret,
Ludovic Courtès, Mathieu Othacehe, Ricardo Wurmus,
Simon Tournier, Tobias Geerinckx-Rice
From: Attila Lendvai <attila@lendvai.name>
* 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
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-02-26 19:05 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-07-29 12:04 [bug#64931] [PATCH] guix: pull: Also print the name of the branch Attila Lendvai
2023-08-16 16:41 ` Simon Tournier
2023-09-09 20:48 ` [bug#64931] [PATCH v2] " Attila Lendvai
2024-02-26 19:03 ` [bug#64931] [PATCH v3] " attila.lendvai
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).