Hello community,
here is the log from the commit of package linuxrc-devtools for
openSUSE:Factory checked in at 2020-03-25 23:48:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/linuxrc-devtools (Old)
and /work/SRC/openSUSE:Factory/.linuxrc-devtools.new.3160 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "linuxrc-devtools"
Wed Mar 25 23:48:28 2020 rev:11 rq:788272 version:0.18
Changes:
--------
--- /work/SRC/openSUSE:Factory/linuxrc-devtools/linuxrc-devtools.changes
2019-09-10 00:01:54.929213828 +0200
+++
/work/SRC/openSUSE:Factory/.linuxrc-devtools.new.3160/linuxrc-devtools.changes
2020-03-25 23:50:12.928021852 +0100
@@ -1,0 +2,8 @@
+Wed Mar 25 16:27:12 UTC 2020 - [email protected]
+
+- merge gh#openSUSE/linuxrc-devtools#24
+- get version numbering right when starting a new numbering scheme
+- minor doc change
+- 0.18
+
+--------------------------------------------------------------------
Old:
----
linuxrc-devtools-0.17.tar.xz
New:
----
linuxrc-devtools-0.18.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ linuxrc-devtools.spec ++++++
--- /var/tmp/diff_new_pack.JvFMZ0/_old 2020-03-25 23:50:14.904021329 +0100
+++ /var/tmp/diff_new_pack.JvFMZ0/_new 2020-03-25 23:50:14.908021328 +0100
@@ -1,7 +1,7 @@
#
# spec file for package linuxrc-devtools
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: linuxrc-devtools
-Version: 0.17
+Version: 0.18
Release: 0
Source: %{name}-%{version}.tar.xz
++++++ linuxrc-devtools-0.17.tar.xz -> linuxrc-devtools-0.18.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-devtools-0.17/VERSION
new/linuxrc-devtools-0.18/VERSION
--- old/linuxrc-devtools-0.17/VERSION 2019-09-09 15:11:58.000000000 +0200
+++ new/linuxrc-devtools-0.18/VERSION 2020-03-25 17:27:12.000000000 +0100
@@ -1 +1 @@
-0.17
+0.18
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-devtools-0.17/changelog
new/linuxrc-devtools-0.18/changelog
--- old/linuxrc-devtools-0.17/changelog 2019-09-09 15:11:58.000000000 +0200
+++ new/linuxrc-devtools-0.18/changelog 2020-03-25 17:27:12.000000000 +0100
@@ -1,3 +1,8 @@
+2020-03-25: 0.18
+ - merge gh#openSUSE/linuxrc-devtools#24
+ - get version numbering right when starting a new numbering scheme
+ - minor doc change
+
2019-09-09: 0.17
- merge gh#openSUSE/linuxrc-devtools#23
- auto-add a bugzilla number to every Weblate commit (bsc#1149754)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-devtools-0.17/git2log
new/linuxrc-devtools-0.18/git2log
--- old/linuxrc-devtools-0.17/git2log 2019-09-09 15:11:58.000000000 +0200
+++ new/linuxrc-devtools-0.18/git2log 2020-03-25 17:27:12.000000000 +0100
@@ -475,6 +475,23 @@
@t = sort tag_sort @t;
$branch = $t[0]{branch};
+
+ # Here's some magic:
+ #
+ # If a commit is tagged "FOO-X.Y" *and* "FOO-X.Y.0" assume the user
+ # wants to start a new sub-numbering scheme.
+ #
+ # Use "X.Y" as version but remember to go to "X.Y.1" instead of
+ # "X.{Y+1}" when we need to increment the version.
+ #
+ my $version = $t[0]{version};
+ if($version =~ s/\.0$//) {
+ if(grep { $_->{branch} eq $branch && $_->{version} eq $version } @t) {
+ $t[0]{new_start} = 1;
+ $t[0]{version} = $version;
+ }
+ }
+
$x->{tags} = [ $t[0] ];
# printf "X %s\n", tags_to_str($x->{tags});
@@ -489,6 +506,8 @@
#
# Basically, use branch + version from most recent tag and increment version.
#
+# If the 'new_start' attribute to tag is set, start a new sub-numbering scheme.
+#
sub add_head_tag
{
return if @{$config->{log}} < 2;
@@ -499,6 +518,9 @@
# the first tagged commit if HEAD isn't tagged
my $tag = { %{$config->{log}[1]{tags}[0]} };
+ # append '.0' to version
+ $tag->{version} .= '.0' if $tag->{new_start};
+
# increment version
$tag->{version} =~ s/(\d+)$/$1 + 1/e;
