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 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341
|
#!/bin/sh -e
# Since we run with '#!/bin/sh -e'
# '$? != 0' will force an exit,
# i.e. where we are interested in the result of a command,
# we have to run the command in an if-statement.
UPSTREAM=${GLUSTER_UPSTREAM}
if [ "x$UPSTREAM" = "x" ]; then
for rmt in $(git remote); do
rmt_repo=$(LANGUAGE=en_US.UTF-8 git remote show $rmt -n | grep Fetch | awk '{ print $3 }');
if [ "${rmt_repo%.git}" = "git@github.com:gluster/glusterfs" ]; then
UPSTREAM=$rmt
echo "Picked ${UPSTREAM} as upstream remote"
break
fi
done
if [ "x$UPSTREAM" = "x" ]; then
echo "No git remote detected for git@github.com:gluster/glusterfs.git"
echo ""
echo "Exiting."
exit 1
fi
fi
USER_REPO=${GLUSTER_USER_REPO:-origin}
if [ "x${USER_REPO}" = "x${UPSTREAM}" ] ; then
echo "When you submit patches, it should get submitted to your fork, not to upstream directly"
echo "If you are not sure, check `for rmt in $(git remote); do git remote show $rmt -n; done`"
echo "And pick the correct remote you would like to push to and do `export GLUSTER_USER_REPO=$rmt`"
echo ""
echo "Exiting..."
exit 1
fi
echo "Picked ${USER_REPO} as user's remote";
FORCE="";
while getopts "vf" opt; do
case $opt in
v)
# Verbose mode
git () { >&2 echo "git $@" && `which git` $@; }
;;
f)
# Use force to git push
FORCE="--force";
;;
esac
done
# Move the positional arguments to the beginning
shift $((OPTIND-1))
branch="release-11";
set_hooks_commit_msg()
{
f=".git/hooks/commit-msg";
u="http://review.gluster.org/tools/hooks/commit-msg";
if [ -x "$f" ]; then
return;
fi
curl -L -o $f $u || wget -O $f $u;
chmod +x $f
# Let the 'Change-Id: ' header get assigned on first run of rfc.sh
GIT_EDITOR=true git commit --amend;
}
is_num()
{
local num;
num="$1";
[ -z "$(echo $num | sed -e 's/[0-9]//g')" ]
}
backport_id_message()
{
echo ""
echo "This commit is to a non-devel branch, and hence is treated as a backport."
echo ""
echo "For backports we would like to retain the same gerrit Change-Id across"
echo "branches. On auto inspection it is found that a gerrit Change-Id is"
echo "missing, or the Change-Id is not found on your local devel branch"
echo ""
echo "This could mean a few things:"
echo " 1. This is not a backport, hence choose Y on the prompt to proceed"
echo " 2. Your $USER_REPO/devel is not up to date, hence the script is unable"
echo " to find the corresponding Change-Id on devel. Either choose N,"
echo " 'git fetch', and try again, OR if you are sure you used the"
echo " same Change-Id, choose Y at the prompt to proceed"
echo " 3. You commented or removed the Change-Id in your commit message after"
echo " cherry picking the commit. Choose N, fix the commit message to"
echo " use the same Change-Id as 'devel' (git commit --amend), resubmit"
echo ""
}
check_backport()
{
moveon='N'
# Backports are never made to 'devel'
if [ $branch = "devel" ]; then
return;
fi
# Extract the change ID from the commit message
changeid=$(git log -n1 --format='%b' | grep -i '^Change-Id: ' | awk '{print $2}')
# If there is no change ID ask if we should continue
if [ -z "$changeid" ]; then
backport_id_message;
echo -n "Did not find a Change-Id for a possible backport. Continue (y/N): "
read moveon
else
# Search 'devel' for the same change ID (rebase_changes has run, so we
# should never not find a Change-Id)
mchangeid=$(git log ${UPSTREAM}/devel --format='%b' --grep="^Change-Id: ${changeid}" | grep ${changeid} | awk '{print $2}')
# Check if we found the change ID on 'devel', else throw a message to
# decide if we should continue.
# NOTE: If 'devel' was not rebased, we will not find the Change-ID and
# could hit a false positive case here (or if someone checks out some
# other branch as 'devel').
if [ "${mchangeid}" = "${changeid}" ]; then
moveon="Y"
else
backport_id_message;
echo "Change-Id of commit: $changeid"
echo "Change-Id on devel: $mchangeid"
echo -n "Did not find mentioned Change-Id on 'devel' for a possible backport. Continue (y/N): "
read moveon
fi
fi
if [ "${moveon}" = 'Y' ] || [ "${moveon}" = 'y' ]; then
return;
else
exit 1
fi
}
rebase_changes()
{
GIT_EDITOR=$0 git rebase -i $UPSTREAM/$branch;
}
# Regex elaborated:
# grep options:
# -w -> --word-regexp (from the man page)
# Select only those lines containing matches that form whole words.
# The test is that the matching substring must either be at the
# beginning of the line, or preceded by a non-word constituent
# character. Similarly, it must be either at the end of the line or
# followed by a non-word constituent character. Word-constituent
# characters are letters, digits, and the underscore.
#
# IOW, the above helps us find the pattern with leading or training
# spaces or non word consituents like , or ;
#
# -i -> --ignore-case (case insensitive search)
#
# -o -> --only-matching (only print matching portion of the line)
#
# -E -> --extended-regexp (use extended regular expression)
#
# ^
# The search begins at the start of each line
#
# [[:space:]]*
# Any number of spaces is accepted
#
# (Fixes|Updates)
# Finds 'Fixes' OR 'Updates' in any case combination
#
# (:)?
# Followed by an optional : (colon)
#
# [[:space:]]+
# Followed by 1 or more spaces
#
# #
# Followed by #
#
# [[:digit:]]+
# Followed by 1 or more digits
REFRE="^[[:space:]]*(Fixes|Updates)(:)?[[:space:]]+#[[:digit:]]+"
editor_mode()
{
if [ $(basename "$1") = "git-rebase-todo" ]; then
sed 's/^pick /reword /g' "$1" > $1.new && mv $1.new $1;
return;
fi
if [ $(basename "$1") = "COMMIT_EDITMSG" ]; then
# see note above function warn_reference_missing for regex elaboration
# Lets first check for github issues
ref=$(git log -n1 --format='%b' | grep -iow -E "${REFRE}" | awk -F '#' '{print $2}');
if [ "x${ref}" != "x" ]; then
return;
fi
while true; do
echo Commit: "\"$(head -n 1 $1)\""
echo -n "Github Issue ID: "
read issue
if [ -z "$issue" ]; then
return;
fi
if ! is_num "$issue"; then
echo "Invalid Github Issue ID!!!";
continue;
fi
echo "Select yes '(y)' if this patch fixes the issue/feature completely,"
echo -n "or is the last of the patchset which brings feature (Y/n): "
read fixes
fixes_string="Fixes"
if [ "${fixes}" = 'N' ] || [ "${fixes}" = 'n' ]; then
fixes_string="Updates"
fi
sed "/^Change-Id:/{p; s/^.*$/${fixes_string}: #${issue}/;}" $1 > $1.new && \
mv $1.new $1;
return;
done
fi
cat <<EOF
$0 - editor_mode called on unrecognized file $1 with content:
$(cat $1)
EOF
return 1;
}
assert_diverge()
{
git diff $UPSTREAM/$branch..HEAD | grep -q .;
}
warn_reference_missing()
{
echo ""
echo "=== Missing a reference in commit! ==="
echo ""
echo "Gluster commits are made with a reference to a github issue"
echo ""
echo "A check on the commit message, reveals that there is no "
echo "github issue referenced in the commit message."
echo ""
echo "https://github.com/gluster/glusterfs/issues/new"
echo ""
echo "Please open an issue and reference the same in the commit message "
echo "using the following tags:"
echo ""
echo "\"Fixes: #NNNN\" OR \"Updates: #NNNN\","
echo "where NNNN is the issue id"
echo ""
echo "You may abort the submission choosing 'N' below and use"
echo "'git commit --amend' to add the issue reference before posting"
echo "to gerrit."
echo ""
echo -n "Missing reference to a github issue. Continue (y/N): "
read moveon
if [ "${moveon}" = 'Y' ] || [ "${moveon}" = 'y' ]; then
return;
else
exit 1
fi
}
main()
{
set_hooks_commit_msg;
# rfc.sh calls itself from rebase_changes, which uses rfc.sh as the EDITOR
# thus, getting the commit message to work with in the editor_mode.
if [ -e "$1" ]; then
editor_mode "$@";
return;
fi
git fetch $UPSTREAM;
rebase_changes;
check_backport;
assert_diverge;
# see note above variable REFRE for regex elaboration
reference=$(git log -n1 --format='%b' | grep -iow -E "${REFRE}" | awk -F '#' '{print $2}');
# If this is a commit against 'devel' and does not have a github
# issue reference. Warn the contributor that one of the 2 is required
if [ -z "${reference}" ] && [ $branch = "devel" ]; then
warn_reference_missing;
fi
# TODO: add clang-format command here. It will after the changes are done everywhere else
clang_format=$(clang-format --version)
if [ ! -z "${clang_format}" ]; then
# Considering git show may not give any files as output matching the
# criteria, good to tell script not to fail on error
set +e
list_of_files=$(git show --pretty="format:" --name-only |
grep -v "contrib/" | egrep --color=never "*\.[ch]$");
if [ ! -z "${list_of_files}" ]; then
echo "${list_of_files}" | xargs clang-format -i
fi
set -e
else
echo "High probability of your patch not passing smoke due to coding standard check"
echo "Please install 'clang-format' to format the patch before submitting"
fi
if [ "$DRY_RUN" = 1 ]; then
drier='echo -e Please use the following command to send your commits to review:\n\n'
else
drier=
fi
if [ -z "${reference}" ]; then
$drier git push $USER_REPO HEAD:temp_${branch}/$(date +%Y-%m-%d_%s) $FORCE;
else
$drier git push $USER_REPO HEAD:issue${reference}_${branch} $FORCE;
fi
}
main "$@"
|