Have "flutter upgrade" automatically call "git stash" and show message

[sethladd]

This is what you see when you run flutter upgrade but have a conflict:

sethladd-macbookpro:flutter_gallery sethladd$ flutter upgrade
Upgrading Flutter from /Users/sethladd/Code/flutter...
From https://github.com/flutter/flutter
   244a7a02b..d2abdf8e6  master     -> origin/master
error: Your local changes to the following files would be overwritten by merge:
	examples/flutter_gallery/.idea/modules.xml
Please commit your changes or stash them before you merge.
Aborting
Updating 657a4c3fc..d2abdf8e6

Note the "Updating ..." which I thought meant "update complete!"

Actually, due to the conflict when merging, the update didn't complete. :/

Can we print out a clearer message when the update fails? Something like: "Upgrade failed. Please see output above, or run flutter upgrade -v for more info."

Thanks!

[zoechi]

I had this just now. I switched to master about a week ago because of issues and now switched back to alpha and run flutter upgrade

[timsneath]

I hit this myself today. It's easy to get into this situation when playing around with the examples gallery. And it's not clear to a non-expert git user (like me) how to get out of this state.

I ran git stash save --keep-index followed by git stash drop to dump my changes, and that seemed to work. We should consider either a) moving the examples to a different repo, or b) providing clear instructions on what to do from flutter upgrade.

Any other thoughts, @mit-mit?

[mit-mit]

Two ideas come to mind:

1. .gitignore all of /examples/
2. move all examples to a new repo

Thoughts @Hixie @mjohnsullivan ?

[timsneath]

Seems problematic to include the examples folder in .gitignore -- if they're untracked, then they wouldn't get updated at all, would they?

[mit-mit]

You can still track files that are in .gitignore. But from a bit of testing, it doesn't seem to resolve the "Please commit your changes or stash them before you merge". I defer to the git knowledgeable :-).

Could we perhaps so something like:

1. Detect that the user has dirty files in the repo
2. Print a message that "Sorry, cannot upgrade as the following files have changes. Run flutter upgrade -f to overwrite these"
3. When -f is passed, somehow ask git to pull forcing to overwrite local changes?

[zoechi]

I never do anything in the flutter directory and definitely not changing files.
Why are there so often changed files that prevent flutter upgrade?
I think this has to be a Flutter issue or perhaps the IntelliJ Flutter plugin.

[Hixie]

@zoechi What are the changed files?

@mit-mit We could automatically "stash" local changes when upgrading, then give a message if we've done so.

[mit-mit]

Stashing sgmt! Just make sure the message is useful both to developer that actually use/know git, and it gentle enough that others can ignore it :-)

[zoechi]

@Hixie I'll report the list the next time I encounter this issue.

[zoechi]

@Hixie

 (dart2) $ flutter upgrade
Upgrading Flutter from /Users/zoechi/flutter/flutter...
From https://github.com/flutter/flutter
   487e6bc91..d6d874474  dev        -> origin/dev
   2329cb7ec..cdc68a73e  master     -> origin/master
 * [new tag]             v0.2.10    -> v0.2.10
error: Your local changes to the following files would be overwritten by merge:
        dev/automated_tests/pubspec.yaml
        dev/benchmarks/complex_layout/pubspec.yaml
        dev/benchmarks/microbenchmarks/pubspec.yaml
        dev/bots/pubspec.yaml
        dev/devicelab/pubspec.yaml
        dev/integration_tests/channels/pubspec.yaml
        dev/integration_tests/external_ui/pubspec.yaml
        dev/integration_tests/flavors/pubspec.yaml
        dev/integration_tests/platform_interaction/pubspec.yaml
        dev/integration_tests/ui/pubspec.yaml
        dev/manual_tests/pubspec.yaml
        dev/tools/pubspec.yaml
        dev/tools/vitool/pubspec.yaml
        examples/catalog/pubspec.yaml
        examples/flutter_gallery/pubspec.yaml
        examples/hello_world/pubspec.yaml
        examples/layers/pubspec.yaml
        examples/platform_channel/pubspec.yaml
        examples/platform_channel_swift/pubspec.yaml
        examples/stocks/pubspec.yaml
        packages/flutter/pubspec.yaml
        packages/flutter_driver/pubspec.yaml
        packages/flutter_localizations/pubspec.yaml
        packages/flutter_test/pubspec.yaml
        packages/flutter_tools/pubspec.yaml
        packages/fuchsia_remote_debug_protocol/pubspec.yaml
Please commit your changes or stash them before you merge.
Aborting
Updating 487e6bc91..d6d874474

Is flutter update-packages --force-upgrade making this changes?

[Hixie]

Ah yes, flutter update-packages --force-upgrade is a tool for making local changes to your branch for submitting a PR. You shouldn't need to run it unless you want to submit a PR.