[bug#64931] [PATCH] guix: pull: Also print the name of the branch.

[bug#64931] [PATCH] guix: pull: Also print the name of the branch.

[Attila Lendvai]

---

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

[bug#64931] [PATCH] guix: pull: Also print the name of the branch.

[Simon Tournier]

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

[bug#64931] [PATCH v2] guix: pull: Also print the name of the branch.

[Attila Lendvai]

* 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

[bug#64931] [PATCH v3] guix: pull: Also print the name of the branch.

[attila.lendvai]

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