stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8004726: Link bug ids to jbs rather than monaco

Browse Source 
Reviewed-by: ohair, chegar, katleman
This commit is contained in:
Mike Duigou 2013-02-06 11:09:24 -08:00
parent dab327e501
commit 574897c629
1 changed files with 41 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
make/scripts/webrev.ksh
View File

@ -19,7 +19,7 @@
# #
# CDDL HEADER END # CDDL HEADER END
# #
# Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved. # Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
# Use is subject to license terms. # Use is subject to license terms.
# #
# This script takes a file list and a workspace and builds a set of html files # This script takes a file list and a workspace and builds a set of html files
@ -27,7 +27,7 @@
# Documentation is available via 'webrev -h'. # Documentation is available via 'webrev -h'.
# #
WEBREV_UPDATED=23.18-hg WEBREV_UPDATED=23.18-hg+jbs
HTML='<?xml version="1.0"?> HTML='<?xml version="1.0"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
@ -146,7 +146,7 @@ html_quote()
# #
bug2url() bug2url()
{ {
sed -e 's|[0-9]\{5,\}|<a href=\"'$BUGURL'&\">&</a>|g' sed -e 's|[0-9]\{5,\}|<a href=\"'$BUGURL$IDPREFIX'&\">&</a>|g'
} }
# #
@ -230,8 +230,8 @@ strip_unchanged()
# $ sdiff_to_html old/usr/src/tools/scripts/webrev.sh \ # $ sdiff_to_html old/usr/src/tools/scripts/webrev.sh \
# new/usr/src/tools/scripts/webrev.sh \ # new/usr/src/tools/scripts/webrev.sh \
# webrev.sh usr/src/tools/scripts \ # webrev.sh usr/src/tools/scripts \
# '<a href="http://monaco.sfbay.sun.com/detail.jsp?cr=1234567"> # '<a href="https://jbs.oracle.com/bugs/browse/JDK-1234567">
# 1234567</a> my bugid' > <file>.html # JDK-1234567</a> my bugid' > <file>.html
# #
# framed_sdiff() is then called which creates $2.frames.html # framed_sdiff() is then called which creates $2.frames.html
# in the webrev tree. # in the webrev tree.
@ -1160,7 +1160,7 @@ comments_from_mercurial()
print "$comm" print "$comm"
return return
fi fi
print "$comm" | html_quote | bug2url | sac2url print "$comm" | html_quote | bug2url | sac2url
) )
fi fi
@ -1418,7 +1418,7 @@ function outgoing_from_mercurial_forest
next;} next;}
END {for (tree in trees) END {for (tree in trees)
{ rev=revs[trees[tree]]; { rev=revs[trees[tree]];
if (rev > 0) if (rev > 0)
{printf("%s %d\n",trees[tree],rev-1)} {printf("%s %d\n",trees[tree],rev-1)}
}}' | while read LINE }}' | while read LINE
do do
@ -1459,7 +1459,7 @@ function treestatus
{ {
TREE=$1 TREE=$1
HGCMD="hg -R $CWS/$TREE status $FSTAT_OPT" HGCMD="hg -R $CWS/$TREE status $FSTAT_OPT"
$HGCMD -mdn 2>/dev/null | $FILTER | while read F $HGCMD -mdn 2>/dev/null | $FILTER | while read F
do do
echo $TREE/$F echo $TREE/$F
@ -1543,7 +1543,7 @@ function fstatus
if (n == 0) if (n == 0)
{ printf("A %s/%s\n",tree,$2)} { printf("A %s/%s\n",tree,$2)}
else else
{ printf("A %s\n",$2)}; { printf("A %s\n",$2)};
next} next}
/^ / {n=index($1,tree); /^ / {n=index($1,tree);
if (n == 0) if (n == 0)
@ -1604,7 +1604,7 @@ function fstatus
# We need at least one of default-push or default paths set in .hg/hgrc # We need at least one of default-push or default paths set in .hg/hgrc
# If neither are set we don't know who to compare with. # If neither are set we don't know who to compare with.
function flist_from_mercurial function flist_from_mercurial
{ {
# if [ "${PWS##ssh://}" != "$PWS" -o \ # if [ "${PWS##ssh://}" != "$PWS" -o \
# "${PWS##http://}" != "$PWS" -o \ # "${PWS##http://}" != "$PWS" -o \
@ -1757,7 +1757,7 @@ function look_for_prog
elif [[ "$OS" == "Linux" ]]; then elif [[ "$OS" == "Linux" ]]; then
DEVTOOLS="/java/devtools/linux/bin" DEVTOOLS="/java/devtools/linux/bin"
fi fi
ppath=$PATH ppath=$PATH
ppath=$ppath:/usr/sfw/bin:/usr/bin:/usr/sbin ppath=$ppath:/usr/sfw/bin:/usr/bin:/usr/sbin
ppath=$ppath:/opt/teamware/bin:/opt/onbld/bin ppath=$ppath:/opt/teamware/bin:/opt/onbld/bin
@ -1844,7 +1844,7 @@ function extract_ssh_infos
ssh_host=`echo $CMD | sed -e 's/ssh:\/\/\([^/]*\)\/.*/\1/'` ssh_host=`echo $CMD | sed -e 's/ssh:\/\/\([^/]*\)\/.*/\1/'`
ssh_dir=`echo $CMD | sed -e 's/ssh:\/\/[^/]*\/\(.*\)/\1/'` ssh_dir=`echo $CMD | sed -e 's/ssh:\/\/[^/]*\/\(.*\)/\1/'`
fi fi
} }
function build_old_new_mercurial function build_old_new_mercurial
@ -2096,7 +2096,7 @@ do
PARENT_REV=$OPTARG;; PARENT_REV=$OPTARG;;
v) print "$0 version: $WEBREV_UPDATED";; v) print "$0 version: $WEBREV_UPDATED";;
?) usage;; ?) usage;;
esac esac
@ -2338,7 +2338,7 @@ if [[ $SCM_MODE == "teamware" ]]; then
# #
[[ -z $codemgr_ws && -n $CODEMGR_WS ]] && codemgr_ws=$CODEMGR_WS [[ -z $codemgr_ws && -n $CODEMGR_WS ]] && codemgr_ws=$CODEMGR_WS
[[ -z $codemgr_ws && -n $WSPACE ]] && codemgr_ws=`$WSPACE name` [[ -z $codemgr_ws && -n $WSPACE ]] && codemgr_ws=`$WSPACE name`
if [[ -n $codemgr_ws && ! -d $codemgr_ws ]]; then if [[ -n $codemgr_ws && ! -d $codemgr_ws ]]; then
print -u2 "$codemgr_ws: no such workspace" print -u2 "$codemgr_ws: no such workspace"
exit 1 exit 1
@ -2521,10 +2521,16 @@ print " Output to: $WDIR"
# Bug IDs will be replaced by a URL. Order of precedence # Bug IDs will be replaced by a URL. Order of precedence
# is: default location, $WEBREV_BUGURL, the -O flag. # is: default location, $WEBREV_BUGURL, the -O flag.
# #
BUGURL='http://monaco.sfbay.sun.com/detail.jsp?cr=' BUGURL='https://jbs.oracle.com/bugs/browse/'
[[ -n $WEBREV_BUGURL ]] && BUGURL="$WEBREV_BUGURL" [[ -n $WEBREV_BUGURL ]] && BUGURL="$WEBREV_BUGURL"
[[ -n "$Oflag" ]] && \ if [[ -n "$Oflag" ]]; then
CRID=`echo $CRID | sed -e 's/JDK-//'`
BUGURL='http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=' BUGURL='http://bugs.sun.com/bugdatabase/view_bug.do?bug_id='
IDPREFIX=''
else
IDPREFIX='JDK-'
fi
# #
# Likewise, ARC cases will be replaced by a URL. Order of precedence # Likewise, ARC cases will be replaced by a URL. Order of precedence
@ -2561,7 +2567,7 @@ fi
# #
# Should we ignore changes in white spaces when generating diffs? # Should we ignore changes in white spaces when generating diffs?
# #
if [[ -n $bflag ]]; then if [[ -n $bflag ]]; then
DIFFOPTS="-t" DIFFOPTS="-t"
else else
@ -2748,7 +2754,7 @@ do
fi fi
fi fi
else else
# #
# If we have old and new versions of the file then run the # If we have old and new versions of the file then run the
# appropriate diffs. This is complicated by a couple of factors: # appropriate diffs. This is complicated by a couple of factors:
@ -3000,22 +3006,31 @@ fi
# external URL has a <title> like: # external URL has a <title> like:
# <title>Bug ID: 6641309 Wrong Cookie separator used in HttpURLConnection</title> # <title>Bug ID: 6641309 Wrong Cookie separator used in HttpURLConnection</title>
# while internal URL has <title> like: # while internal URL has <title> like:
# <title>6641309: Wrong Cookie separator used in HttpURLConnection</title> # <title>[#JDK-6641309] Wrong Cookie separator used in HttpURLConnection</title>
# #
if [[ -n $CRID ]]; then if [[ -n $CRID ]]; then
for id in $CRID for id in $CRID
do do
if [[ -z "$Oflag" ]]; then
#add "JDK-" to raw bug id for jbs links.
id=`echo ${id} | sed 's/^\([0-9]\{5,\}\)$/JDK-\1/'`
fi
print "<tr><th>Bug id:</th><td>" print "<tr><th>Bug id:</th><td>"
url="${BUGURL}${id}" url="${BUGURL}${id}"
if [[ -n $WGET ]]; then if [[ -n "$Oflag" ]]; then
msg=`$WGET -q $url -O - | grep '<title>' | sed 's/<title>\(.*\)<\/title>/\1/' | sed 's/Bug ID://'` cleanup='s/Bug ID: \([0-9]\{5,\}\) \(.*\)/JDK-\1 : \2/'
fi
if [[ -n $msg ]]; then
print "<a href=\"$url\">$msg</a>"
else else
print $id | bug2url cleanup='s|\[#\(JDK-[0-9]\{5,\}\)\] \(.*\)|\1 : \2|'
fi fi
if [[ -n $WGET ]]; then
msg=`$WGET --timeout=10 --tries=1 -q $url -O - | grep '<title>' | sed 's/<title>\(.*\)<\/title>/\1/' | sed "$cleanup"`
fi
if [[ -z $msg ]]; then
msg="${id}"
fi
print "<a href=\"$url\">$msg</a>"
print "</td></tr>" print "</td></tr>"
done done
fi fi
@ -3179,4 +3194,3 @@ exec 3<&- # close FD 3.
print "Done." print "Done."
print "Output to: $WDIR" print "Output to: $WDIR"