From c42d42765083baf3e72c9434bb980c26e25e1e39 Mon Sep 17 00:00:00 2001
From: Roland Hieber <rhi@pengutronix.de>
Date: Thu, 14 Mar 2024 19:29:10 +0100
Subject: [PATCH 1/2] format-patch: correctly set UMPF_VERSION with --bb

When format-patch'ing a series for bitbake, UMPF_VERSION is taken from
${STATE}/version, but this file is never written when we don't set
STABLE for the "version" branch of parse(). Additionally, the version
must be parsed back from the input series in that case, otherwise it
will always be initialised to "-1", with the result that UMPF_VERSION
always ends in "-1" even when format-patch'ing an umpf that was built
with '-v2' or greater.

Update the test case with an appropriate tag name.

Fixes: 8d0d4ccac5b899526e08 (2024-03-06, "umpf: output version infos to bitbake variables during format-patch")
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 tests/series-format-patch-bb.ref              |   4 ++--
 tests/test-git/info/refs                      |   2 ++
 tests/test-git/objects/info/commit-graph      | Bin 1852 -> 1920 bytes
 tests/test-git/objects/info/packs             |   2 +-
 ...75ef90f58e563d875a54cff75687436a9b0.bitmap | Bin 652 -> 0 bytes
 ...3875ef90f58e563d875a54cff75687436a9b0.pack | Bin 1593 -> 0 bytes
 ...a3875ef90f58e563d875a54cff75687436a9b0.rev | Bin 140 -> 0 bytes
 ...06292fe3f86a68fa9e5d6a98201d268f7f9.bitmap | Bin 0 -> 702 bytes
 ...eb06292fe3f86a68fa9e5d6a98201d268f7f9.idx} | Bin 1688 -> 1744 bytes
 ...eb06292fe3f86a68fa9e5d6a98201d268f7f9.pack | Bin 0 -> 2037 bytes
 tests/test-git/packed-refs                    |   2 ++
 tests/umpf-format-patch-bb                    |   2 +-
 umpf                                          |   4 ++++
 13 files changed, 12 insertions(+), 4 deletions(-)
 delete mode 100644 tests/test-git/objects/pack/pack-1ba3875ef90f58e563d875a54cff75687436a9b0.bitmap
 delete mode 100644 tests/test-git/objects/pack/pack-1ba3875ef90f58e563d875a54cff75687436a9b0.pack
 delete mode 100644 tests/test-git/objects/pack/pack-1ba3875ef90f58e563d875a54cff75687436a9b0.rev
 create mode 100644 tests/test-git/objects/pack/pack-308eb06292fe3f86a68fa9e5d6a98201d268f7f9.bitmap
 rename tests/test-git/objects/pack/{pack-1ba3875ef90f58e563d875a54cff75687436a9b0.idx => pack-308eb06292fe3f86a68fa9e5d6a98201d268f7f9.idx} (50%)
 create mode 100644 tests/test-git/objects/pack/pack-308eb06292fe3f86a68fa9e5d6a98201d268f7f9.pack

diff --git a/tests/series-format-patch-bb.ref b/tests/series-format-patch-bb.ref
index 3a9f406..4b7cbee 100644
--- a/tests/series-format-patch-bb.ref
+++ b/tests/series-format-patch-bb.ref
@@ -1,6 +1,6 @@
 # umpf-base: base
 # umpf-name: name
-# umpf-version: name/20221209-1
+# umpf-version: name/20240314-2
 # umpf-topic: a
 # umpf-hashinfo: f46ed0419d2c31ed10f978cc461e0d1ae4b3b426
 # umpf-topic-range: d306da785d874c09b89264d3f71632bc14bfe51f..b2b9f854952b0be84ba2472f236783d09bfa6561
@@ -14,6 +14,6 @@ SRC_URI += "\
   file://patches/0101-b1.patch \
   "
 UMPF_BASE = "base"
-UMPF_VERSION = "20221209-1"
+UMPF_VERSION = "20240314-2"
 PV = "${UMPF_BASE}-${UMPF_VERSION}"
 # umpf-end
diff --git a/tests/test-git/info/refs b/tests/test-git/info/refs
index 4855174..ae75a87 100644
--- a/tests/test-git/info/refs
+++ b/tests/test-git/info/refs
@@ -5,6 +5,8 @@ f46ed0419d2c31ed10f978cc461e0d1ae4b3b426	refs/heads/a
 d306da785d874c09b89264d3f71632bc14bfe51f	refs/heads/master
 d306da785d874c09b89264d3f71632bc14bfe51f	refs/tags/base
 9f80efc9c56cd60aa8059a2e599ae4a0e5611521	refs/tags/name/20221209-1
+cafa4a9cf5da347772533d93fc33040b5d961978	refs/tags/name/20240314-2
+a815789db19080f83c2fe01a8fdf41e8172eb33e	refs/tags/name/20240314-2^{}
 402a5929b9e015d35a6b07e4632c5c1a26d0e782	refs/tags/umpf-build
 c42a48897afca146023190ae073373e4d491807e	refs/tags/umpf-merge
 9f80efc9c56cd60aa8059a2e599ae4a0e5611521	refs/tags/umpf-tag
diff --git a/tests/test-git/objects/info/commit-graph b/tests/test-git/objects/info/commit-graph
index b6c72432ad11585159030702058de5467cd422c8..3e30da521992c42d047448b0a515ccdbf00e4480 100644
GIT binary patch
delta 348
zcmdnP*T6qPTQ$Vp#nFfX4A?bXUEE!v>=+0QBH42$2F}~~j+JS$G_%I!WM+xU`OG{>
zSY`5jW|hhBnN24DXO@|)%%VHlfQ4O`7pRkHJUM`+LS%(##oUb(8h+U5KalFb@AyJo
zZ?oOx6D<9VJd-0>m07uf2J%d9V3lX&n!JEjnUQny5g^Gk`30-8A$J2%5(os6Cr7N-
zODf*DDC3z{$XkI`%eGBlGcoAacAy+c4HHOB>Sx!Q$q8)YKywV(+@a>yusJibPd>n=
y3>1CBrfv&V$iN81ARQnY1Ym5Q1_&EWM~75yclo;b-mxhir&W)X9!j;<eF*>%=T0a9

delta 251
zcmZqR-@`XSTh+nc#nFfX4A?%ny12VS*z5`r8bq>dObnd2@f|DE<oiq_Kx{MlKa<R4
zab}sx$;=Xy^O+4M_cIGXG0)`r%qElHGwV(cV5yjVhozs9dvXq|vMMLg9Bv@yNuC_B
zy5(etz_h0d%9*zwAC}Ntar=H2%Q~PO=j04FWk!z4H&~T{y8f^#vvM^6g(pv7lV=3U
zxwC>znY@L~nUQVs51?Ak$ujKfhKxW(Oh62xK>)_)ZUC~mXWFG{|9g?U{G7R&<{Phw
IWGn9V01VSUNdN!<

diff --git a/tests/test-git/objects/info/packs b/tests/test-git/objects/info/packs
index e85fc1f..7d4792a 100644
--- a/tests/test-git/objects/info/packs
+++ b/tests/test-git/objects/info/packs
@@ -1,2 +1,2 @@
-P pack-1ba3875ef90f58e563d875a54cff75687436a9b0.pack
+P pack-308eb06292fe3f86a68fa9e5d6a98201d268f7f9.pack
 
diff --git a/tests/test-git/objects/pack/pack-1ba3875ef90f58e563d875a54cff75687436a9b0.bitmap b/tests/test-git/objects/pack/pack-1ba3875ef90f58e563d875a54cff75687436a9b0.bitmap
deleted file mode 100644
index 9c5d72f20b24bf621c1ddc756a91d5f4c4dc8875..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 652
zcmZ?r4Dn@PWME}rVBnEn+#dInKjLZfjnbt)|4TDU%vNpyi32ec6ay&`;QtSy8H9i|
zsvPqNs1$=3hMWyd3QRMi@F3<eFgO53QB4$^a1g4J159J8kXmpEs)8Gb3gdG}peopK
zsW|iks)84nio+M6D)@1z5Ndb;Rl$NwMdJae3Q=4t8el3wae^&8l$jd9G7JoYVA=sl
zqJ|g~Ljzcbfk6aJI{-;k6-H+oz%r27#b%382Ux|dNT@nI6gD-pqEI!UtEoDFOxm}5
TpWVBP!~WC$rC+Jpv|}3pwc;_V

diff --git a/tests/test-git/objects/pack/pack-1ba3875ef90f58e563d875a54cff75687436a9b0.pack b/tests/test-git/objects/pack/pack-1ba3875ef90f58e563d875a54cff75687436a9b0.pack
deleted file mode 100644
index 2e940b7556e664a44cf1c07793d276a563d51bac..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1593
zcmZvcc~H`67{`AesGGXpQrnh<s9=(aSn1MXmZc_nYeuDLj*`RXmEh5crA6k2$9VkG
zw9LWMJSwHUAV@JRLGeB+71z<#O|(2}+SqDlXWKvCndh1Jndkd_Kl47Xo4tbz004?#
zj$w`#6|4}tZsKCJ557qxWVg75FmVT9aJ2<xXk1b-_7P+xw;;J=AP;)sbL)V4LvVG>
zlH*FiX~LCOGqF|Wwf0>a9QvYXJFMT278Z%gx8AIAGTZT`+Qf6cEomBCjEnE&xcl&`
z(<{0*rsMMWT(Y5=%kYn$doRq?;5~1K;%l1mk9}TXTb>G489#d+jOGZo!IEy3u75z3
z8yXqCcUqlQPTD~QH-xK&?u~blHr_jI(R{oFF5u#=Y$aG*KF^{XIn=Y)O2i#RqWLfh
zl0VwlDaMHc$|?JE3a5Fr?ad+in}$_VRaA&Xh9eOOveln0z)-<-=7}_YD{cPbCzRs$
zbHi0#p96L5|1zDow;Zoxb`hQtVtady-&V$|G@f(UN<^7kT0XdhI0^N3_yy^2e>aPQ
zj;}PJ7hb;dD?51E>m+H9tbCG;lNS44IYxJ59xaCLG&c;}krNtSEp1*aR`=%w)_7Tr
zH=N2~=|kPh;P>=)W^kpAqIi{4{ui_b0~Z_Ah6^Hf2s$l6PzbSOU<HSkzQf_QWZ|uK
ze>BhvHcCH8pWUDAjX8ZcVpZgu_&esX8i0zE8EW6!*}I0ne{Yv`Zl>deH0_L!>|N&L
z1C?9X?k}oc%Yqrz&W#t$(I~2K(zbWEP`buwxDQWI6ESR!-qlkH+m`Cv2r{>f)W#Kt
zWo2M^Z^Y+Etpqy@{QfcRsuVX{)3ct@kor5vIo>016&H^lC(q34#S}#2)amyKSP_U}
zA4?CvCg>j#J?C6)qfeiGJ+`=h;C0L9#I}w2)*GU_i)}!E*&EqBgnoev&IOFT!g0Ke
zZAG1Uw8;=o#BIm&M>}B>%+M%Cf<xO{4Pp2_JutM52}(37zCc<exK8wyFMB~&5HTsj
zW@bW4GjG&uSB-cy88=4Ex<PTeWFJzWcSsis9Mal$c~&`u3XZ&bm=~7JO09D*Iucp#
z?%`jQO+R@(yR5?gI@>*x97(>;U{tUx>R5G!^s=(BCElO|iAbzqL&Bc0Sx07BPfXSz
zg#w>VPDB8~FjV?e<+AzL$%8#Sa*L`0g2^B`Fc8cQ2?!-qKoU75zaW<!noTB^Fi9m~
z2#HJrLxU;d0`Dxp+#+A>n(A#S&+i#y!w#3|nI`r$=+l!JU}err21~k8p6n*)D0Ojk
zls)#lEQ1K_#=~FEDa6XHEHfhxjq>(KIp#1rMrp_OA8Kl7YBV+JYO;Y8m}=Xck|`C8
z7c>=rT@4OG!0p7D3<-HiTY-g*04r)2!X$kNR5zS26nAprXq1hFCvFcWg`1uCAVru%
z0TYzY%7Q{t&^K<E@wYcaeZwgBMHC9zJ+A6IU^o=W5&T4(RZ23H3$8N1333rbVlKC*
zU2Gxg>um2F6k<)RBzuPjd$>p&5!?i2(rqDXM_9#_FA$^%hh2b7ReSu6a!P`n=+ln9
zoaiNU({x5WI@k4^HKr^o%G$-*BTZipMnBv`=G<kS(-7q>6Pu0azonxlov~Ajz~FiP
zXRj6M#`0mPnGxJbj{HeLiu;<GOTwvnP~5!CkT_cq8L32|f1f(5Opyv&<1iR&EB9l4
zJ6Xs;q>Cu#ZDhv2`pM*@g)gL#OS=;)i2zGOo%Ta%fVN9#d~LKe)A-$NRsFnKuU_TK
zVF0L=X+X=B|I@aKKN0I$b+)v$dU(CH$Uj`jEHSc6)rL3)K+H0$A3PYGTo62+sBxO<
zopER#*V9#){kTQ<2gU#G0<b`J^1n;PavytX;faa-?Xf4uKV5XSE8TCjv{I6#26V7B
zSuiT7^yP;K6n0ZV7u=LHPO1nfe^mJGd;0cEx~^bn{m-o;puhxf%40cRg*>2S>+P#&
V*0lVlg9c+Nj(?5`jo!_w{Tnq)_VWM$

diff --git a/tests/test-git/objects/pack/pack-1ba3875ef90f58e563d875a54cff75687436a9b0.rev b/tests/test-git/objects/pack/pack-1ba3875ef90f58e563d875a54cff75687436a9b0.rev
deleted file mode 100644
index e5464b910123bc3d5e6dd7a5e697277b7d628bd5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 140
zcmWIYbctYKU|@t|CLqlL#N0s42E@ET%n!t(Kr9HvEI`Z(#3De<1H{5WEC9sJKnya2
z3y9f)m=lOWKnRHWq!+ix{p62$ntY>lsn7q?j1sez8-BhL_5IGmX8C2-np>jc$?wBW
G)UyGYconw*

diff --git a/tests/test-git/objects/pack/pack-308eb06292fe3f86a68fa9e5d6a98201d268f7f9.bitmap b/tests/test-git/objects/pack/pack-308eb06292fe3f86a68fa9e5d6a98201d268f7f9.bitmap
new file mode 100644
index 0000000000000000000000000000000000000000..978292e54b24cd5f00f7f1e62d94a24478880ea6
GIT binary patch
literal 702
zcmZ?r4Dn@PWME}rVBj_A+mJNrpMBf1{*_O!t!!evl=1y1P@E5lnV=X*fq;EIgk}%{
z(x`I$2cS|65*TtHU{VYm7;+2@4NzGgFzo;&QBAh1NP?;Wi8C-b05PhHsKx}K7zlvO
z$EIR7Qvz6qfq@%LI{-;kGwdo7p(@yLsqiR)ssM!yHe2j`GN391aHx=CD1fS9!KH#F
z0jfeAmkI`$3Q+7}bB7Lx16YQEK^RPfc&NVRU;v4MfEbu`0FtOGtO`J4AixVI9e^aN
z3MmDU7{jbc5Q!h)QZp+GqR+A2a{|l+bhSxN{6A-x&6;7fOuF=M%=7Kynl|qMyTdKb

literal 0
HcmV?d00001

diff --git a/tests/test-git/objects/pack/pack-1ba3875ef90f58e563d875a54cff75687436a9b0.idx b/tests/test-git/objects/pack/pack-308eb06292fe3f86a68fa9e5d6a98201d268f7f9.idx
similarity index 50%
rename from tests/test-git/objects/pack/pack-1ba3875ef90f58e563d875a54cff75687436a9b0.idx
rename to tests/test-git/objects/pack/pack-308eb06292fe3f86a68fa9e5d6a98201d268f7f9.idx
index 4ae0df006fc6318e1c561c07a51543773eb081a6..922bf2cb30d53cd2a37835ba5224d9841b9e011c 100644
GIT binary patch
delta 475
zcmbQidx3YuYNpATnKUL#GmCigF)%QYiur+h(6PYe7-sd!)0qV(&t^85e4AMyQ5>j>
zR4f71Lo}Yu!SX?5g=odxjT0Jv*yuly>c8*!LR@dN-Q*uE0V1b<dCmEH%cQ(0*mm+C
zV;1h%X_6I_Jy<*H8@GmQ7`U()vo%|n9@^#<q3N4tRm$xWvi-}sJ11&XwWSI^wHDu*
z5wgT+U&yEP8y1ByT~l$IqN_D8=iR$q*L4k7Jo_hgu=eS`dD9vcJeHhHW?*2y1jOD9
z3@ld}7}(Y^FtDBm;;#%0jBkPBi-7DhAbl8!fiy!T4^W~8sIZBFfhia$xE)9@XJBCN
z0<z_Sv<r}44V3=^#8yDQoI&4)q)Gqm+m`jOe0ptV6XT_f?>}#L<vtB+Un62r*Ua;H
M#mUUeZ{Du~0Q=Z;r~m)}

delta 343
zcmcb>JA-$_YNpBanRwuMIg`%h{Y)Z2%rp5ilZYxm0|SEq7Ay!9gX75t%;J;nnI#y7
zC%Z5!PcCLwnOx5-FnKz&fUFo$9Zo!%gXP0y9@c=#1*{$QOeuWd-t1Ntvwk00d1#wc
zgr;wnRVlYi$o4Pi?wqJm)xQ67-l`==`$9gQ->|6hz(uZkIq%->x~^-u;@Ll`gSAih
z^(?T7_E>T<nSp`z9}xEgE#?8zo(v2uKu@q(GB7X|0r}5>;%kBQdm!G$z`)1^lsg8L
z^Sr^pz$VGSz^nt5kOk5wfqY(|<R>7m1M(M3FK&<f$sh4F`9|qdpZ}#9C1xu(#L0iF
W*G(#a*JzTp(eiHWotxJmoCW}ov|!Z$

diff --git a/tests/test-git/objects/pack/pack-308eb06292fe3f86a68fa9e5d6a98201d268f7f9.pack b/tests/test-git/objects/pack/pack-308eb06292fe3f86a68fa9e5d6a98201d268f7f9.pack
new file mode 100644
index 0000000000000000000000000000000000000000..44bd543cd0a7d905f6eb954fa6d9dc31bca86b97
GIT binary patch
literal 2037
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
Fe*-^G&{qHe

literal 0
HcmV?d00001

diff --git a/tests/test-git/packed-refs b/tests/test-git/packed-refs
index c3cdbc2..8826154 100644
--- a/tests/test-git/packed-refs
+++ b/tests/test-git/packed-refs
@@ -6,6 +6,8 @@ f46ed0419d2c31ed10f978cc461e0d1ae4b3b426 refs/heads/a
 d306da785d874c09b89264d3f71632bc14bfe51f refs/heads/master
 d306da785d874c09b89264d3f71632bc14bfe51f refs/tags/base
 9f80efc9c56cd60aa8059a2e599ae4a0e5611521 refs/tags/name/20221209-1
+cafa4a9cf5da347772533d93fc33040b5d961978 refs/tags/name/20240314-2
+^a815789db19080f83c2fe01a8fdf41e8172eb33e
 402a5929b9e015d35a6b07e4632c5c1a26d0e782 refs/tags/umpf-build
 c42a48897afca146023190ae073373e4d491807e refs/tags/umpf-merge
 9f80efc9c56cd60aa8059a2e599ae4a0e5611521 refs/tags/umpf-tag
diff --git a/tests/umpf-format-patch-bb b/tests/umpf-format-patch-bb
index a4bdae5..aee56a3 100644
--- a/tests/umpf-format-patch-bb
+++ b/tests/umpf-format-patch-bb
@@ -3,6 +3,6 @@
 # Test creating a Yocto compatible patchset with "umpf format-patch --bb".
 #
 
-umpf format-patch umpf-tag --bb --patchdir=patches
+umpf format-patch name/20240314-2 --bb --patchdir=patches
 
 diff -u ${TEST_DIR}/series-format-patch-bb.ref patches/series.inc
diff --git a/umpf b/umpf
index 00bf715..e9728a3 100755
--- a/umpf
+++ b/umpf
@@ -1360,6 +1360,10 @@ format_patch_name() {
 }
 
 format_patch_version() {
+	local name="$(<"${STATE}/name")"
+	local version="${content#${name}/}"
+	echo "${version}" > "${STATE}/version"
+	echo "${content}" > "${STATE}/tag"
 	echo "$line" >&${series_out}
 	if ${NIX}; then
 		echo "[" >&${series_out}

From 919b0e0045532ecb636c8c8d2215c3f47e411b91 Mon Sep 17 00:00:00 2001
From: Roland Hieber <rhi@pengutronix.de>
Date: Sat, 16 Mar 2024 10:49:16 +0100
Subject: [PATCH 2/2] parse: fix missing occurrence of ${VERSION_SEPARATOR}

In case of ${STABLE}, the version line comes from a previous utag, which
means it was written by umpf itself using ${VERSION_SEPARATOR}, which
was previously hard-coded as "-". Use it also when parsing back the
version.

Fixes: a864fe60229d09ad1962 (2023-04-20, "umpf: split off VERSION_SEPARATOR from VERSION")
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 umpf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/umpf b/umpf
index e9728a3..9bf9019 100755
--- a/umpf
+++ b/umpf
@@ -928,7 +928,7 @@ parse() {
 		test -n "${content}" || bailout "${cmd} line without value"
 		if ${STABLE}; then
 			local name="$(<"${STATE}/name")"
-			local version="$(sed "s;${name}/\([0-9]\{8\}\)-.*;\1${VERSION_SEPARATOR}${VERSION};" <<< "${content}")"
+			local version="$(sed "s;${name}/\([0-9]\{8\}\)${VERSION_SEPARATOR}.*;\1${VERSION_SEPARATOR}${VERSION};" <<< "${content}")"
 			local tagname="${name}/${version}"
 			echo "${version}" > "${STATE}/version"
 			echo "${tagname}" > "${STATE}/tag"