From 650892b4727c63855f32f1bddbed5f73b1e1344ae96be3a52b2dbbc113c65c52 Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Sun, 19 Jun 2022 07:52:35 +0000 Subject: [PATCH 1/2] up to 0.9.0 OBS-URL: https://build.opensuse.org/package/show/devel:tools/b4?expand=0&rev=55 --- _service | 2 +- _servicedata | 2 +- b4-0.8.0+2.obscpio | 3 --- b4-0.9.0+0.obscpio | 3 +++ b4.changes | 32 ++++++++++++++++++++++++++++++++ b4.obsinfo | 6 +++--- b4.spec | 4 ++-- 7 files changed, 42 insertions(+), 10 deletions(-) delete mode 100644 b4-0.8.0+2.obscpio create mode 100644 b4-0.9.0+0.obscpio diff --git a/_service b/_service index ffa055b..c473683 100644 --- a/_service +++ b/_service @@ -3,7 +3,7 @@ https://git.kernel.org/pub/scm/utils/b4/b4 git enable - stable-0.8.y + v0.9.0 @PARENT_TAG@+@TAG_OFFSET@ v(.*) \1 diff --git a/_servicedata b/_servicedata index 38153d4..dcea89a 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://git.kernel.org/pub/scm/utils/b4/b4 - 846c6928b70727e3f8002f1e9c71176d2b824093 \ No newline at end of file + 409c865175bf8f103bf5633331e8a1d77a446814 \ No newline at end of file diff --git a/b4-0.8.0+2.obscpio b/b4-0.8.0+2.obscpio deleted file mode 100644 index 6ca30e5..0000000 --- a/b4-0.8.0+2.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8d9787aa4a1d52a49f4a3024c93f2ee86d9217d01757a0eededb48131cb409d2 -size 382475 diff --git a/b4-0.9.0+0.obscpio b/b4-0.9.0+0.obscpio new file mode 100644 index 0000000..5c32c7e --- /dev/null +++ b/b4-0.9.0+0.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dd6770fe51ce9bff28cf50758d27d9c6e1012cbdb935e8490061266acda9c191 +size 592908 diff --git a/b4.changes b/b4.changes index fe5316b..29b6016 100644 --- a/b4.changes +++ b/b4.changes @@ -1,3 +1,35 @@ +------------------------------------------------------------------- +Sun Jun 19 07:51:21 UTC 2022 - jslaby@suse.cz + +- Update to version 0.9.0+0: + * Add ability to exit before git-merge is invoked + * Implement "b4 shazam -M" that execs git-merge + * Add a note about proxying requests + * Allow breaking threads using --no-parent + * Improve identity matching for DKIM + * Lowercase identities for comparison + * am: Fix broken guessbranch handling + * Remove unnecessary lookup when /all/ is used in midmask + * Add support for mailmap and excluding mail in b4-ty + * Allow whitespace at the start of non-wrapped trailers + * Reimplement unicode control character logic + * mbox: initial support to check for unicode control chars + * ty: fix problems with smtplib and 8BITMIME + * ty: fix bugs introduced when switching -s to -t + * ty: document flag changes + * shazam: change default behaviour to be "apply-here" + * Initial implementation of native mail sending + * Fix shazam for multiple git worktrees + * validate: Use patatt's configured keyring as fallback + * Add keyring key for keescook + * shazam: document template usage in manpage + * shazam: implement custom merge message templates + * shazam: implement better merging strings + * shazam: allow configuring "git am" flags + * am/shazam: Restore thank-you recording + * Simplify sparse worktree preparation + * Add "b4 shazam" that is like b4 am + git am + ------------------------------------------------------------------- Mon Mar 21 10:21:21 UTC 2022 - jslaby@suse.cz diff --git a/b4.obsinfo b/b4.obsinfo index 002ded1..6cf87ae 100644 --- a/b4.obsinfo +++ b/b4.obsinfo @@ -1,4 +1,4 @@ name: b4 -version: 0.8.0+2 -mtime: 1643729879 -commit: 846c6928b70727e3f8002f1e9c71176d2b824093 +version: 0.9.0+0 +mtime: 1655490181 +commit: 409c865175bf8f103bf5633331e8a1d77a446814 diff --git a/b4.spec b/b4.spec index 032f51c..07c0726 100644 --- a/b4.spec +++ b/b4.spec @@ -16,9 +16,9 @@ # -%define version_unconverted 0.8.0+2 +%define version_unconverted 0.9.0+0 Name: b4 -Version: 0.8.0+2 +Version: 0.9.0+0 Release: 0 Summary: Helper scripts for kernel.org patches License: GPL-2.0-or-later From 4b04bd2bb0c591d44190f3e32327cff7ecd541bbb13ffcc24410d94b8f0a44c8 Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Mon, 20 Jun 2022 05:35:49 +0000 Subject: [PATCH 2/2] up to 0.9.0 OBS-URL: https://build.opensuse.org/package/show/devel:tools/b4?expand=0&rev=56 --- b4.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b4.spec b/b4.spec index 07c0726..bea1180 100644 --- a/b4.spec +++ b/b4.spec @@ -70,8 +70,8 @@ export PYTHONPATH="./" THEIRS=`%{buildroot}/%{_bindir}/b4 --version` OURS=`sed -n "s/__VERSION__ = '\(.*\)'/\1/p" b4/__init__.py` test "$THEIRS" = "$OURS" -%{buildroot}/%{_bindir}/b4 --help |grep -q 'mbox,am,attest' -%{buildroot}/%{_bindir}/b4 mbox abc |& grep -q 'Looking up https://lore.kernel.org/r/abc' +%{buildroot}/%{_bindir}/b4 --help |grep -q 'mbox,am,shazam,attest' +%{buildroot}/%{_bindir}/b4 mbox abc |& grep -q 'Grabbing thread from lore.kernel.org/all/abc/t.mbox.gz' %files %doc README.rst