diff mbox series

[bug#59254,v2] scripts: describe: Add branch information to json output.

Message ID 20221113213548.28168-1-jgart@dismail.de
State New
Headers show
Series [bug#59254,v2] scripts: describe: Add branch information to json output. | expand

Checks

Context Check Description
cbaines/comparison success View comparision
cbaines/git-branch success View Git branch
cbaines/applying patch success
cbaines/issue success View issue

Commit Message

jgart Nov. 13, 2022, 9:35 p.m. UTC 
* 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(+)

Comments

Ludovic Courtès Nov. 19, 2022, 6:42 p.m. UTC | #1 
jgart <jgart@dismail.de> skribis:

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

Applied, thanks!

Ludo’.
jgart Nov. 19, 2022, 6:44 p.m. UTC | #2 
On Sat, 19 Nov 2022 19:42:34 +0100 Ludovic Courtès <ludo@gnu.org> wrote:
> Applied, thanks!

Thanks for the review!

all best,

jgart
diff mbox series

Patch

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@gmail.com>
 ;;; Copyright © 2020 Ekaitz Zarraga <ekaitz@elenq.tech>
 ;;; Copyright © 2021 Simon Tournier <zimon.toutoune@gmail.com>
+;;; Copyright © 2022 jgart <jgart@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