Merge lp://qastaging/~xavi-garcia-mena/keeper/accounts-selection into lp://qastaging/keeper/devel
Proposed by
Xavi Garcia
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://qastaging/~xavi-garcia-mena/keeper/accounts-selection |
| Merge into: | lp://qastaging/keeper/devel |
| Prerequisite: | lp://qastaging/~unity-api-team/keeper/sf-errors-dbus-interface |
| Diff against target: |
1282 lines (+375/-102) 28 files modified
include/client/client.h (+8/-5) include/client/keeper-errors.h (+2/-1) src/cli/command-line-client-view.cpp (+3/-0) src/cli/command-line-client.cpp (+23/-7) src/cli/command-line-client.h (+6/-3) src/cli/command-line.cpp (+56/-10) src/cli/command-line.h (+4/-1) src/cli/main.cpp (+14/-3) src/client/client.cpp (+33/-10) src/qdbus-stubs/com.canonical.keeper.User.xml (+44/-0) src/service/backup-choices.cpp (+1/-1) src/service/backup-choices.h (+1/-1) src/service/keeper-user.cpp (+17/-6) src/service/keeper-user.h (+5/-3) src/service/keeper.cpp (+45/-12) src/service/keeper.h (+7/-3) src/service/metadata-provider.h (+1/-1) src/service/restore-choices.cpp (+2/-1) src/service/restore-choices.h (+1/-1) src/service/task-manager.cpp (+10/-9) src/service/task-manager.h (+2/-2) src/storage-framework/storage_framework_client.cpp (+73/-10) src/storage-framework/storage_framework_client.h (+5/-0) tests/integration/helpers/helpers-test-failure.cpp (+1/-1) tests/integration/helpers/helpers-test.cc (+6/-6) tests/integration/helpers/restore-test.cpp (+1/-1) tests/utils/storage-framework-local.cpp (+2/-2) tests/utils/storage-framework-local.h (+2/-2) |
| To merge this branch: | bzr merge lp://qastaging/~xavi-garcia-mena/keeper/accounts-selection |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Charles Kerr (community) | Approve | ||
| unity-api-1-bot | continuous-integration | Approve | |
|
Review via email:
|
|||
Commit message
This branch adds the account selection to the service and command line client.
Description of the change
This branch adds the account selection to the service and command line client.
It also adds the option to cancel a backup/restore from the command line client when pressing Ctrl+C
If the account id is empty it selects the first available account.
To post a comment you must log in.
Revision history for this message
| unity-api-1-bot (unity-api-1-bot) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| unity-api-1-bot (unity-api-1-bot) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| Xavi Garcia (xavi-garcia-mena) wrote | # |
Revision history for this message
| unity-api-1-bot (unity-api-1-bot) wrote | # |
review:
Approve
(continuous-integration)
Revision history for this message
| Xavi Garcia (xavi-garcia-mena) wrote | # |
Revision history for this message
| Xavi Garcia (xavi-garcia-mena) wrote | # |
Revision history for this message
| unity-api-1-bot (unity-api-1-bot) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| unity-api-1-bot (unity-api-1-bot) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| unity-api-1-bot (unity-api-1-bot) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| unity-api-1-bot (unity-api-1-bot) wrote | # |
review:
Approve
(continuous-integration)
Unmerged revisions
- 143. By Xavi Garcia
-
Changed as suggested in review
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
FAILED: Continuous integration, rev:141
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/