Track Source objects in PackageNames.

lib/src/solver/solve_report.dart

 // Copyright (c) 2013, 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 'package:pub_semver/pub_semver.dart';
 
 import '../lock_file.dart';
 import '../log.dart' as log;
 import '../package.dart';
 import '../source_registry.dart';
@@ skipping 44 matching lines @@
 
     var numChanged = dependencies.where((name) {
       var oldId = _previousLockFile.packages[name];
       var newId = _dependencies[name];
 
       // Added or removed dependencies count.
       if (oldId == null) return true;
       if (newId == null) return true;
 
       // The dependency existed before, so see if it was modified.
-      return !_sources.idsEqual(oldId, newId);
+      return oldId != newId;
     }).length;
 
     if (dryRun) {
       if (numChanged == 0) {
         log.message("No dependencies would change.");
       } else if (numChanged == 1) {
         log.message("Would change $numChanged dependency.");
       } else {
         log.message("Would change $numChanged dependencies.");
       }
@@ skipping 84 matching lines @@
     //     * Any other change between the old and new package.
     var icon;
     if (isOverridden) {
       icon = log.magenta("! ");
     } else if (newId == null) {
       icon = log.red("- ");
       addedOrRemoved = true;
     } else if (oldId == null) {
       icon = log.green("+ ");
       addedOrRemoved = true;
-    } else if (!_sources.idDescriptionsEqual(oldId, newId)) {
+    } else if (!oldId.samePackage(newId)) {
       icon = log.cyan("* ");
       changed = true;
     } else if (oldId.version < newId.version) {
       icon = log.green("> ");
       changed = true;
     } else if (oldId.version > newId.version) {
       icon = log.cyan("< ");
       changed = true;
     } else {
       // Unchanged.
@@ skipping 50 matching lines @@
       if (message != null) _output.write(" ${log.cyan(message)}");
     }
 
     _output.writeln();
   }
 
   /// Writes a terse description of [id] (not including its name) to the output.
   void _writeId(PackageId id) {
     _output.write(id.version);
 
-    var source = _sources[id.source];
-    if (source != _sources.defaultSource) {
-      var description = source.formatDescription(_root.dir, id.description);
+    if (id.source != _sources.defaultSource) {
+      var description = id.source.formatDescription(_root.dir, id.description);
       _output.write(" from ${id.source} $description");
     }
   }
 }