unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Marius Bakke <marius@gnu.org>
To: "Ludovic Courtès" <ludo@gnu.org>
Cc: 50377-done@debbugs.gnu.org
Subject: bug#50377: [PATCH 0/2] Support 'git describe' style commit IDs in transformations
Date: Wed, 08 Sep 2021 18:08:14 +0200	[thread overview]
Message-ID: <87lf476oep.fsf@gnu.org> (raw)
In-Reply-To: <87lf4976vk.fsf_-_@gnu.org>

[-- Attachment #1: Type: text/plain, Size: 2584 bytes --]

Ludovic Courtès <ludo@gnu.org> skriver:

> Marius Bakke <marius@gnu.org> skribis:
>
>> +      (version (cond ((and (string-contains commit "-g")
>> +                           (match (string-split commit #\-)
>> +                             ((version ... revision g+commit)
>> +                              (and (> (string-length g+commit) 4)
>> +                                   (string-every char-set:digit revision)
>> +                                   (string-every char-set:hex-digit
>> +                                                 (string-drop g+commit 1))))
>> +                             (_ #f)))
>> +                      ;; This looks like a 'git describe' style ID.  Drop
>> +                      ;; the 'v' prefix if applicable.
>> +                      (if (and (string-prefix? "v" commit)
>> +                               (char-set-contains? char-set:digit
>> +                                                   (string-take
>> +                                                    (string-drop commit 1)
>> +                                                    1)))
>> +                          (string-drop commit 1)
>> +                          commit))
>> +                     ((and (> (string-length commit) 1)
>> +                           (string-prefix? "v" commit)
>> +                           (char-set-contains? char-set:digit
>> +                                               (string-ref commit 1)))
>> +                      (string-drop commit 1))       ;looks like a tag like "v1.0"
>> +                     (else
>> +                      (string-append "git."
>> +                                     (if (< (string-length commit) 7)
>> +                                         commit
>> +                                         (string-take commit 7))))))
>
> For clarity, I’d extract this as a ‘commit->version-string’ procedure.
>
> Like Xinglu writes, it’d be great to add a sentence in the manual about
> these IDs.

Thanks for the feedback!  Looking at this again, I realized tags would
not be used as version either which seemed like an oversight.  So I
fixed(?) that too and vastly simplified this patch.  :-)

Also adjusted the test to more thoroughly excercise the new
commit->version-string procedure with the different arguments, and
updated the documentation.

Pushed in:
  1dc3825e99 git: 'resolve-reference' handles 'git describe'-style commit IDs.
  16ef7b4938 transformations: Git tags and 'git describe' style IDs are used as version.

Thanks,
Marius

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 247 bytes --]

  reply	other threads:[~2021-09-08 16:12 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-09-04 18:08 [bug#50377] [PATCH 0/2] Support 'git describe' style commit IDs in transformations Marius Bakke
2021-09-04 18:10 ` [bug#50377] [PATCH 1/2] git: 'resolve-reference' handles 'git describe'-style commit IDs Marius Bakke
2021-09-04 18:10   ` [bug#50377] [PATCH 2/2] transformations: 'git describe' style commit IDs are used as version Marius Bakke
2021-09-05 22:52   ` [bug#50377] [PATCH v2 1/2] git: 'resolve-reference' handles 'git describe'-style commit IDs Marius Bakke
2021-09-06 10:38 ` [bug#50377] [PATCH v3 0/2] Support 'git describe' style commit IDs in transformations Marius Bakke
2021-09-06 10:38   ` [bug#50377] [PATCH v3 1/2] git: 'resolve-reference' handles 'git describe'-style commit IDs Marius Bakke
2021-09-06 21:02     ` [bug#50377] [PATCH 0/2] Support 'git describe' style commit IDs in transformations Ludovic Courtès
2021-09-06 10:38   ` [bug#50377] [PATCH v3 2/2] transformations: 'git describe' style commit IDs are used as version Marius Bakke
2021-09-06 21:04     ` [bug#50377] [PATCH 0/2] Support 'git describe' style commit IDs in transformations Ludovic Courtès
2021-09-08 16:08       ` Marius Bakke [this message]
2021-09-06 11:52   ` [bug#50377] [PATCH v3 " Xinglu Chen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87lf476oep.fsf@gnu.org \
    --to=marius@gnu.org \
    --cc=50377-done@debbugs.gnu.org \
    --cc=ludo@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).