Chromium Code Reviews

Unified Diff: lib/src/solver/version_solver.dart

Issue 2079303003: Track Source objects in PackageNames. (Closed) Base URL: git@github.com:dart-lang/pub.git@master
Patch Set: Code review changes Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
« no previous file with comments | « lib/src/solver/solve_report.dart ('k') | lib/src/source.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: lib/src/solver/version_solver.dart
diff --git a/lib/src/solver/version_solver.dart b/lib/src/solver/version_solver.dart
index 7a0adb36f93e9e2745945687ee096bb8b743e1e0..83564c22c8056feb363707d76f803f84afdb3973 100644
--- a/lib/src/solver/version_solver.dart
+++ b/lib/src/solver/version_solver.dart
@@ -31,7 +31,7 @@ import 'solve_report.dart';
/// 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', () {
@@ -83,7 +83,7 @@ class SolveResult {
.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;
@@ -97,8 +97,7 @@ class SolveResult {
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
« no previous file with comments | « lib/src/solver/solve_report.dart ('k') | lib/src/source.dart » ('j') | no next file with comments »

Powered by Google App Engine