blob: 747871e67063c21ebc07f0c642f840a2118f4c88 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
|
#!/bin/bash
# SPDX-License-Identifier: GPL-2.0
#
# Copyright (C) 2019 Daniel Borkmann <daniel@iogearbox.net>
source $(dirname $0)/lib.sh
usage()
{
cat <<-EOF
usage: pw-apply [-h] [-s SERIES] [-b MBOX] [-P] [-M]
[-a] [-3] [-N] [-e] [-T] [-u BRANCH-BASE]
-- [-C] [-a ACKEDBY] [-r REVIEWEDBY] [-t TESTEDBY]
EOF
exit
}
mbox_from_url()
{
curl $1 | gunzip -f -c > mbox.i
}
get_cover()
{
cover_json=$(echo "$series_json" | jq '.cover_letter')
link=$(echo "$cover_json" | jq -r '.mbox' )
if [ "$link" == "null" ]; then
return
fi
curl -s $link > cover.i
cover_subject=$(echo -e "$cover_json" |
jq -r '.name' |
sed -e 's/\[.*\] *//')
branch=$(echo -e "$cover_json" |
jq -r '.name' |
sed -e 's/ *\[.*\] *//g' |
tr '[:upper:]' '[:lower:]' |
tr -d '\n' |
tr -cs '[:alnum:]_-' '-' |
sed -e 's/^-*\(.*[^-]\)-*$/\1/g')
cover_msgid=$(echo "$cover_json" | jq -r '.msgid' | tr -d '<>')
}
set_cover_tags()
{
[ -z "$cover_tags" ] && return
cover_json=$(echo "$series_json" | jq '.cover_letter')
[ "$cover_json" == "null" ] && return
clink=$(echo "$cover_json" | jq -r '.url')
link=$(curl -s "$clink" | jq -r '.comments')
[ "$link" == "null" ] && return
tags=$(echo -e "$(curl -s $link | jq -r '.[].content')" |
sed -n '/^\(Ack\|Review\|Test\)ed-[Bb]y:/p')
export ADD_TAGS="$tags"
}
clear_cover_tags()
{
[ -z "$cover_tags" ] && return
[ -n "$ADD_TAGS" ] && export ADD_TAGS=
}
accept_series()
{
for patch in $(git pw series show $1 -f simple 2> /dev/null | \
sed -n '/^Patches/,$p' | \
sed -r 's/.* ([0-9]*) .*/\1/g')
do
echo "Accepting $patch:"
git pw patch update --state accepted $patch -f simple 2> /dev/null
done
echo "Done, all accepted!"
rm -f mbox.i
exit
}
cover_from_url()
{
curl -s $1 | gunzip -f -c > tmp.i
series=`grep "href=\"/series" tmp.i|cut -d/ -f3|head -1`
cover_url=`grep "href=\"/project/netdevbpf/cover" tmp.i|cut -d\" -f2`
if [ -z "$cover_url" ]; then
merge=
fi
}
auto_branch="1"
edits=""
am_flags=""
series=""
accept=""
merge="1"
no_merge=""
mbox=""
cover=""
cover_tags="y"
mb2q_normalize="y"
head_old=$(git rev-parse --verify HEAD)
base=""
min_age=24
while true; do
case "$1" in
-3 ) am_flags="$am_flags -3"; shift ;;
-s | --series ) series="$2"; shift 2 ;;
-a | --accept ) accept="1"; shift ;;
-e | --do-edits ) edits="1"; shift ;;
-N | --no-mb2q ) mb2q_normalize=""; am_flags="$am_flags -s"; shift ;;
-P | --no-merge ) no_merge="1"; shift ;;
-m | --min-age ) min_age="$2"; shift ;;
-M | --manual-merge) auto_branch=""; shift ;;
-b | --mbox ) mbox="$2"; shift 2 ;;
-u | --upstream-base ) base="$2"; shift 2 ;;
-c | --cover) cover="$2"; shift 2 ;;
-T | --no-cover-tags) cover_tags=""; shift ;;
-h | --help ) usage; break ;;
-- ) shift; break ;;
* ) break ;;
esac
done
# Load the info from cover first, it may will populate $series and $merge
[ ! -z "$cover" ] && cover_from_url $cover
[ ! -z "$auto_branch" ] && [ -z "$series" ] && usage
[ ! -z "$mbox" ] && [ ! -z "$series" ] && usage
[ -z "$mbox" ] && [ -z "$series" ] && [ -z "$cover" ] && usage
[ ! -z "$accept" ] && [ ! -z "$mbox" ] && usage
[ ! -z "$series" ] && mbox_from_series $series $min_age
[ ! -z "$mbox" ] && mbox_from_url $mbox
[ ! -z "$accept" ] && accept_series $series
[ ! -z "$no_merge" ] && merge=
target=$(git branch --show-current)
branch="mbox"
body=
author=XYZ
if [ ! -z "$auto_branch" ]; then
get_cover
set_cover_tags
[ -z "$cover_msgid" ] && merge=
fi
if [ ! -z "$auto_branch" -a ! -z "$cover_msgid" ]; then
body=$(cat cover.i |
awk 'BEGIN {h=1;t=0}
/^[A-Za-z. ]* \([0-9]+\):$/ {t=1}
// {if (!h && !t) print}
/^$/ {h=0} ')
author=$(cat cover.i |
sed -n 's/^From: ['"'"'"]\?\([A-Za-z. -]*[a-z]\).*$/\1/p' |
tail -1)
fi
git checkout -b $branch $base
if [ ! -z "$mb2q_normalize" ]; then
mb2q --mboxout mbox.o "$@" mbox.i
else
cp mbox.i mbox.o
fi
if [ -z "$merge" ]; then
flags=$am_flags
# When running without mb2q ask git-am for msgid, and have a git hook
# transform that into a lore Link.
[ -z "$mb2q_normalize" ] && flags="$flags -m"
git am $flags mbox.o
else
git am $am_flags mbox.o
if [ ! -z "$edits" ] ; then
git rebase -i "${base:-$target}"
fi
while [ -d .git/rebase-merge ]; do
echo -ne "\rWaiting for rebase to finish $(date)"
sleep 0.5
done
echo
fi
git checkout "$target"
if [ ! -z "$merge" ]; then
git merge --stat --log --no-edit --no-ff $branch
git commit --amend --signoff -F- <<EOF
Merge branch '$branch'
$author says:
====================
$cover_subject
$body
====================
Link: https://lore.kernel.org/r/$cover_msgid
EOF
else
git merge --stat --ff $branch
fi
git branch -d $branch
rm -f mbox.i mbox.o tmp.i cover.i
head_new=$(git rev-parse --verify HEAD)
pw-check -s $head_old -e $head_new
if [ ! -z "$merge" ]; then
if [ -z "$edits" ] ; then
echo "Edit merge commit via: git commit --amend"
else
git commit --amend
fi
fi
clear_cover_tags
exit 0
|
