Track Source objects in PackageNames.

lib/src/solver/version_solver.dart

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 import 'dart:async';
 import "dart:convert";
 
 import 'package:pub_semver/pub_semver.dart';
 import 'package:stack_trace/stack_trace.dart';
 
@@ skipping 13 matching lines @@
 /// that those dependencies place on each other and the requirements imposed by
 /// [lockFile].
 ///
 /// If [useLatest] is given, then only the latest versions of the referenced
 /// packages will be used. This is for forcing an upgrade to one or more
 /// packages.
 ///
 /// If [upgradeAll] is true, the contents of [lockFile] are ignored.
 Future<SolveResult> resolveVersions(SolveType type, SystemCache cache,
     Package root, {LockFile lockFile, List<String> useLatest}) {
-  if (lockFile == null) lockFile = new LockFile.empty(cache.sources);
+  if (lockFile == null) lockFile = new LockFile.empty();
   if (useLatest == null) useLatest = [];
 
   return log.progress('Resolving dependencies', () {
     return new BacktrackingSolver(type, cache, root, lockFile, useLatest)
         .solve();
   });
 }
 
 /// The result of a version resolution.
 class SolveResult {
@@ skipping 31 matching lines @@
 
   /// The [LockFile] representing the packages selected by this version
   /// resolution.
   LockFile get lockFile {
     // Don't factor in overridden dependencies' SDK constraints, because we'll
     // accept those packages even if their constraints don't match.
     var sdkConstraint = new VersionConstraint.intersection(pubspecs.values
         .where((pubspec) =>
             !_root.dependencyOverrides.any((dep) => dep.name == pubspec.name))
         .map((pubspec) => pubspec.environment.sdkVersion));
-    return new LockFile(packages, _sources, sdkConstraint: sdkConstraint);
+    return new LockFile(packages, sdkConstraint: sdkConstraint);
   }
 
   final SourceRegistry _sources;
   final Package _root;
   final LockFile _previousLockFile;
 
   /// Returns the names of all packages that were changed.
   ///
   /// This includes packages that were added or removed.
   Set<String> get changedPackages {
     if (packages == null) return null;
 
     var changed = packages
-        .where((id) =>
-            !_sources.idsEqual(_previousLockFile.packages[id.name], id))
+        .where((id) => _previousLockFile.packages[id.name] != id)
         .map((id) => id.name).toSet();
 
     return changed.union(_previousLockFile.packages.keys
         .where((package) => !availableVersions.containsKey(package))
         .toSet());
   }
 
   SolveResult.success(this._sources, this._root, this._previousLockFile,
       this.packages, this.overrides, this.pubspecs, this.availableVersions,
       this.attemptedSolutions)
@@ skipping 325 matching lines @@
 
   DependencyNotFoundException(String package, this._innerException,
       Iterable<Dependency> dependencies)
       : super(package, dependencies);
 
   /// The failure isn't because of the version of description of the package,
   /// it's the package itself that can't be found, so just show the name and no
   /// descriptive details.
   String _describeDependency(PackageDep dep) => "";
 }