mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-11-24 07:40:52 +00:00
Code Issues Releases Activity

git-arc: Fix find_author() for external users

Browse Source 
When an external user submits a review in Phabricator, the find_author()
subroutine may receive the author_name and author_addr as "null" from
the JSON API with git-arc patch.

This "null" string gets tested for length by "[ -n", and returning that
is greater than zero, in other words, the shell does not understand that
"null" means nothing in this case.

Fix it by adding a guard, that sets an empty string when the content is
"null".

While here, standardize the indentation style for find_author()

Reviewed by:	emaste, markj
Approved by:	emaste (mentor)
Differential Revision:	https://reviews.freebsd.org/D46789
This commit is contained in:
Jose Luis Duran 2024-11-05 01:32:25 +00:00
parent b032be711c
commit aa90b92ac2
No known key found for this signature in database
GPG Key ID: 5415E244477475CC
1 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
tools/tools/git/git-arc.sh
View File

@ -493,16 +493,16 @@ find_author()
case "${addr}" in case "${addr}" in
*.*) ;; # external user *.*) ;; # external user
*) *)
echo "${name} <${addr}@FreeBSD.org>" echo "${name} <${addr}@FreeBSD.org>"
return return
;; ;;
esac esac
# Choice 2: author_addr and author_name were set in the bundle, so use # Choice 2: author_addr and author_name were set in the bundle, so use
# that. We may need to filter some known bogus ones, should they crop up. # that. We may need to filter some known bogus ones, should they crop up.
if [ -n "$author_name" -a -n "$author_addr" ]; then if [ -n "$author_name" -a -n "$author_addr" ]; then
echo "${author_name} <${author_addr}>" echo "${author_name} <${author_addr}>"
return return
fi fi
# Choice 3: We can find this user in the FreeBSD repo. They've submited # Choice 3: We can find this user in the FreeBSD repo. They've submited
@ -510,8 +510,8 @@ find_author()
# similar to their phab username. # similar to their phab username.
email=$(git log -1 --author "$(echo ${addr} | tr _ .)" --pretty="%aN <%aE>") email=$(git log -1 --author "$(echo ${addr} | tr _ .)" --pretty="%aN <%aE>")
if [ -n "${email}" ]; then if [ -n "${email}" ]; then
echo "${email}" echo "${email}"
return return
fi fi
# Choice 4: We know this user. They've committed before, and they happened # Choice 4: We know this user. They've committed before, and they happened
@ -519,11 +519,11 @@ find_author()
# might not be a good idea, since names can be somewhat common (there # might not be a good idea, since names can be somewhat common (there
# are two Andrew Turners that have contributed to FreeBSD, for example). # are two Andrew Turners that have contributed to FreeBSD, for example).
if ! (echo "${name}" | grep -w "[Uu]ser" -q); then if ! (echo "${name}" | grep -w "[Uu]ser" -q); then
email=$(git log -1 --author "${name}" --pretty="%aN <%aE>") email=$(git log -1 --author "${name}" --pretty="%aN <%aE>")
if [ -n "$email" ]; then if [ -n "$email" ]; then
echo "$email" echo "$email"
return return
fi fi
fi fi
# Choice 5: Wing it as best we can. In this scenario, we replace the last _ # Choice 5: Wing it as best we can. In this scenario, we replace the last _
@ -534,8 +534,8 @@ find_author()
a=$(printf "%s <%s>\n" "${name}" $(echo "$addr" | sed -e 's/\(.*\)_/\1@/')) a=$(printf "%s <%s>\n" "${name}" $(echo "$addr" | sed -e 's/\(.*\)_/\1@/'))
echo "Making best guess: Truning ${addr} to ${a}" echo "Making best guess: Truning ${addr} to ${a}"
if ! prompt; then if ! prompt; then
echo "ABORT" echo "ABORT"
return return
fi fi
echo "${a}" echo "${a}"
} }
@ -572,6 +572,16 @@ patch_commit()
jq -r '.response | flatten | .[]' > "$diff_data" jq -r '.response | flatten | .[]' > "$diff_data"
author_addr=$(jq -r ".authorEmail?" "$diff_data" | sort -u) author_addr=$(jq -r ".authorEmail?" "$diff_data" | sort -u)
author_name=$(jq -r ".authorName?" "$diff_data" | sort -u) author_name=$(jq -r ".authorName?" "$diff_data" | sort -u)
# JSON will return "null" when a field is not populated.
# Turn this string into an empty one.
if [ "$author_addr" = "null" ]; then
author_addr=""
fi
if [ "$author_name" = "null" ]; then
author_name=""
fi
author=$(find_author "$user_addr" "$user_name" "$author_addr" "$author_name") author=$(find_author "$user_addr" "$user_name" "$author_addr" "$author_name")
rm "$diff_data" rm "$diff_data"