Don't try to look up the root package in the default source.

Review URL: https://chromiumcodereview.appspot.com//10674007

git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge@9184 260f80e4-7a28-3924-810f-c04153c831b5

lib/src/version_solver.dart

@@ -54,27 +54,29 @@
  */
 Future<Map<String, Version>> resolveVersions(
     SourceRegistry sources, Package root) {
-  return new VersionSolver(sources).solve(root);
+  return new VersionSolver(sources, root).solve();
 }
 
 class VersionSolver {
   final SourceRegistry _sources;
+  final Package _root;
   final PubspecCache _pubspecs;
   final Map<String, Dependency> _packages;
   final Queue<WorkItem> _work;
   int _numIterations = 0;
 
-  VersionSolver(SourceRegistry sources)
+  VersionSolver(SourceRegistry sources, Package root)
       : _sources = sources,
+        _root = root,
         _pubspecs = new PubspecCache(sources),
         _packages = <Dependency>{},
         _work = new Queue<WorkItem>();
 
-  Future<Map<String, Version>> solve(Package root) {
+  Future<Map<String, Version>> solve() {
     // Kick off the work by adding the root package at its concrete version to
     // the dependency graph.
-    _pubspecs.cache(root);
-    enqueue(new ChangeConstraint('(entrypoint)', root.name, root.version));
+    _pubspecs.cache(_root);
+    enqueue(new ChangeConstraint('(entrypoint)', _root.name, _root.version));
 
     Future processNextWorkItem(_) {
       while (true) {
@@ -269,6 +271,13 @@ class ChangeConstraint implements WorkItem {
       return null;
     }
 
+    // If the dependency is on the root package, then we don't need to do
+    // anything since it's already at the best version.
+    if (dependent == solver._root.name) {
+      solver.enqueue(new ChangeVersion(dependent, solver._root.version));
+      return null;
+    }
+
     // The constraint has changed, so see what the best version of the package
     // that meets the new constraint is.
     // TODO(rnystrom): Should this always be the default source?

test/version_solver_test.dart

@@ -192,7 +192,14 @@ testResolve(description, packages, [result, error]) {
       var name = parts[0];
       var version = parts[1];
       var package = source.mockPackage(name, version, dependencies);
-      if (name == 'myapp') root = package;
+      if (name == 'myapp') {
+        // Don't add the root package to the server, so we can verify that Pub
+        // doesn't try to look up information about the local package on the
+        // remote server.
+        root = package;
+      } else {
+        source.addPackage(package);
+      }
     });
 
     // Clean up the expectation.
@@ -260,10 +267,12 @@ class MockSource extends Source {
     });
 
     var pubspec = new Pubspec(new Version.parse(version), dependencies);
-    var package = new Package.inMemory(name, pubspec);
+    return new Package.inMemory(name, pubspec);
+  }
 
-    _packages.putIfAbsent(name, () => new Map<Version, Package>());
-    _packages[name][package.version] = package;
+  void addPackage(Package package) {
+    _packages.putIfAbsent(package.name, () => new Map<Version, Package>());
+    _packages[package.name][package.version] = package;
     return package;
   }
 }