Merge branch '2.9.x' of github.com:scala/scala into 2.9.x

jsuereth · jsuereth · commit c5a14a5e2432 · 2012-03-24T22:18:17.000-04:00
diff --git a/build.xml b/build.xml
@@ -257,13 +257,10 @@ INITIALISATION
     </condition>
     
     <exec osfamily="unix" executable="tools/get-scala-commit-sha" outputproperty="git.commit.sha" failifexecutionfails="false" />
-    <exec osfamily="windows" executable="tools/get-scala-commit-sha.bat" outputproperty="git.commit.sha" failifexecutionfails="false" />
     <exec osfamily="unix" executable="tools/get-scala-commit-date" outputproperty="git.commit.date" failifexecutionfails="false" />
-    <exec osfamily="windows" executable="tools/get-scala-commit-date.bat" outputproperty="git.commit.date" failifexecutionfails="false" />
-    <exec osfamily="unix" executable="tools/get-scala-commit-drift" outputproperty="git.commit.drift" failifexecutionfails="false" />
-    <exec osfamily="windows" executable="tools/get-scala-commit-drift.bat" outputproperty="git.commit.drift" failifexecutionfails="false" />
     <!-- some default in case something went wrong getting the revision -->
-    <property name="git.describe" value="-unknown-"/>
+    <property name="git.commit.sha" value="unknown"/>
+    <property name="git.commit.date" value="unknown"/>
 
     <property name="init.avail" value="yes"/>
 
@@ -273,7 +270,7 @@ INITIALISATION
       value="${version.major}.${version.minor}.${version.patch}${version.suffix}${maven.version.suffix}"/>
     <property
       name="version.number"
-      value="${maven.version.number}-${git.commit.date}-${git.commit.drift}-${git.commit.sha}"/>
+      value="${version.major}.${version.minor}.${version.patch}${version.suffix}-${git.commit.date}-${git.commit.sha}"/>
     <property
       name="osgi.version.number"
       value="${version.major}.${version.minor}.${version.patch}.v${git.commit.date}${version.suffix}-${git.commit.sha}"/>
@@ -307,6 +304,8 @@ INITIALISATION
     <echo message="        java args: ${env.ANT_OPTS} ${jvm.opts}" />
     <echo message="       javac args: ${javac.args}" />
     <echo message="      scalac args: ${scalac.args}" />
+    <echo message="         git date: ${git.commit.date}" />
+    <echo message="         git hash: ${git.commit.sha}" />
     <echo message="    maven version: ${maven.version.number}"/>
     <echo message="     OSGi version: ${osgi.version.number}" />
     <echo message="canonical version: ${version.number}" />
@@ -1555,7 +1554,7 @@ DOCUMENTATION
     <taskdef name="genman"
              classname="scala.tools.docutil.ManMaker"
              classpathref="manual.classpath"/>
-    <genman command="fsc, sbaz, scala, scalac, scaladoc, scalap"
+    <genman command="fsc, scala, scalac, scaladoc, scalap"
             htmlout="${build-docs.dir}/manual/html"
             manout="${build-docs.dir}/manual/genman"/>
     <!-- On Windows source and target files can't be the same ! -->
diff --git a/docs/README b/docs/README
@@ -2,8 +2,7 @@
 Scala Software Distributions
 ----------------------------
 
-- scala-<major>.<minor>.<patch>.tar.bz2     Unix distribution
-- scala-<major>.<minor>.<patch>.tar.gz      Unix distribution
+- scala-<major>.<minor>.<patch>.tgz         Unix distribution
 - scala-<major>.<minor>.<patch>.zip         Windows distribution
 
 The standard distributions require Java 1.5 or above. If you don't
@@ -32,15 +31,10 @@ directly accessible.
 
 You may test the distribution by running the following commands:
 
-$ ./bin/sbaz install scala-devel-docs
-$ ./bin/scalac doc/scala-devel-docs/examples/sort.scala
-$ ./bin/scala examples.sort
-[6,2,8,5,1]
-[1,2,5,6,8]
 $ ./bin/scala
-scala> examples.sort.main(null)
-[6,2,8,5,1]
-[1,2,5,6,8]
+scala> Array(4,3,2,1).sorted
+res0: Array[Int] = Array(1, 2, 3, 4)
+
 scala>:quit
 $
 
diff --git a/src/actors/scala/actors/scheduler/ThreadPoolConfig.scala b/src/actors/scala/actors/scheduler/ThreadPoolConfig.scala
@@ -45,7 +45,7 @@ private[actors] object ThreadPoolConfig {
 
         // on IBM J9 1.6 do not use ForkJoinPool
         // XXX this all needs to go into Properties.
-        isJavaAtLeast("1.6") && ((javaVmVendor contains "Sun") || (javaVmVendor contains "Apple"))
+        isJavaAtLeast("1.6") && ((javaVmVendor contains "Oracle") || (javaVmVendor contains "Sun") || (javaVmVendor contains "Apple"))
       })
     catch {
       case _: SecurityException => false
diff --git a/src/build/pack.xml b/src/build/pack.xml
@@ -73,6 +73,7 @@ MAIN DISTRIBUTION PACKAGING
         <exclude name="logs/**"/>
         <exclude name="sandbox/**"/>
         <exclude name="test/partest"/>
+        <exclude name=".git"/>
       </tarfileset>
       <tarfileset dir="${basedir}" prefix="scala-${version.number}-sources" filemode="755">
         <include name="test/partest"/>
diff --git a/src/compiler/scala/tools/ant/templates/tool-unix.tmpl b/src/compiler/scala/tools/ant/templates/tool-unix.tmpl
@@ -25,8 +25,8 @@ function restoreSttySettings() {
 function onExit() {
   if [[ "$saved_stty" != "" ]]; then
     restoreSttySettings
-    exit $scala_exit_status
   fi
+  exit $scala_exit_status
 }
 
 # to reenable echo if we are interrupted before completing.
diff --git a/src/library/scala/collection/mutable/FlatHashTable.scala b/src/library/scala/collection/mutable/FlatHashTable.scala
@@ -231,7 +231,7 @@ trait FlatHashTable[A] extends FlatHashTable.HashUtils[A] {
     else java.util.Arrays.fill(sizemap, 0)
   }
 
-  private[collection] final def totalSizeMapBuckets = if (sizeMapBucketSize < table.length) 1 else table.length / sizeMapBucketSize
+  private[collection] final def totalSizeMapBuckets = (table.length - 1) / sizeMapBucketSize + 1
 
   protected def calcSizeMapSize(tableLength: Int) = (tableLength >> sizeMapBucketBitSize) + 1
 
@@ -264,7 +264,7 @@ trait FlatHashTable[A] extends FlatHashTable.HashUtils[A] {
   }
 
   private[collection] def printSizeMap() {
-    println(sizemap.toList)
+    println(sizemap.mkString("szmap: [", ", ", "]"))
   }
 
   protected def sizeMapDisable() = sizemap = null
diff --git a/src/library/scala/collection/mutable/HashSet.scala b/src/library/scala/collection/mutable/HashSet.scala
@@ -57,11 +57,13 @@ extends Set[A]
   def contains(elem: A): Boolean = containsEntry(elem)
 
   def += (elem: A): this.type = { addEntry(elem); this }
+
   def -= (elem: A): this.type = { removeEntry(elem); this }
 
   override def par = new ParHashSet(hashTableContents)
 
   override def add(elem: A): Boolean = addEntry(elem)
+
   override def remove(elem: A): Boolean = removeEntry(elem).isDefined
 
   override def clear() = clearTable()
diff --git a/src/library/scala/collection/parallel/package.scala b/src/library/scala/collection/parallel/package.scala
@@ -48,7 +48,7 @@ package object parallel {
   private[parallel] def getTaskSupport: TaskSupport =
     if (util.Properties.isJavaAtLeast("1.6")) {
       val vendor = util.Properties.javaVmVendor
-      if ((vendor contains "Sun") || (vendor contains "Apple")) new ForkJoinTaskSupport
+      if ((vendor contains "Oracle") || (vendor contains "Sun") || (vendor contains "Apple")) new ForkJoinTaskSupport
       else new ThreadPoolTaskSupport
     } else new ThreadPoolTaskSupport
 
diff --git a/test/files/run/t4895.scala b/test/files/run/t4895.scala
@@ -0,0 +1,20 @@
+
+
+
+
+object Test {
+
+  def checkPar(sz: Int) {
+    import collection._
+    val hs = mutable.HashSet[Int]() ++ (1 to sz)
+    assert(hs.par.map(_ + 1).seq.toSeq.sorted == (2 to (sz + 1)))
+  }
+
+  def main(args: Array[String]) {
+    for (i <- 0 until 100) checkPar(i)
+    for (i <- 100 until 1000 by 50) checkPar(i)
+    for (i <- 1000 until 10000 by 500) checkPar(i)
+    for (i <- 10000 until 100000 by 5000) checkPar(i)
+  }
+
+}
diff --git a/tools/get-scala-commit-date b/tools/get-scala-commit-date
@@ -11,6 +11,7 @@
 [[ $# -eq 0 ]] || cd "$1"
 
 lastcommitdate=$(git log --format="%ci" HEAD | head -n 1 | cut -d ' ' -f 1)
+lastcommithours=$(git log --format="%ci" HEAD | head -n 1 | cut -d ' ' -f 2)
 
 # 20120324
-echo "${lastcommitdate//-/}"
+echo "${lastcommitdate//-/}-${lastcommithours//:/}"
diff --git a/tools/get-scala-commit-drift b/tools/get-scala-commit-drift
diff --git a/tools/get-scala-commit-drift.bat b/tools/get-scala-commit-drift.bat
diff --git a/tools/get-scala-commit-sha b/tools/get-scala-commit-sha
@@ -10,31 +10,9 @@
 
 [[ $# -eq 0 ]] || cd "$1"
 
-ensure_tag () {
-  sha=$1
-  rev=$2
-  
-  [[ -n $(git tag -l $rev) ]] || {
-    git tag -a -m "generated by get-scala-revision" $rev $sha
-  }
-}
-
-# Ensure some baseline tags are present so if this repository's
-# tags are screwed up or stale, we should still have a reference
-# point for a build string.
-ensure_tag 58cb15c40d v2.10.0-M1
-ensure_tag 29f3eace1e v2.9.1
-ensure_tag b0d78f6b9c v2.8.2
-
-# the closest tag, obtained separately because we have to
-# reconstruct the string around the padded distance.
-tag=$(git describe --tags --match 'v2*' --abbrev=0)
-
 # printf %016s is not portable for 0-padding, has to be a digit.
 # so we're stuck disassembling it.
-described=$(git describe --tags --match 'v2*' --abbrev=10)
-suffix="${described##${tag}-}"
-hash=$(echo $suffix | cut -d - -f 2)
+hash=$(git log -1 --format="%H" HEAD)
 hash=${hash#g}
-
+hash=${hash:0:10}
 echo "$hash"
diff --git a/tools/get-scala-commit-sha.bat b/tools/get-scala-commit-sha.bat
@@ -15,7 +15,7 @@ if "%*"=="" (
 cd %_DIR%
 
 rem  TODO - truncate chars.
-git log -1 --format="%T"
+git log -1 --format="%H
 
 :end
 @endlocal
diff --git a/tools/make-release-notes b/tools/make-release-notes
@@ -0,0 +1,49 @@
+#!/usr/bin/env bash
+
+# This tool is used to build a *scaffold* of a release note that you can fill in details with before posting to the list.
+# It aims to provide *all* the information you need, and probably need to prune it before releasing.
+# Author: jsuereth
+
+fixMessages() {
+  local tag1="$1"
+  local tag2="$2"
+  git log $tag1..$tag2 "--format=format: * %h - %s" --no-merges --grep "SI-"
+}
+
+allcommitMessages() {
+  local tag1="$1"
+  local tag2="$2"
+  git log $tag1..$tag2 "--format=format: * %h - %s" --no-merges
+}
+
+authors() {
+ local tag1="$1"
+ local tag2="$2"
+ git log $tag1..$tag2 --format=format:%an --no-merges | sort | uniq -c | sort -rh
+}
+
+
+message() {
+  local tag1="$1"
+  local tag2="$2"
+
+  echo "A new release of Scala is available!  Please point your build tools at ${tag2#v}"
+  echo 
+  echo "Here's a list of the issues that have been fixed since ${tag1#v}: "
+  fixMessages "$tag1" "$tag2"
+  echo
+  echo
+  echo "Special thanks to all the contributions!"
+  echo "------- --------------------------------"
+  authors "$tag1" "$tag2"
+  echo "------- --------------------------------"
+  echo
+  echo
+  echo "Here's a complete list of changes:"
+  allcommitMessages "$tag1" "$tag2"
+}
+
+
+message "$1" "$2"
+
+

Original file line number	Diff line number	Diff line change
`@@ -25,8 +25,8 @@ function restoreSttySettings() {`
`25`	`25`	`function onExit() {`
`26`	`26`	`if [[ "$saved_stty" != "" ]]; then`
`27`	`27`	`restoreSttySettings`
`28`		`- exit $scala_exit_status`
`29`	`28`	`fi`
	`29`	`+ exit $scala_exit_status`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`# to reenable echo if we are interrupted before completing.`
Original file line number	Diff line number	Diff line change
`@@ -231,7 +231,7 @@ trait FlatHashTable[A] extends FlatHashTable.HashUtils[A] {`
`231`	`231`	`else java.util.Arrays.fill(sizemap, 0)`
`232`	`232`	`}`
`233`	`233`
`234`		`- private[collection] final def totalSizeMapBuckets = if (sizeMapBucketSize < table.length) 1 else table.length / sizeMapBucketSize`
	`234`	`+ private[collection] final def totalSizeMapBuckets = (table.length - 1) / sizeMapBucketSize + 1`
`235`	`235`
`236`	`236`	`protected def calcSizeMapSize(tableLength: Int) = (tableLength >> sizeMapBucketBitSize) + 1`
`237`	`237`
`@@ -264,7 +264,7 @@ trait FlatHashTable[A] extends FlatHashTable.HashUtils[A] {`
`264`	`264`	`}`
`265`	`265`
`266`	`266`	`private[collection] def printSizeMap() {`
`267`		`- println(sizemap.toList)`
	`267`	`+ println(sizemap.mkString("szmap: [", ", ", "]"))`
`268`	`268`	`}`
`269`	`269`
`270`	`270`	`protected def sizeMapDisable() = sizemap = null`