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

git-arc: Just strip escape sequences form arc log

Browse source 
Just strip escape sequences and Warning: lines from 'arc list' output. I
upgraded and they changed and git arc list broke. This restores its
functionality.

Note: jhb didn't like this, so if others object, I'll fix...

Sponsored by:		Netflix
Reviewed by:		markj
Differential Revision:	https://reviews.freebsd.org/D36553
This commit is contained in:
Warner Losh 2024-01-14 19:22:04 -07:00
parent 3d939d967a
commit df834e06bb
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -142,6 +142,15 @@ __EOF__
exit 1
}
#
# 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)
#
arc_list()
{
arc list "$@" | sed 's/\x1b\[[0-9;]*m//g' | grep -v '^Warning: '
}
diff2phid()
{
local diff
@ -194,8 +203,7 @@ title2diff()
local title
title=$(echo $1 | sed 's/"/\\"/g')
# arc list output always includes ANSI escape sequences, strip them.
arc list | sed 's/\x1b\[[0-9;]*m//g' | \
arc_list |
awk -F': ' '{
if (substr($0, index($0, FS) + length(FS)) == "'"$title"'") {
print substr($1, match($1, "D[1-9][0-9]*"))
@ -406,7 +414,7 @@ gitarc__list()
local chash commit commits diff openrevs title
commits=$(build_commit_list "$@")
openrevs=$(arc list)
openrevs=$(arc_list)
for commit in $commits; do
chash=$(git show -s --format='%C(auto)%h' "$commit")
@ -422,7 +430,7 @@ gitarc__list()
# differently and keep the entire status.
title=$(git show -s --format=%s "$commit")
diff=$(echo "$openrevs" | \
awk -F'D[1-9][0-9]*:\.\\[m ' \
awk -F'D[1-9][0-9]*: ' \
'{if ($2 == "'"$(echo $title | sed 's/"/\\"/g')"'") print $0}')
if [ -z "$diff" ]; then
echo "No Review : $title"