Skip to content

kill obsolete logic for preserving local modifications #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yjbanov merged 1 commit into from
Aug 18, 2016
Merged

kill obsolete logic for preserving local modifications #41

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 2 additions & 17 deletions agent/lib/src/utils.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,24 +361,10 @@ String jsonEncode(dynamic data) {
return new JsonEncoder.withIndent(' ').convert(data) + '\n';
}

Future<bool> getFlutter(String revision) async {
Future<Null> getFlutter(String revision) async {
section('Get Flutter!');

if (exists(dir('${config.flutterDirectory.path}/.git'))) {
bool hasLocalChanges = await inDirectory(config.flutterDirectory, () async {
String unstagedChanges = await eval('git', ['diff', '--numstat']);
String stagedChanges = await eval('git', ['diff', '--numstat', '--cached']);
return unstagedChanges.trim().isNotEmpty || stagedChanges.trim().isNotEmpty;
});

if (hasLocalChanges) {
section('WARNING');
print(
'Pending changes detected in the local Flutter repo. Will skip syncing '
'Flutter repo. The build will continue but it will marked as failed.'
);
return false;
}
if (exists(config.flutterDirectory)) {
rrm(config.flutterDirectory);
}

Expand All @@ -397,7 +383,6 @@ Future<bool> getFlutter(String revision) async {

section('flutter update-packages');
await flutter('update-packages');
return true;
}

void checkNotNull(Object o1, [Object o2 = 1, Object o3 = 1, Object o4 = 1,
Expand Down