Update release.sh
v2 cover Update release.sh
The release.sh seems to be last updated in 2015. Every one seems to have their own script to release. This patchset updates release.sh to the do the basic stuff as updating version files, committing them, creating tag, creating release tarball, uploading tarball (optional).
Signature · 28 lines
Andrey --- Changes in v2: - Added git-contributors.py from Darrick - A bit better/shorter commands for maintainer to run - Link to v1: https://lore.kernel.org/r/[email protected] --- Andrey Albershteyn (7): release.sh: add signing and fix outdated commands release.sh: add --kup to upload release tarball to kernel.org release.sh: update version files make commit optional release.sh: generate ANNOUNCE email Add git-contributors script to notify about merges git-contributors: make revspec required and shebang fix release.sh: use git-contributors to --cc contributors release.sh | 159 ++++++++++++++++++++++++++++++++++++++++++---- tools/git-contributors.py | 93 +++++++++++++++++++++++++++ 2 files changed, 240 insertions(+), 12 deletions(-) --- base-commit: 67297671cbae3043e495312964470d31f4b9e5e7 change-id: 20241111-update-release-13ef17c008a5 Best regards, -- Andrey Albershteyn <[email protected]>
PATCH v2 1/7 release.sh: add signing and fix outdated commands
--- release.sh | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-)
release.sh +24 -5
@@ -9,6 +9,8 @@ # configure.ac (with new version string) # debian/changelog (with new release entry, only for release version) +set -e + . ./VERSION version=${PKG_MAJOR}.${PKG_MINOR}.${PKG_REVISION}
@@ -16,21 +18,38 @@ date=`date +"%-d %B %Y"` echo "Cleaning up" make realclean +rm -rf "xfsprogs-${version}.tar" \ + "xfsprogs-${version}.tar.gz" \ + "xfsprogs-${version}.tar.asc" \ + "xfsprogs-${version}.tar.sign" echo "Updating CHANGES" sed -e "s/${version}.*/${version} (${date})/" doc/CHANGES > doc/CHANGES.tmp && \ mv doc/CHANGES.tmp doc/CHANGES echo "Commiting CHANGES update to git" -git commit -a -m "${version} release" +git commit --all --signoff --message="xfsprogs: Release v${version} + +Update all the necessary files for a v${version} release." echo "Tagging git repository" -git tag -a -m "${version} release" v${version} +git tag --annotate --sign --message="Release v${version}" v${version} echo "Making source tarball" make dist +gunzip -k "xfsprogs-${version}.tar.gz" -#echo "Sign the source tarball" -#gpg --detach-sign xfsprogs-${version}.tar.gz +echo "Sign the source tarball" +gpg \ + --detach-sign \ + --armor \ + "xfsprogs-${version}.tar" -echo "Done. Please remember to push out tags using \"git push --tags\"" +echo "Verify signature" +gpg \ + --verify \ + "xfsprogs-${version}.tar.asc" + +mv "xfsprogs-${version}.tar.asc" "xfsprogs-${version}.tar.sign" + +echo "Done. Please remember to push out tags using \"git push origin v${version}\""
Signature · 1 line
2.47.0
PATCH v2 2/7 release.sh: add --kup to upload release tarball to kernel.org
In reply to Andrey AlbershteynAdd kup support so that the maintainer can push the newly formed release tarballs to kernel.org.
--- release.sh | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+)
release.sh +31 -0
@@ -16,6 +16,30 @@ set -e version=${PKG_MAJOR}.${PKG_MINOR}.${PKG_REVISION} date=`date +"%-d %B %Y"` +KUP=0 + +help() { + echo "$(basename) - create xfsprogs release" + printf "\t[--kup|-k] upload final tarball with KUP\n" +} + +while [ $# -gt 0 ]; do + case "$1" in + --kup|-k) + KUP=1 + ;; + --help|-h) + help + exit 0 + ;; + *) + >&2 printf "Error: Invalid argument\n" + exit 1 + ;; + esac + shift +done + echo "Cleaning up" make realclean rm -rf "xfsprogs-${version}.tar" \
@@ -52,4 +76,11 @@ gpg \ mv "xfsprogs-${version}.tar.asc" "xfsprogs-${version}.tar.sign" +if [ $KUP -eq 1 ]; then + kup put \ + xfsprogs-${version}.tar.gz \ + xfsprogs-${version}.tar.sign \ + pub/linux/utils/fs/xfs/xfsprogs/ +fi; + echo "Done. Please remember to push out tags using \"git push origin v${version}\""
Signature · 1 line
2.47.0
Re: [PATCH v2 2/7] release.sh: add --kup to upload release tarball to kernel.org
Quoted 4 lines · Andrey Albershteyn
Add kup support so that the maintainer can push the newly formed release tarballs to kernel.org.
Signed-off-by Andrey Albershteyn <[email protected]>
Looks good now,
--D
Quoted 56 lines
--- release.sh | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+)release.sh +31
-0@@ -16,6 +16,30 @@ set -e version=${PKG_MAJOR}.${PKG_MINOR}.${PKG_REVISION} date=`date +"%-d %B %Y"` +KUP=0 + +help() { + echo "$(basename) - create xfsprogs release" + printf "\t[--kup|-k] upload final tarball with KUP\n" +} + +while [ $# -gt 0 ]; do + case "$1" in + --kup|-k) + KUP=1 + ;; + --help|-h) + help + exit 0 + ;; + *) + >&2 printf "Error: Invalid argument\n" + exit 1 + ;; + esac + shift +done + echo "Cleaning up" make realclean rm -rf "xfsprogs-${version}.tar" \@@ -52,4 +76,11 @@ gpg \ mv "xfsprogs-${version}.tar.asc" "xfsprogs-${version}.tar.sign" +if [ $KUP -eq 1 ]; then + kup put \ + xfsprogs-${version}.tar.gz \ + xfsprogs-${version}.tar.sign \ + pub/linux/utils/fs/xfs/xfsprogs/ +fi; + echo "Done. Please remember to push out tags using \"git push origin v${version}\""Signature · 2 lines
-- 2.47.0
PATCH v2 3/7 release.sh: update version files make commit optional
In reply to Andrey AlbershteynBased on ./VERSION script updates all other files. For ./doc/changelog script asks maintainer to fill it manually as not all changes goes into changelog.
--no-commit|-n flag is handy when something got into the version commit and need to be changed manually. Then ./release.sh -c will use fixed history
--- release.sh | 75 ++++++++++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 58 insertions(+), 17 deletions(-)
release.sh +58 -17
@@ -11,16 +11,33 @@ set -e -. ./VERSION - -version=${PKG_MAJOR}.${PKG_MINOR}.${PKG_REVISION} -date=`date +"%-d %B %Y"` - KUP=0 +COMMIT=1 help() { echo "$(basename) - create xfsprogs release" printf "\t[--kup|-k] upload final tarball with KUP\n" + printf "\t[--no-commit|-n] don't create release commit\n" +} + +update_version() { + echo "Updating version files" + # doc/CHANGES + header="xfsprogs-${version} ($(date +'%d %b %Y'))" + sed -i "1s/^/$header\n\t<TODO list user affecting changes>\n\n/" doc/CHANGES + $EDITOR doc/CHANGES + + # ./configure.ac + CONF_AC="AC_INIT([xfsprogs],[${version}],[[email protected]])" + sed -i "s/^AC_INIT.*/$CONF_AC/" ./configure.ac + + # ./debian/changelog + sed -i "1s/^/\n/" ./debian/changelog + sed -i "1s/^/ -- Nathan Scott <[email protected]> `date -R`\n/" ./debian/changelog + sed -i "1s/^/\n/" ./debian/changelog + sed -i "1s/^/ * New upstream release\n/" ./debian/changelog + sed -i "1s/^/\n/" ./debian/changelog + sed -i "1s/^/xfsprogs (${version}-1) unstable; urgency=low\n/" ./debian/changelog } while [ $# -gt 0 ]; do
@@ -28,6 +45,9 @@ while [ $# -gt 0 ]; do --kup|-k) KUP=1 ;; + --no-commit|-n) + COMMIT=0 + ;; --help|-h) help exit 0
@@ -40,6 +60,36 @@ while [ $# -gt 0 ]; do shift done +if [ -z "$EDITOR" ]; then + EDITOR=$(command -v vi) +fi + +if [ $COMMIT -eq 1 ]; then + if git diff --exit-code ./VERSION > /dev/null; then + $EDITOR ./VERSION + fi +fi + +. ./VERSION + +version=${PKG_MAJOR}.${PKG_MINOR}.${PKG_REVISION} +date=`date +"%-d %B %Y"` + +if [ $COMMIT -eq 1 ]; then + update_version + + git diff --color=always | less -r + [[ "$(read -e -p 'All good? [Y/n]> '; echo $REPLY)" == [Nn]* ]] && exit 0 + + echo "Commiting new version update to git" + git commit --all --signoff --message="xfsprogs: Release v${version} + +Update all the necessary files for a v${version} release." + + echo "Tagging git repository" + git tag --annotate --sign --message="Release v${version}" v${version} +fi + echo "Cleaning up" make realclean rm -rf "xfsprogs-${version}.tar" \
@@ -47,17 +97,6 @@ rm -rf "xfsprogs-${version}.tar" \ "xfsprogs-${version}.tar.asc" \ "xfsprogs-${version}.tar.sign" -echo "Updating CHANGES" -sed -e "s/${version}.*/${version} (${date})/" doc/CHANGES > doc/CHANGES.tmp && \ - mv doc/CHANGES.tmp doc/CHANGES - -echo "Commiting CHANGES update to git" -git commit --all --signoff --message="xfsprogs: Release v${version} - -Update all the necessary files for a v${version} release." - -echo "Tagging git repository" -git tag --annotate --sign --message="Release v${version}" v${version} echo "Making source tarball" make dist
@@ -83,4 +122,6 @@ if [ $KUP -eq 1 ]; then pub/linux/utils/fs/xfs/xfsprogs/ fi; -echo "Done. Please remember to push out tags using \"git push origin v${version}\"" +echo "" +echo "Done. Please remember to push out tags and the branch." +printf "\tgit push origin v${version} master\n"
Signature · 1 line
2.47.0
Re: [PATCH v2 3/7] release.sh: update version files make commit optional
Quoted 122 lines · Andrey Albershteyn
Based on ./VERSION script updates all other files. For ./doc/changelog script asks maintainer to fill it manually as not all changes goes into changelog.
--no-commit|-n flag is handy when something got into the version commit and need to be changed manually. Then ./release.sh -c will use fixed history
Signed-off-by Andrey Albershteyn <[email protected]>--- release.sh | 75 ++++++++++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 58 insertions(+), 17 deletions(-)release.sh +55
-16@@ -11,16 +11,33 @@ set -e -. ./VERSION - -version=${PKG_MAJOR}.${PKG_MINOR}.${PKG_REVISION} -date=`date +"%-d %B %Y"` - KUP=0 +COMMIT=1 help() { echo "$(basename) - create xfsprogs release" printf "\t[--kup|-k] upload final tarball with KUP\n" + printf "\t[--no-commit|-n] don't create release commit\n" +} + +update_version() { + echo "Updating version files" + # doc/CHANGES + header="xfsprogs-${version} ($(date +'%d %b %Y'))" + sed -i "1s/^/$header\n\t<TODO list user affecting changes>\n\n/" doc/CHANGES + $EDITOR doc/CHANGES + + # ./configure.ac + CONF_AC="AC_INIT([xfsprogs],[${version}],[[email protected]])" + sed -i "s/^AC_INIT.*/$CONF_AC/" ./configure.ac + + # ./debian/changelog + sed -i "1s/^/\n/" ./debian/changelog + sed -i "1s/^/ -- Nathan Scott <[email protected]> `date -R`\n/" ./debian/changelog + sed -i "1s/^/\n/" ./debian/changelog + sed -i "1s/^/ * New upstream release\n/" ./debian/changelog + sed -i "1s/^/\n/" ./debian/changelog + sed -i "1s/^/xfsprogs (${version}-1) unstable; urgency=low\n/" ./debian/changelog } while [ $# -gt 0 ]; do@@ -28,6 +45,9 @@ while [ $# -gt 0 ]; do --kup|-k) KUP=1 ;; + --no-commit|-n) + COMMIT=0 + ;; --help|-h) help exit 0@@ -40,6 +60,36 @@ while [ $# -gt 0 ]; do shift done +if [ -z "$EDITOR" ]; then + EDITOR=$(command -v vi) +fi + +if [ $COMMIT -eq 1 ]; then + if git diff --exit-code ./VERSION > /dev/null; then + $EDITOR ./VERSION + fi +fi + +. ./VERSION + +version=${PKG_MAJOR}.${PKG_MINOR}.${PKG_REVISION} +date=`date +"%-d %B %Y"` + +if [ $COMMIT -eq 1 ]; then + update_version + + git diff --color=always | less -r + [[ "$(read -e -p 'All good? [Y/n]> '; echo $REPLY)" == [Nn]* ]] && exit 0 + + echo "Commiting new version update to git" + git commit --all --signoff --message="xfsprogs: Release v${version} + +Update all the necessary files for a v${version} release." + + echo "Tagging git repository" + git tag --annotate --sign --message="Release v${version}" v${version} +fi + echo "Cleaning up" make realclean rm -rf "xfsprogs-${version}.tar" \@@ -47,17 +97,6 @@ rm -rf "xfsprogs-${version}.tar" \ "xfsprogs-${version}.tar.asc" \ "xfsprogs-${version}.tar.sign" -echo "Updating CHANGES" -sed -e "s/${version}.*/${version} (${date})/" doc/CHANGES > doc/CHANGES.tmp && \ - mv doc/CHANGES.tmp doc/CHANGES - -echo "Commiting CHANGES update to git" -git commit --all --signoff --message="xfsprogs: Release v${version} - -Update all the necessary files for a v${version} release." - -echo "Tagging git repository" -git tag --annotate --sign --message="Release v${version}" v${version} echo "Making source tarball" make dist
release.sh if [ $KUP -eq 1 ]; then · line 127
Quoted 7 lines
release.sh +3
-1@@ -83,4 +122,6 @@ if [ $KUP -eq 1 ]; then pub/linux/utils/fs/xfs/xfsprogs/ fi; -echo "Done. Please remember to push out tags using \"git push origin v${version}\"" +echo "" +echo "Done. Please remember to push out tags and the branch." +printf "\tgit push origin v${version} master\n"
git push origin v${version} master:master master:for-nextper this morning's office hours discussion ;)
With that changed,
--D
Quoted 5 lines
Signature · 2 lines
-- 2.47.0
PATCH v2 4/7 release.sh: generate ANNOUNCE email
In reply to Andrey Albershteyn--- release.sh | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+)
release.sh +43 -0
@@ -13,11 +13,13 @@ set -e KUP=0 COMMIT=1 +LAST_HEAD="" help() { echo "$(basename) - create xfsprogs release" printf "\t[--kup|-k] upload final tarball with KUP\n" printf "\t[--no-commit|-n] don't create release commit\n" + printf "\t[--last-head|-h] commit of the last release\n" } update_version() {
@@ -48,6 +50,10 @@ while [ $# -gt 0 ]; do --no-commit|-n) COMMIT=0 ;; + --last-head|-h) + LAST_HEAD=$2 + shift + ;; --help|-h) help exit 0
@@ -122,6 +128,43 @@ if [ $KUP -eq 1 ]; then pub/linux/utils/fs/xfs/xfsprogs/ fi; +mail_file=$(mktemp) +if [ -n "$LAST_HEAD" ]; then + cat << EOF > $mail_file +To: [email protected] +Subject: [ANNOUNCE] xfsprogs $(git describe --abbrev=0) released + +Hi folks, + +The xfsprogs repository at: + + git://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git + +has just been updated. + +Patches often get missed, so if your outstanding patches are properly reviewed +on the list and not included in this update, please let me know. + +The for-next branch has also been updated to match the state of master. + +The new head of the master branch is commit: + +$(git log --oneline --format="%H" -1) + +New commits: + +$(git shortlog --format="[%h] %s" $LAST_HEAD..HEAD) + +Code Diffstat: + +$(git diff --stat --summary -C -M $LAST_HEAD..HEAD) +EOF +fi + echo "" echo "Done. Please remember to push out tags and the branch." printf "\tgit push origin v${version} master\n" +if [ -n "$LAST_HEAD" ]; then + echo "Command to send ANNOUNCE email" + printf "\tneomutt -H $mail_file\n" +fi
Signature · 1 line
2.47.0
Re: [PATCH v2 4/7] release.sh: generate ANNOUNCE email
Quoted 1 line · Andrey Albershteyn
Signed-off-by Andrey Albershteyn <[email protected]>
Looks good!
--D
Quoted 82 lines
--- release.sh | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+)release.sh +43
-0@@ -13,11 +13,13 @@ set -e KUP=0 COMMIT=1 +LAST_HEAD="" help() { echo "$(basename) - create xfsprogs release" printf "\t[--kup|-k] upload final tarball with KUP\n" printf "\t[--no-commit|-n] don't create release commit\n" + printf "\t[--last-head|-h] commit of the last release\n" } update_version() {@@ -48,6 +50,10 @@ while [ $# -gt 0 ]; do --no-commit|-n) COMMIT=0 ;; + --last-head|-h) + LAST_HEAD=$2 + shift + ;; --help|-h) help exit 0@@ -122,6 +128,43 @@ if [ $KUP -eq 1 ]; then pub/linux/utils/fs/xfs/xfsprogs/ fi; +mail_file=$(mktemp) +if [ -n "$LAST_HEAD" ]; then + cat << EOF > $mail_file +To: [email protected] +Subject: [ANNOUNCE] xfsprogs $(git describe --abbrev=0) released + +Hi folks, + +The xfsprogs repository at: + + git://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git + +has just been updated. + +Patches often get missed, so if your outstanding patches are properly reviewed +on the list and not included in this update, please let me know. + +The for-next branch has also been updated to match the state of master. + +The new head of the master branch is commit: + +$(git log --oneline --format="%H" -1) + +New commits: + +$(git shortlog --format="[%h] %s" $LAST_HEAD..HEAD) + +Code Diffstat: + +$(git diff --stat --summary -C -M $LAST_HEAD..HEAD) +EOF +fi + echo "" echo "Done. Please remember to push out tags and the branch." printf "\tgit push origin v${version} master\n" +if [ -n "$LAST_HEAD" ]; then + echo "Command to send ANNOUNCE email" + printf "\tneomutt -H $mail_file\n" +fiSignature · 2 lines
-- 2.47.0
PATCH v2 5/7 Add git-contributors script to notify about merges
In reply to Andrey AlbershteynAdd python script used to collect emails over all changes merged in the next release.
--- tools/git-contributors.py | 94 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 94 insertions(+)
tools/git-contributors.py new file +94 -0
@@ -0,0 +1,94 @@ +#!/usr/bin/python3 + +# List all contributors to a series of git commits. +# Copyright(C) 2025 Oracle, All Rights Reserved. +# Licensed under GPL 2.0 or later + +import re +import subprocess +import io +import sys +import argparse +import email.utils + +DEBUG = False + +def backtick(args): + '''Generator function that yields lines of a program's stdout.''' + if DEBUG: + print(' '.join(args)) + p = subprocess.Popen(args, stdout = subprocess.PIPE) + for line in io.TextIOWrapper(p.stdout, encoding="utf-8"): + yield line + +class find_developers(object): + def __init__(self): + tags = '%s|%s|%s|%s|%s|%s|%s|%s' % ( + 'signed-off-by', + 'acked-by', + 'cc', + 'reviewed-by', + 'reported-by', + 'tested-by', + 'suggested-by', + 'reported-and-tested-by') + # some tag, a colon, a space, and everything after that + regex1 = r'^(%s):\s+(.+)$' % tags + + self.r1 = re.compile(regex1, re.I) + + def run(self, lines): + addr_list = [] + + for line in lines: + l = line.strip() + + # emailutils can handle abominations like: + # + # Reviewed-by: Bogus J. Simpson <[email protected]> + # Reviewed-by: "Bogus J. Simpson" <[email protected]> + # Reviewed-by: [email protected] + # Cc: <[email protected]> # v6.9 + # Tested-by: Moo Cow <[email protected]> # powerpc + m = self.r1.match(l) + if not m: + continue + (name, addr) = email.utils.parseaddr(m.expand(r'\g<2>')) + + # This last split removes anything after a hash mark, + # because someone could have provided an improperly + # formatted email address: + # + # Cc: [email protected] # v6.19+ + # + # emailutils doesn't seem to catch this, and I can't + # fully tell from RFC2822 that this isn't allowed. I + # think it is because dtext doesn't forbid spaces or + # hash marks. + addr_list.append(addr.split('#')[0]) + + return sorted(set(addr_list)) + +def main(): + parser = argparse.ArgumentParser(description = "List email addresses of contributors to a series of git commits.") + parser.add_argument("revspec", nargs = '?', default = None, \ + help = "git revisions to process.") + parser.add_argument("--delimiter", type = str, default = '\n', \ + help = "Separate each email address with this string.") + args = parser.parse_args() + + fd = find_developers() + if args.revspec: + # read git commits from repo + contributors = fd.run(backtick(['git', 'log', '--pretty=medium', + args.revspec])) + else: + # read patch from stdin + contributors = fd.run(sys.stdin.readlines()) + + print(args.delimiter.join(sorted(contributors))) + return 0 + +if __name__ == '__main__': + sys.exit(main()) +
Signature · 1 line
2.47.0
Re: [PATCH v2 5/7] Add git-contributors script to notify about merges
Quoted 5 lines · Andrey Albershteyn
Add python script used to collect emails over all changes merged in the next release.
CC "Darrick J. Wong" <[email protected]>Signed-off-by Andrey Albershteyn <[email protected]>
--D
Quoted 109 lines
--- tools/git-contributors.py | 94 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 94 insertions(+)tools/git-contributors.py new file +94
-0@@ -0,0 +1,94 @@ +#!/usr/bin/python3 + +# List all contributors to a series of git commits. +# Copyright(C) 2025 Oracle, All Rights Reserved. +# Licensed under GPL 2.0 or later + +import re +import subprocess +import io +import sys +import argparse +import email.utils + +DEBUG = False + +def backtick(args): + '''Generator function that yields lines of a program's stdout.''' + if DEBUG: + print(' '.join(args)) + p = subprocess.Popen(args, stdout = subprocess.PIPE) + for line in io.TextIOWrapper(p.stdout, encoding="utf-8"): + yield line + +class find_developers(object): + def __init__(self): + tags = '%s|%s|%s|%s|%s|%s|%s|%s' % ( + 'signed-off-by', + 'acked-by', + 'cc', + 'reviewed-by', + 'reported-by', + 'tested-by', + 'suggested-by', + 'reported-and-tested-by') + # some tag, a colon, a space, and everything after that + regex1 = r'^(%s):\s+(.+)$' % tags + + self.r1 = re.compile(regex1, re.I) + + def run(self, lines): + addr_list = [] + + for line in lines: + l = line.strip() + + # emailutils can handle abominations like: + # + # Reviewed-by: Bogus J. Simpson <[email protected]> + # Reviewed-by: "Bogus J. Simpson" <[email protected]> + # Reviewed-by: [email protected] + # Cc: <[email protected]> # v6.9 + # Tested-by: Moo Cow <[email protected]> # powerpc + m = self.r1.match(l) + if not m: + continue + (name, addr) = email.utils.parseaddr(m.expand(r'\g<2>')) + + # This last split removes anything after a hash mark, + # because someone could have provided an improperly + # formatted email address: + # + # Cc: [email protected] # v6.19+ + # + # emailutils doesn't seem to catch this, and I can't + # fully tell from RFC2822 that this isn't allowed. I + # think it is because dtext doesn't forbid spaces or + # hash marks. + addr_list.append(addr.split('#')[0]) + + return sorted(set(addr_list)) + +def main(): + parser = argparse.ArgumentParser(description = "List email addresses of contributors to a series of git commits.") + parser.add_argument("revspec", nargs = '?', default = None, \ + help = "git revisions to process.") + parser.add_argument("--delimiter", type = str, default = '\n', \ + help = "Separate each email address with this string.") + args = parser.parse_args() + + fd = find_developers() + if args.revspec: + # read git commits from repo + contributors = fd.run(backtick(['git', 'log', '--pretty=medium', + args.revspec])) + else: + # read patch from stdin + contributors = fd.run(sys.stdin.readlines()) + + print(args.delimiter.join(sorted(contributors))) + return 0 + +if __name__ == '__main__': + sys.exit(main()) +Signature · 2 lines
-- 2.47.0
PATCH v2 6/7 git-contributors: make revspec required and shebang fix
In reply to Andrey AlbershteynWithout default value script will show help instead of just hanging waiting for input on stdin.
Shebang fix for system with different python location than the /usr/bin one.
--- tools/git-contributors.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
tools/git-contributors.py +2 -3
@@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 # List all contributors to a series of git commits. # Copyright(C) 2025 Oracle, All Rights Reserved.
@@ -71,8 +71,7 @@ class find_developers(object): def main(): parser = argparse.ArgumentParser(description = "List email addresses of contributors to a series of git commits.") - parser.add_argument("revspec", nargs = '?', default = None, \ - help = "git revisions to process.") + parser.add_argument("revspec", help = "git revisions to process.") parser.add_argument("--delimiter", type = str, default = '\n', \ help = "Separate each email address with this string.") args = parser.parse_args()
Signature · 1 line
2.47.0
Re: [PATCH v2 6/7] git-contributors: make revspec required and shebang fix
Quoted 2 lines · Andrey Albershteyn
Without default value script will show help instead of just hanging waiting for input on stdin.
Is it useful to be able to do
git-contributors < fubar.patch
?
For the single usecase of generating announcement emails it probably doesn't matter though.
--D
Quoted 33 lines
Shebang fix for system with different python location than the
/usr/binone.Signed-off-by Andrey Albershteyn <[email protected]>--- tools/git-contributors.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)tools/git-contributors.py +2
-3@@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 # List all contributors to a series of git commits. # Copyright(C) 2025 Oracle, All Rights Reserved.@@ -71,8 +71,7 @@ class find_developers(object): def main(): parser = argparse.ArgumentParser(description = "List email addresses of contributors to a series of git commits.") - parser.add_argument("revspec", nargs = '?', default = None, \ - help = "git revisions to process.") + parser.add_argument("revspec", help = "git revisions to process.") parser.add_argument("--delimiter", type = str, default = '\n', \ help = "Separate each email address with this string.") args = parser.parse_args()Signature · 2 lines
-- 2.47.0
PATCH v2 7/7 release.sh: use git-contributors to --cc contributors
In reply to Andrey Albershteyn--- release.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
release.sh +2 -1
@@ -166,5 +166,6 @@ echo "Done. Please remember to push out tags and the branch." printf "\tgit push origin v${version} master\n" if [ -n "$LAST_HEAD" ]; then echo "Command to send ANNOUNCE email" - printf "\tneomutt -H $mail_file\n" + cc="$(./tools/git-contributors.py $LAST_HEAD.. --delimiter ' -c ')" + printf "\tneomutt -H $mail_file -c $cc\n" fi
Signature · 1 line
2.47.0
Re: [PATCH v2 7/7] release.sh: use git-contributors to --cc contributors
Quoted 10 lines · Andrey Albershteyn
Signed-off-by Andrey Albershteyn <[email protected]>--- release.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)release.sh +0
-0
release.sh echo "Done. Please remember to push out tags and the branch." · line 169
Quoted 5 lines
release.sh +1
-1@@ -166,5 +166,6 @@ echo "Done. Please remember to push out tags and the branch." printf "\tgit push origin v${version} master\n" if [ -n "$LAST_HEAD" ]; then echo "Command to send ANNOUNCE email" - printf "\tneomutt -H $mail_file\n" + cc="$(./tools/git-contributors.py $LAST_HEAD.. --delimiter ' -c ')"
You could also do:
in the mail_file generation, right after you generate the To: line, which would eliminate the user having to do a messy cut and paste of a very long command line:
neomutt -H /tmp/fubar -c root@localhost -c postmaster@localhost -c ...
something like this:
cat << EOF > $mail_file
To: [email protected]
Cc: $(./tools/git-contributors.py $LAST_HEAD.. --delimiter ' ')
Subject: [ANNOUNCE] xfsprogs $(git describe --abbrev=0) released
Hi folks,
ENDL
--D
Quoted 7 lines
release.sh +1
-0+ printf "\tneomutt -H $mail_file -c $cc\n" fiSignature · 2 lines
-- 2.47.0