From 1fd1b7803cc58b8df3f63c356956c96af7fcd774 Mon Sep 17 00:00:00 2001
From: Eugene Vigdorchik <eugene.vigdorchik@typesafe.com>
Date: Sat, 4 Feb 2012 21:10:30 -0500
Subject: [PATCH] Add a test to check for keeping a selected url upon reload.

---
 main/Load.scala                                           | 2 +-
 sbt/src/sbt-test/actions/reload/changes/Build1.scala      | 8 --------
 sbt/src/sbt-test/actions/reload/changes/Build2.scala      | 6 ------
 sbt/src/sbt-test/actions/reload/changes/Changed.scala     | 7 +++++++
 .../sbt-test/actions/reload/external/project/Ext.scala    | 8 ++++++++
 sbt/src/sbt-test/actions/reload/test                      | 4 ++--
 6 files changed, 18 insertions(+), 17 deletions(-)
 delete mode 100755 sbt/src/sbt-test/actions/reload/changes/Build1.scala
 delete mode 100755 sbt/src/sbt-test/actions/reload/changes/Build2.scala
 create mode 100755 sbt/src/sbt-test/actions/reload/changes/Changed.scala
 create mode 100755 sbt/src/sbt-test/actions/reload/external/project/Ext.scala

diff --git a/main/Load.scala b/main/Load.scala
index 164690eeb..60dc0831b 100755
--- a/main/Load.scala
+++ b/main/Load.scala
@@ -611,7 +611,7 @@ object Load
 	{
 		val rootProject: URI => String = Load getRootProject units
 		def allProjects: Seq[ResolvedProject] = units.values.flatMap(_.defined.values).toSeq
-		def allProjects(build: URI): Seq[ResolvedProject] = units(build).defined.values.toSeq
+		def allProjects(build: URI): Seq[ResolvedProject] = units.get(build) map(_.defined.values.toSeq) getOrElse Seq.empty
 		def allProjectRefs: Seq[ProjectRef] = units.toSeq flatMap { case (build, unit) => refs(build, unit.defined.values.toSeq) }
 		def allProjectRefs(build: URI): Seq[ProjectRef] = refs(build, allProjects(build))
 		val extra: BuildUtil[ResolvedProject] = buildUtil(root, units, index.keyIndex, data)
diff --git a/sbt/src/sbt-test/actions/reload/changes/Build1.scala b/sbt/src/sbt-test/actions/reload/changes/Build1.scala
deleted file mode 100755
index 3c64e0b09..000000000
--- a/sbt/src/sbt-test/actions/reload/changes/Build1.scala
+++ /dev/null
@@ -1,8 +0,0 @@
-import sbt._
-
-object Build1 extends Build
-{
-	lazy val root1 = Project("root1", file("root1")) settings(
-		TaskKey[Unit]("g") := {}
-	)
-}
diff --git a/sbt/src/sbt-test/actions/reload/changes/Build2.scala b/sbt/src/sbt-test/actions/reload/changes/Build2.scala
deleted file mode 100755
index ed474650c..000000000
--- a/sbt/src/sbt-test/actions/reload/changes/Build2.scala
+++ /dev/null
@@ -1,6 +0,0 @@
-import sbt._
-
-object Build2 extends Build
-{
-	lazy val root2 = Project("root2", file("root2"))
-}
diff --git a/sbt/src/sbt-test/actions/reload/changes/Changed.scala b/sbt/src/sbt-test/actions/reload/changes/Changed.scala
new file mode 100755
index 000000000..4187168aa
--- /dev/null
+++ b/sbt/src/sbt-test/actions/reload/changes/Changed.scala
@@ -0,0 +1,7 @@
+import sbt._
+
+object TestBuild extends Build
+{
+	lazy val root1 = Project("root1", file(".")) dependsOn(root2)
+	lazy val root2 = ProjectRef(uri("external"), "root2")
+}
diff --git a/sbt/src/sbt-test/actions/reload/external/project/Ext.scala b/sbt/src/sbt-test/actions/reload/external/project/Ext.scala
new file mode 100755
index 000000000..ae9986dfc
--- /dev/null
+++ b/sbt/src/sbt-test/actions/reload/external/project/Ext.scala
@@ -0,0 +1,8 @@
+import sbt._
+
+object Ext extends Build
+{
+	lazy val root2 = Project("root2", file("root2")) settings(
+		TaskKey[Unit]("g") := {}
+	)
+}
diff --git a/sbt/src/sbt-test/actions/reload/test b/sbt/src/sbt-test/actions/reload/test
index 2b3c2008a..ef1be05a7 100755
--- a/sbt/src/sbt-test/actions/reload/test
+++ b/sbt/src/sbt-test/actions/reload/test
@@ -3,11 +3,11 @@
 > f
 > reload
 > f
-$ copy-file changes/Build1.scala project/TestProject.scala
+$ copy-file changes/Changed.scala project/TestProject.scala
 > reload
 -> f
+> project {external}root2
 > g
 # The current URI should be kept
-$ copy-file changes/Build2.scala project/First.scala
 > reload
 > g
\ No newline at end of file