languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-09-20 08:49:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix message about status entries that need manual splitting.

Browse source 
It described the entry as being in the destination file when it's
actually still in the source file.

R=mkroghj@google.com

Review-Url: https://codereview.chromium.org/2997093002 .
This commit is contained in:
Bob Nystrom 2017-08-17 13:05:38 -07:00
parent 1196fc9cda
commit f9da770441
1 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
tools/migration/lib/src/migrate_statuses.dart
View file

@ -23,17 +23,15 @@ void migrateStatusEntries(List<Fork> files, Map<String, List<String>> todos) {
}
// If any entries need manual splitting, let the user know.
for (var dir in entriesToMove._todoHeaders.keys) {
var destination = "$dir.status";
var headers = entriesToMove._todoHeaders[dir];
for (var statusFile in entriesToMove._todoHeaders.keys) {
var headers = entriesToMove._todoHeaders[statusFile];
var splits = headers.map((header) {
var files =
filesForHeader(header).map((file) => bold("${dir}_$file")).join(", ");
return "Need to manually split status file section in ${bold(destination)}"
" across files $files:\n $header";
var files = filesForHeader(header).map((file) => bold(file)).join(", ");
return "Manually split status file section across $files status files:\n"
" $header";
}).toList();
if (splits.isNotEmpty) todos[destination] = splits;
if (splits.isNotEmpty) todos[statusFile] = splits;
}
}
@ -92,7 +90,7 @@ class EntrySet {
///
/// Returns true if successful or false if the header's condition doesn't fit
/// into a single status file and needs to be manually split by the user.
bool add(String fromDir, String header, String entry) {
bool add(String fromFile, String fromDir, String header, String entry) {
var toDir = toTwoDirectory(fromDir);
// Figure out which status file it goes into.
@ -104,7 +102,8 @@ class EntrySet {
// manually split it up into multiple sections first.
// TODO(rnystrom): Would be good to automate this, though it requires
// being able to work with condition expressions directly.
_todoHeaders.putIfAbsent(toDir, () => new Set()).add(header);
var statusRelative = p.relative(fromFile, from: testRoot);
_todoHeaders.putIfAbsent(statusRelative, () => new Set()).add(header);
return false;
}
@ -158,7 +157,10 @@ void _collectEntries(List<Fork> files, EntrySet entriesToMove, {bool isOne}) {
if (!entryPath.startsWith(filePath)) continue;
// Add it to the 2.0 one.
if (entriesToMove.add(fromDir, editable.lineAt(section.lineNumber),
if (entriesToMove.add(
path,
fromDir,
editable.lineAt(section.lineNumber),
editable.lineAt(entry.lineNumber))) {
// Remove it from the original status file.
deleteLines.add(entry.lineNumber - 1);