Merge lp://staging/keeper/devel into lp://staging/keeper

CMakeLists.txt (+1/-1)
data/CMakeLists.txt (+6/-0)
data/helper-registry.json.in (+6/-1)
debian/changelog (+14/-0)
debian/control (+5/-1)
debian/keeper.install (+3/-1)
include/client/client.h (+18/-4)
include/client/keeper-errors.h (+57/-0)
include/client/keeper-items.h (+102/-0)
include/helper/backup-helper.h (+1/-0)
include/helper/data-dir-registry.h (+2/-0)
include/helper/helper.h (+3/-1)
include/helper/metadata.h (+6/-27)
include/helper/registry.h (+1/-0)
include/helper/restore-helper.h (+62/-0)
src/cli/CMakeLists.txt (+4/-0)
src/cli/command-line-client-view.cpp (+194/-0)
src/cli/command-line-client-view.h (+60/-0)
src/cli/command-line-client.cpp (+250/-0)
src/cli/command-line-client.h (+58/-0)
src/cli/command-line.cpp (+234/-0)
src/cli/command-line.h (+55/-0)
src/cli/main.cpp (+40/-46)
src/client/CMakeLists.txt (+22/-0)
src/client/client.cpp (+223/-60)
src/client/items.cpp (+196/-0)
src/client/keeper-errors.cpp (+74/-0)
src/client/qml-plugin/CMakeLists.txt (+1/-1)
src/helper/CMakeLists.txt (+18/-1)
src/helper/backup-helper.cpp (+30/-8)
src/helper/data-dir-registry.cpp (+54/-22)
src/helper/folder-backup.sh.in (+1/-1)
src/helper/folder-restore.sh.in (+23/-0)
src/helper/helper.cpp (+6/-8)
src/helper/metadata.cpp (+45/-50)
src/helper/restore-helper.cpp (+377/-0)
src/qdbus-stubs/CMakeLists.txt (+19/-1)
src/qdbus-stubs/com.canonical.keeper.User.xml (+47/-3)
src/qdbus-stubs/dbus-types.h (+6/-2)
src/qdbus-stubs/org.freedesktop.DBus.Properties.xml (+27/-0)
src/service/CMakeLists.txt (+4/-0)
src/service/backup-choices.cpp (+20/-12)
src/service/backup-choices.h (+2/-1)
src/service/keeper-helper.cpp (+5/-2)
src/service/keeper-task-backup.cpp (+40/-11)
src/service/keeper-task-backup.h (+4/-2)
src/service/keeper-task-restore.cpp (+130/-0)
src/service/keeper-task-restore.h (+46/-0)
src/service/keeper-task.cpp (+96/-23)
src/service/keeper-task.h (+10/-2)
src/service/keeper-user.cpp (+37/-45)
src/service/keeper-user.h (+8/-6)
src/service/keeper.cpp (+365/-62)
src/service/keeper.h (+19/-5)
src/service/main.cpp (+2/-1)
src/service/manifest.cpp (+248/-0)
src/service/manifest.h (+51/-0)
src/service/metadata-provider.h (+10/-2)
src/service/private/keeper-task_p.h (+10/-2)
src/service/restore-choices.cpp (+55/-93)
src/service/restore-choices.h (+10/-5)
src/service/task-manager.cpp (+170/-25)
src/service/task-manager.h (+12/-6)
src/storage-framework/CMakeLists.txt (+3/-0)
src/storage-framework/downloader.h (+46/-0)
src/storage-framework/sf-downloader.cpp (+54/-0)
src/storage-framework/sf-downloader.h (+48/-0)
src/storage-framework/sf-uploader.cpp (+12/-2)
src/storage-framework/sf-uploader.h (+3/-0)
src/storage-framework/storage_framework_client.cpp (+444/-36)
src/storage-framework/storage_framework_client.h (+25/-5)
src/storage-framework/uploader.h (+1/-0)
src/tar/CMakeLists.txt (+72/-27)
src/tar/tar-creator.cpp (+31/-29)
src/tar/untar-main.cpp (+169/-0)
src/tar/untar.cpp (+144/-0)
src/tar/untar.h (+38/-0)
src/util/connection-helper.h (+9/-4)
tests/CMakeLists.txt (+9/-1)
tests/com_canonical_keeper.py (+80/-45)
tests/dbusmock/keeper-template-test.cpp (+113/-102)
tests/fakes/CMakeLists.txt (+14/-0)
tests/fakes/fake-restore-helper.cpp (+136/-0)
tests/fakes/fake-restore-helper.h (+27/-0)
tests/fakes/folder-restore.sh.in (+41/-0)
tests/fakes/helper-test.sh.in (+16/-0)
tests/fakes/upstart/upstart-job-mock.cpp (+4/-1)
tests/integration/helpers/CMakeLists.txt (+94/-1)
tests/integration/helpers/helpers-test-failure.cpp (+20/-8)
tests/integration/helpers/helpers-test.cc (+289/-9)
tests/integration/helpers/restore-test.cpp (+126/-0)
tests/integration/helpers/state-change-test-manager.h (+55/-0)
tests/integration/helpers/state-change-test.cpp (+56/-0)
tests/integration/helpers/state-test-helper.h (+55/-0)
tests/integration/helpers/test-helpers-base.cpp (+363/-135)
tests/integration/helpers/test-helpers-base.h (+22/-13)
tests/unit/CMakeLists.txt (+3/-0)
tests/unit/helper/CMakeLists.txt (+1/-5)
tests/unit/helper/speed-test.cpp (+3/-3)
tests/unit/manifest/CMakeLists.txt (+45/-0)
tests/unit/manifest/manifest-test.cpp (+170/-0)
tests/unit/metadata-providers/CMakeLists.txt (+3/-0)
tests/unit/metadata-providers/user-dirs-test.cpp (+19/-12)
tests/unit/metadata/CMakeLists.txt (+44/-0)
tests/unit/metadata/metadata-json-test.cpp (+100/-0)
tests/unit/storage-framework/CMakeLists.txt (+73/-0)
tests/unit/storage-framework/create-uploader-test.cpp (+147/-0)
tests/unit/storage-framework/folders-test.cpp (+109/-0)
tests/unit/tar/CMakeLists.txt (+104/-29)
tests/unit/tar/keeper-tar-test.cpp (+5/-5)
tests/unit/tar/keeper-untar-test.cpp (+232/-0)
tests/unit/tar/ku-invoke-nobus.sh.in (+1/-0)
tests/unit/tar/ku-invoke.sh.in (+1/-0)
tests/unit/tar/tar-creator-libarchive-failure-test.cpp (+5/-1)
tests/unit/tar/tar-creator-test.cpp (+1/-1)
tests/unit/tar/untar-test.cpp (+120/-0)
tests/utils/CMakeLists.txt (+2/-0)
tests/utils/file-utils.cpp (+88/-6)
tests/utils/file-utils.h (+5/-1)
tests/utils/keeper-dbusmock-fixture.h (+9/-0)
tests/utils/main.cpp (+1/-1)
tests/utils/storage-framework-local.cpp (+207/-0)
tests/utils/storage-framework-local.h (+48/-0)
tests/utils/xdg-user-dirs-sandbox.cpp (+1/-1)