Skip to content

D
dragonwell8

openanolis / dragonwell8

通知 5
Star 3
Fork 0
D
dragonwell8
提交 df14ae2d 编写于 作者: L lana
浏览文件
操作

Merge

上级 8eff7b0e 97f7314b
隐藏空白更改
内联 并排
Showing with 7 addition and 7 deletion
common/bin/hgforest.sh
浏览文件 @ df14ae2d
...@@ -47,7 +47,7 @@ python="" ...@@ -47,7 +47,7 @@ python=""
bpython="" bpython=""
if [ "#!" = "$has_hash_bang" ] ; then if [ "#!" = "$has_hash_bang" ] ; then
python="`head -n 1 ${whichhg} | cut -b 3-`" python="`head -n 1 ${whichhg} | cut -b 3- | sed -e 's/^[ \t]*//;s/[ \t]*$//'`"
bpython="`basename "$python"`" bpython="`basename "$python"`"
fi fi
......
make/scripts/webrev.ksh
浏览文件 @ df14ae2d
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
# Documentation is available via 'webrev -h'. # Documentation is available via 'webrev -h'.
# #
WEBREV_UPDATED=24.0-hg+jbs WEBREV_UPDATED=24.1-hg+openjdk.java.net
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"
...@@ -230,7 +230,7 @@ strip_unchanged() ...@@ -230,7 +230,7 @@ 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="https://jbs.oracle.com/bugs/browse/JDK-1234567"> # '<a href="https://bugs.openjdk.java.net/browse/JDK-1234567">
# JDK-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
...@@ -1476,7 +1476,7 @@ function treestatus ...@@ -1476,7 +1476,7 @@ function treestatus
# The first and last are simple addition while the middle one # The first and last are simple addition while the middle one
# is a move/rename or a copy. We can't distinguish from a rename vs a copy # is a move/rename or a copy. We can't distinguish from a rename vs a copy
# without also getting the status of removed files. The middle case above # without also getting the status of removed files. The middle case above
# is a rename if File4 is also shown a being removed. If File4 is not a # is a rename if File4 is also shown a being removed. If File4 is not a
# removed file, then the middle case is a copy from File4 to subdir/File4 # removed file, then the middle case is a copy from File4 to subdir/File4
# FIXME - we're not distinguishing copy from rename # FIXME - we're not distinguishing copy from rename
$HGCMD -aC | $FILTER | while read LINE; do $HGCMD -aC | $FILTER | while read LINE; do
...@@ -1644,7 +1644,7 @@ function flist_from_mercurial ...@@ -1644,7 +1644,7 @@ function flist_from_mercurial
# The first and last are simple addition while the middle one # The first and last are simple addition while the middle one
# is a move/rename or a copy. We can't distinguish from a rename vs a copy # is a move/rename or a copy. We can't distinguish from a rename vs a copy
# without also getting the status of removed files. The middle case above # without also getting the status of removed files. The middle case above
# is a rename if File4 is also shown a being removed. If File4 is not a # is a rename if File4 is also shown a being removed. If File4 is not a
# removed file, then the middle case is a copy from File4 to subdir/File4 # removed file, then the middle case is a copy from File4 to subdir/File4
# FIXME - we're not distinguishing copy from rename # FIXME - we're not distinguishing copy from rename
...@@ -2529,7 +2529,7 @@ print " Output to: $WDIR" ...@@ -2529,7 +2529,7 @@ 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='https://jbs.oracle.com/bugs/browse/' BUGURL='https://bugs.openjdk.java.net/browse/'
[[ -n $WEBREV_BUGURL ]] && BUGURL="$WEBREV_BUGURL" [[ -n $WEBREV_BUGURL ]] && BUGURL="$WEBREV_BUGURL"
if [[ -n "$Oflag" ]]; then if [[ -n "$Oflag" ]]; then
CRID=`echo $CRID | sed -e 's/JDK-//'` CRID=`echo $CRID | sed -e 's/JDK-//'`
...@@ -3056,7 +3056,7 @@ if [[ -n $CRID ]]; then ...@@ -3056,7 +3056,7 @@ if [[ -n $CRID ]]; then
for id in $CRID for id in $CRID
do do
if [[ -z "$Oflag" ]]; then if [[ -z "$Oflag" ]]; then
#add "JDK-" to raw bug id for jbs links. #add "JDK-" to raw bug id for openjdk.java.net links.
id=`echo ${id} | sed 's/^\([0-9]\{5,\}\)$/JDK-\1/'` id=`echo ${id} | sed 's/^\([0-9]\{5,\}\)$/JDK-\1/'`
fi fi
print "<tr><th>Bug id:</th><td>" print "<tr><th>Bug id:</th><td>"
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或