Merge

Tue, 17 Sep 2013 08:08:01 -0700

author
lana
date
Tue, 17 Sep 2013 08:08:01 -0700
changeset 793
4bf059350c51
parent 789
14fe208b657c
parent 792
67f64101616e
child 800
59d6af7422af

Merge

     1.1 --- a/common/bin/hgforest.sh	Thu Sep 12 11:08:54 2013 -0700
     1.2 +++ b/common/bin/hgforest.sh	Tue Sep 17 08:08:01 2013 -0700
     1.3 @@ -47,7 +47,7 @@
     1.4  bpython=""
     1.5  
     1.6  if [ "#!" = "$has_hash_bang" ] ; then
     1.7 -   python="`head -n 1 ${whichhg} | cut -b 3-`"
     1.8 +   python="`head -n 1 ${whichhg} | cut -b 3- | sed -e 's/^[ \t]*//;s/[ \t]*$//'`"
     1.9     bpython="`basename "$python"`"
    1.10  fi
    1.11  
     2.1 --- a/make/scripts/webrev.ksh	Thu Sep 12 11:08:54 2013 -0700
     2.2 +++ b/make/scripts/webrev.ksh	Tue Sep 17 08:08:01 2013 -0700
     2.3 @@ -27,7 +27,7 @@
     2.4  # Documentation is available via 'webrev -h'.
     2.5  #
     2.6  
     2.7 -WEBREV_UPDATED=24.0-hg+jbs
     2.8 +WEBREV_UPDATED=24.1-hg+openjdk.java.net
     2.9  
    2.10  HTML='<?xml version="1.0"?>
    2.11  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
    2.12 @@ -230,7 +230,7 @@
    2.13  #   $ sdiff_to_html old/usr/src/tools/scripts/webrev.sh \
    2.14  #         new/usr/src/tools/scripts/webrev.sh \
    2.15  #         webrev.sh usr/src/tools/scripts \
    2.16 -#         '<a href="https://jbs.oracle.com/bugs/browse/JDK-1234567">
    2.17 +#         '<a href="https://bugs.openjdk.java.net/browse/JDK-1234567">
    2.18  #          JDK-1234567</a> my bugid' > <file>.html
    2.19  #
    2.20  # framed_sdiff() is then called which creates $2.frames.html
    2.21 @@ -1476,7 +1476,7 @@
    2.22      # The first and last are simple addition while the middle one
    2.23      # is a move/rename or a copy.  We can't distinguish from a rename vs a copy
    2.24      # without also getting the status of removed files.  The middle case above
    2.25 -    # is a rename if File4 is also shown a being removed.  If File4 is not a 
    2.26 +    # is a rename if File4 is also shown a being removed.  If File4 is not a
    2.27      # removed file, then the middle case is a copy from File4 to subdir/File4
    2.28      # FIXME - we're not distinguishing copy from rename
    2.29      $HGCMD -aC | $FILTER | while read LINE; do
    2.30 @@ -1644,7 +1644,7 @@
    2.31          # The first and last are simple addition while the middle one
    2.32          # is a move/rename or a copy.  We can't distinguish from a rename vs a copy
    2.33          # without also getting the status of removed files.  The middle case above
    2.34 -        # is a rename if File4 is also shown a being removed.  If File4 is not a 
    2.35 +        # is a rename if File4 is also shown a being removed.  If File4 is not a
    2.36          # removed file, then the middle case is a copy from File4 to subdir/File4
    2.37          # FIXME - we're not distinguishing copy from rename
    2.38  
    2.39 @@ -2529,7 +2529,7 @@
    2.40  #    Bug IDs will be replaced by a URL.  Order of precedence
    2.41  #    is: default location, $WEBREV_BUGURL, the -O flag.
    2.42  #
    2.43 -BUGURL='https://jbs.oracle.com/bugs/browse/'
    2.44 +BUGURL='https://bugs.openjdk.java.net/browse/'
    2.45  [[ -n $WEBREV_BUGURL ]] && BUGURL="$WEBREV_BUGURL"
    2.46  if [[ -n "$Oflag" ]]; then
    2.47      CRID=`echo $CRID | sed -e 's/JDK-//'`
    2.48 @@ -3056,7 +3056,7 @@
    2.49      for id in $CRID
    2.50      do
    2.51          if [[ -z "$Oflag" ]]; then
    2.52 -            #add "JDK-" to raw bug id for jbs links.
    2.53 +            #add "JDK-" to raw bug id for openjdk.java.net links.
    2.54              id=`echo ${id} | sed 's/^\([0-9]\{5,\}\)$/JDK-\1/'`
    2.55          fi
    2.56          print "<tr><th>Bug id:</th><td>"

mercurial