aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJakub Kicinski <kuba@kernel.org>2020-11-11 15:22:05 -0800
committerDaniel Borkmann <daniel@iogearbox.net>2020-11-13 17:48:54 +0100
commit0869bca20d602c2ce95c7dccd70588cfb7f9f414 (patch)
tree0743c4fd5544415eb4e98a484c10f7650fdb8dfc
parent9b46f58c0a59265e9f2204670f7c52ebdd5149ab (diff)
downloadpw-0869bca20d602c2ce95c7dccd70588cfb7f9f414.tar.gz
pw: move mbox_from_series to lib and reuse in pw-pull
pw-pull needs fetching series, too. Make the helper common. Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
-rw-r--r--lib.sh11
-rwxr-xr-xpw-apply9
-rwxr-xr-xpw-pull9
3 files changed, 13 insertions, 16 deletions
diff --git a/lib.sh b/lib.sh
index 0612701..d6c9fb6 100644
--- a/lib.sh
+++ b/lib.sh
@@ -100,3 +100,14 @@ pw_series_print_short()
echo
}
+
+#######################
+
+mbox_from_series()
+{
+ srv=$(git config --get pw.server)
+ series_json=$(curl -s $srv/series/$1/)
+
+ pw_series_print_short "$series_json"
+ pw_series_download_mbox "$series_json" mbox.i
+}
diff --git a/pw-apply b/pw-apply
index 66a581e..6c2504d 100755
--- a/pw-apply
+++ b/pw-apply
@@ -20,15 +20,6 @@ mbox_from_url()
curl $1 | gunzip -f -c > mbox.i
}
-mbox_from_series()
-{
- srv=$(git config --get pw.server)
- series_json=$(curl -s $srv/series/$1/)
-
- pw_series_print_short "$series_json"
- pw_series_download_mbox "$series_json" mbox.i
-}
-
get_cover()
{
cover_json=$(echo "$series_json" | jq '.cover_letter')
diff --git a/pw-pull b/pw-pull
index 792b0a3..c25640a 100755
--- a/pw-pull
+++ b/pw-pull
@@ -9,6 +9,8 @@
# Optionally, compare if the patches on the branch are identical
# to what's posted on the mailing list.
+source $(dirname $0)/lib.sh
+
usage()
{
cat <<-EOF
@@ -17,13 +19,6 @@ EOF
exit
}
-mbox_from_series()
-{
- git pw series show $1 -f simple 2> /dev/null | \
- sed ''/Complete/s//$(printf "\033[1mComplete\033[0m")/''
- git pw series download $1 mbox.i 2> /dev/null
-}
-
pull=""
series=""
series_branch="tmp"