GNU bug report logs - #59254
[PATCH] scripts: describe: Add branch information to json output.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 59254 in the body.
You can then email your comments to 59254 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: jgart <jgart <at> dismail.de>
To: guix-patches <at> gnu.org
Cc: jgart <jgart <at> dismail.de>
Subject: [PATCH] scripts: describe: Add branch information to json output.
Date: Sun, 13 Nov 2022 15:31:01 -0600

* guix/scripts/describe.scm (channel->json): Add branch information.
---
 guix/scripts/describe.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/guix/scripts/describe.scm b/guix/scripts/describe.scm
index 0c310e3da8..dbc040c54d 100644
--- a/guix/scripts/describe.scm
+++ b/guix/scripts/describe.scm
@@ -119,6 +119,7 @@ (define (channel->json channel)
    (let ((intro (channel-introduction channel)))
      `((name . ,(channel-name channel))
        (url . ,(channel-url channel))
+       (branch . ,(channel-branch channel))
        (commit . ,(channel-commit channel))
        ,@(if intro
              `((introduction
-- 
2.38.1

Message #8 received at 59254 <at> debbugs.gnu.org (full text, mbox):

From: jgart <jgart <at> dismail.de>
To: 59254 <at> debbugs.gnu.org
Cc: jgart <jgart <at> dismail.de>
Subject: [PATCH v2] scripts: describe: Add branch information to json output.
Date: Sun, 13 Nov 2022 15:35:49 -0600

* guix/scripts/describe.scm (channel->json): Add branch information.

This patch adds branch information to the json output.

Here's an example of the output:

$ guix-shell  ./pre-inst-env guix describe -f json | jq
{
  "name": "guix",
  "url": "/home/jgart/dc2e8ad5-c818-41a4-ac33-198f11f868b2-guix/",
  "branch": "master",
  "commit": "a720eacc803d6e078ea07613ba5ab5ef59adcbb5",
  "introduction": {
    "commit": "9edb3f66fd807b096b48283debdcddccfea34bad",
    "signer": "BBB0 2DDF 2CEA F6A8 0D1D  E643 A2A0 6DF2 A33A 54FA"
  }
}

v2 just adds my copyright statement at the top of the file.

all best,

jgart
---
 guix/scripts/describe.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/guix/scripts/describe.scm b/guix/scripts/describe.scm
index 0c310e3da8..e2233c78a5 100644
--- a/guix/scripts/describe.scm
+++ b/guix/scripts/describe.scm
@@ -3,6 +3,7 @@
 ;;; Copyright © 2018 Oleg Pykhalov <go.wigust <at> gmail.com>
 ;;; Copyright © 2020 Ekaitz Zarraga <ekaitz <at> elenq.tech>
 ;;; Copyright © 2021 Simon Tournier <zimon.toutoune <at> gmail.com>
+;;; Copyright © 2022 jgart <jgart <at> dismail.de>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -119,6 +120,7 @@ (define (channel->json channel)
    (let ((intro (channel-introduction channel)))
      `((name . ,(channel-name channel))
        (url . ,(channel-url channel))
+       (branch . ,(channel-branch channel))
        (commit . ,(channel-commit channel))
        ,@(if intro
              `((introduction
-- 
2.38.1

Message #13 received at 59254-done <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: jgart <jgart <at> dismail.de>
Cc: 59254-done <at> debbugs.gnu.org
Subject: Re: bug#59254: [PATCH] scripts: describe: Add branch information to
 json output.
Date: Sat, 19 Nov 2022 19:42:34 +0100

jgart <jgart <at> dismail.de> skribis:

> * guix/scripts/describe.scm (channel->json): Add branch information.

Applied, thanks!

Ludo’.

Message #16 received at 59254-done <at> debbugs.gnu.org (full text, mbox):

From: jgart <jgart <at> dismail.de>
To: Ludovic Courtès <ludo <at> gnu.org>
Cc: 59254-done <at> debbugs.gnu.org
Subject: Re: bug#59254: [PATCH] scripts: describe: Add branch information to
 json output.
Date: Sat, 19 Nov 2022 12:44:10 -0600

On Sat, 19 Nov 2022 19:42:34 +0100 Ludovic Courtès <ludo <at> gnu.org> wrote:
> Applied, thanks!

Thanks for the review!

all best,

jgart

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.