Page Menu
Home
FreeBSD
Search
Configure Global Search
Log In
Files
F145830094
D36553.id121719.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Flag For Later
Award Token
Size
1 KB
Referenced Files
None
Subscribers
None
D36553.id121719.diff
View Options
diff --git a/tools/tools/git/git-arc.sh b/tools/tools/git/git-arc.sh
--- a/tools/tools/git/git-arc.sh
+++ b/tools/tools/git/git-arc.sh
@@ -142,6 +142,15 @@
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 @@
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 @@
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 @@
# 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"
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Thu, Feb 26, 12:26 AM (7 h, 35 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28975578
Default Alt Text
D36553.id121719.diff (1 KB)
Attached To
Mode
D36553: git-arc: Just strip escape sequences form arc log
Attached
Detach File
Event Timeline
Log In to Comment