Skip to content

Blisswriter release 1.0.1

Wout De Nolf requested to merge blisswriter_release_1.0.1 into master

Version bump in this MR

Previous version (1.0.0, tag on the master):

https://gitlab.esrf.fr/bliss/bliss/-/commits/blisswriter/1.0.0/blisswriter?ref_type=tags

git log blisswriter/1.0.0 blisswriter

New version (1.0.1, this branch):

https://gitlab.esrf.fr/bliss/bliss/-/commits/blisswriter_release_1.0.1/blisswriter?ref_type=heads

git log blisswriter_release_1.0.1 blisswriter

Find merge requests included in the version bump

List all the new commits between tag blisswriter/1.0.0 and this branch blisswriter_release_1.0.1:

git log -p blisswriter_release_1.0.1 --not blisswriter/1.0.0 blisswriter | grep "commit "

Find the corresponding merge commits

git log --merges --first-parent -p blisswriter_release_1.0.1 --not blisswriter/1.0.0 blisswriter | grep "See merge request"

Corresponding merge request URL's from oldest to newest

git log --reverse --merges --first-parent -p blisswriter_release_1.0.1 --not blisswriter/1.0.0 blisswriter | grep -Eo '![0-9]+' | grep -Eo '[0-9]+'  | sed -e 's/^/https:\/\/gitlab.esrf.fr\/bliss\/bliss\/-\/merge_requests\//;'

Create a git command for this

git blisswriter <lastversion>

and define the alias like this

# ~/.gitconfig

[alias]
    blisswriter = "!sh -c 'us=\"\\/\" && git log --reverse --merges --first-parent -p HEAD --not blisswriter/$0 blisswriter | grep \"See merge request\" | cut -d! -f2 | sed -e \"s/^/https:$us${us}gitlab.esrf.fr${us}bliss${us}bliss${us}-${us}merge_requests${us}/;\"    '"

You could create an alias like that for blissdata as well.

In this case

git checkout -t origin/blisswriter_release_1.0.1
git blisswriter 1.0.0

yields !5900 (merged) !5986 (merged).

Edited by Wout De Nolf

Merge request reports