Merge lp:~dave-cheney/juju-core/102-cmd-init-context into lp:~juju/juju-core/trunk
Status: | Work in progress |
---|---|
Proposed branch: | lp:~dave-cheney/juju-core/102-cmd-init-context |
Merge into: | lp:~juju/juju-core/trunk |
Diff against target: |
797 lines (+91/-75) 43 files modified
cmd/cmd.go (+2/-2) cmd/filevar.go (+11/-2) cmd/juju/addunit.go (+1/-1) cmd/juju/addunit_test.go (+3/-2) cmd/juju/bootstrap.go (+1/-1) cmd/juju/cmd_test.go (+19/-18) cmd/juju/deploy.go (+2/-2) cmd/juju/deploy_test.go (+3/-2) cmd/juju/destroyenvironment.go (+1/-1) cmd/juju/expose.go (+1/-1) cmd/juju/expose_test.go (+3/-2) cmd/juju/get.go (+1/-1) cmd/juju/set.go (+3/-3) cmd/juju/status.go (+1/-1) cmd/juju/unexpose.go (+1/-1) cmd/juju/unexpose_test.go (+3/-2) cmd/juju/upgradejuju.go (+1/-1) cmd/juju/upgradejuju_test.go (+6/-4) cmd/jujuc/main_test.go (+1/-1) cmd/jujuc/server/config-get.go (+1/-1) cmd/jujuc/server/config-get_test.go (+1/-1) cmd/jujuc/server/juju-log.go (+1/-1) cmd/jujuc/server/juju-log_test.go (+1/-1) cmd/jujuc/server/ports.go (+1/-1) cmd/jujuc/server/ports_test.go (+1/-1) cmd/jujuc/server/relation-get.go (+1/-1) cmd/jujuc/server/relation-ids.go (+1/-1) cmd/jujuc/server/relation-list.go (+1/-1) cmd/jujuc/server/relation-set.go (+1/-1) cmd/jujuc/server/relation-set_test.go (+1/-1) cmd/jujuc/server/server_test.go (+1/-1) cmd/jujuc/server/unit-get.go (+1/-1) cmd/jujuc/server/unit-get_test.go (+2/-2) cmd/jujud/bootstrap.go (+1/-1) cmd/jujud/machine.go (+1/-1) cmd/jujud/provisioning.go (+1/-1) cmd/jujud/unit.go (+1/-1) cmd/jujud/util_test.go (+1/-1) cmd/jujud/version.go (+1/-1) cmd/output_test.go (+1/-1) cmd/supercommand.go (+2/-2) cmd/supercommand_test.go (+2/-2) cmd/util_test.go (+1/-1) |
To merge this branch: | bzr merge lp:~dave-cheney/juju-core/102-cmd-init-context |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
The Go Language Gophers | Pending | ||
Review via email: mp+124899@code.launchpad.net |
Description of the change
cmd: add cmd.Context to command.Init
Pass cmd.Context to command.Init. This is mostly unused, although most invocations of command.Run do not use their Context either.
Unmerged revisions
- 519. By Dave Cheney
-
context strawman
- 518. By Dave Cheney
-
add context to command.init
- 517. By Dave Cheney
-
cmd/juju: add juju set subcommand
This proposal only includes the command parsing, a following CL
will include --config parsing and config updating.R=fwereade
CC=
https://codereview. appspot. com/6494131 - 516. By Aram Hăvărneanu
-
mstate: add services watcher
R=niemeyer
CC=
https://codereview. appspot. com/6496132 - 515. By Dave Cheney
-
mstate: fix ssh tests
Wait until the sshd process is listening before returning from sshDaemon()
R=rog
CC=
https://codereview. appspot. com/6497146 - 514. By Gustavo Niemeyer
-
mstate/watcher: fix trivial test race
R=dfc
CC=
https://codereview. appspot. com/6499126 - 513. By William Reade
-
update mstate charm usage
Service/Unit now have charm-related methods that match state
R=niemeyer
CC=
https://codereview. appspot. com/6506124 - 512. By Aram Hăvărneanu
-
mstate: improve error reporting in watcher test
R=niemeyer
CC=
https://codereview. appspot. com/6492131 - 511. By Aram Hăvărneanu
-
mstate: add machines watcher
R=niemeyer
CC=
https://codereview. appspot. com/6496131 - 510. By Dave Cheney
-
cmd: add FileVar flag and use it
PyJuJu had a nice construct that allowed a flag that was a file, or more
specifically the contents of a file to be handled nicely. As deploy ended
up implementing this, and I need it now for juju set, it made sense to
pretty it up.R=niemeyer
CC=
https://codereview. appspot. com/6490121
If I were implementing it I think I would have gone for something more
like c.Config.Open(ctx) inside Run, but I can't come up with a really
convincing case for that being *better*. (OK, it'd be less work, but the
work's already done.) So: LGTM.
https:/ /codereview. appspot. com/6532045/