upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-12 02:00:31 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

git-arc: Cope with extra output

Browse source 
On my machine, for reasons beyond my understanding, I get this warning
two times when running arc:

Warning: Module "openssl" is already loaded in Unknown on line 0

so grep -v ^Warning: on all the arc call-conduit calls to filter them
out so we can properly parse the JSON with jq.

Sponsored by:		Netflix
Reviewed by:		markj, jhb
Differential Revision:	https://reviews.freebsd.org/D36583
This commit is contained in:
Warner Losh 2024-01-14 19:22:49 -07:00
parent df834e06bb
commit 9f48ef1fca
1 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
tools/tools/git/git-arc.sh
View file

@ -142,6 +142,17 @@ __EOF__
exit 1
}
#
# Filter the output of call-conduit to remove the warnings that are generated
# for some installations where openssl module is mysteriously installed twice so
# a warning is generated. It's likely a local config error, but we should work
# in the face of that.
#
arc_call_conduit()
{
arc call-conduit "$@" | grep -v '^Warning: '
}
#
# Filter the output of arc list to remove the warnings as above, as well as any
# stray escape sequences that are in the list (it interferes with the parsing)
@ -161,7 +172,7 @@ diff2phid()
fi
echo '{"names":["'"$diff"'"]}' |
arc call-conduit -- phid.lookup |
arc_call_conduit -- phid.lookup |
jq -r "select(.response != []) | .response.${diff}.phid"
}
@ -176,7 +187,7 @@ diff2status()
tmp=$(mktemp)
echo '{"names":["'"$diff"'"]}' |
arc call-conduit -- phid.lookup > "$tmp"
arc_call_conduit -- phid.lookup > "$tmp"
status=$(jq -r "select(.response != []) | .response.${diff}.status" < "$tmp")
summary=$(jq -r "select(.response != []) |
.response.${diff}.fullName" < "$tmp")
@ -280,7 +291,7 @@ create_one_review()
"value": ["'"${parentphid}"'"]
}
]}' |
arc call-conduit -- differential.revision.edit >&3
arc_call_conduit -- differential.revision.edit >&3
fi
rm -f "$msg"
return 0
@ -298,13 +309,13 @@ diff2reviewers()
"constraints": {"phids": ["'"$reviewid"'"]},
"attachments": {"reviewers": true}
}' |
arc call-conduit -- differential.revision.search |
arc_call_conduit -- differential.revision.search |
jq '.response.data[0].attachments.reviewers.reviewers[] | select(.status == "accepted").reviewerPHID')
if [ -n "$userids" ]; then
echo '{
"constraints": {"phids": ['"$(echo -n "$userids" | tr '[:space:]' ',')"']}
}' |
arc call-conduit -- user.search |
arc_call_conduit -- user.search |
jq -r '.response.data[].fields.username'
fi
}