Merge lp://staging/~nataliabidart/magicicada-client/clean-pos-ins into lp://staging/magicicada-client
Proposed by
Natalia Bidart
| Status: | Work in progress |
|---|---|
| Proposed branch: | lp://staging/~nataliabidart/magicicada-client/clean-pos-ins |
| Merge into: | lp://staging/magicicada-client |
| Diff against target: |
4069 lines (+715/-1693) 73 files modified
.bzrignore (+0/-2) bin/u1sdtool (+1/-1) bin/ubuntuone-launch (+3/-3) bin/ubuntuone-syncdaemon (+51/-88) contrib/__init__.py (+0/-31) contrib/dbus-docs (+9/-12) contrib/dump_metadata.py (+8/-14) data/com.ubuntuone.SyncDaemon.service.in (+0/-4) data/logging.conf (+12/-0) data/logging.conf.in (+0/-13) data/source_ubuntuone-client.py (+0/-61) data/syncdaemon-dev.conf (+0/-11) data/syncdaemon.conf (+0/-12) data/ubuntuone-client-crashdb.conf (+0/-5) data/ubuntuone-launch.desktop.in (+0/-8) setup.cfg (+0/-2) setup.py (+32/-206) ubuntuone/clientdefs.py (+9/-15) ubuntuone/config.py (+62/-76) ubuntuone/logger.py (+168/-65) ubuntuone/platform/__init__.py (+1/-8) ubuntuone/platform/filesystem_notifications/monitor/common.py (+1/-3) ubuntuone/platform/logger/__init__.py (+0/-53) ubuntuone/platform/logger/darwin.py (+0/-37) ubuntuone/platform/logger/linux.py (+0/-50) ubuntuone/platform/logger/windows.py (+0/-37) ubuntuone/platform/tests/filesystem_notifications/__init__.py (+1/-1) ubuntuone/platform/tests/filesystem_notifications/common.py (+2/-1) ubuntuone/platform/tests/filesystem_notifications/test_darwin.py (+1/-2) ubuntuone/platform/tests/filesystem_notifications/test_filesystem_notifications.py (+6/-6) ubuntuone/platform/tests/filesystem_notifications/test_fsevents_daemon.py (+1/-1) ubuntuone/platform/tests/filesystem_notifications/test_linux.py (+1/-1) ubuntuone/platform/tests/filesystem_notifications/test_windows.py (+1/-2) ubuntuone/platform/tests/ipc/test_linux.py (+5/-5) ubuntuone/platform/tests/ipc/test_perspective_broker.py (+4/-4) ubuntuone/platform/tests/linux/test_vm.py (+1/-5) ubuntuone/platform/tests/os_helper/test_os_helper.py (+4/-4) ubuntuone/platform/tests/os_helper/test_windows.py (+1/-2) ubuntuone/platform/tests/test_logger.py (+0/-47) ubuntuone/platform/tests/test_tools.py (+1/-2) ubuntuone/platform/tests/test_u1sdtool.py (+5/-5) ubuntuone/syncdaemon/action_queue.py (+96/-5) ubuntuone/syncdaemon/file_shelf.py (+1/-1) ubuntuone/syncdaemon/filesystem_manager.py (+92/-85) ubuntuone/syncdaemon/filesystem_notifications.py (+4/-8) ubuntuone/syncdaemon/fsm/fsm.py (+5/-7) ubuntuone/syncdaemon/hash_queue.py (+1/-7) ubuntuone/syncdaemon/interaction_interfaces.py (+1/-3) ubuntuone/syncdaemon/logger.py (+0/-314) ubuntuone/syncdaemon/main.py (+10/-4) ubuntuone/syncdaemon/sync.py (+4/-7) ubuntuone/syncdaemon/tests/test_action_queue.py (+15/-12) ubuntuone/syncdaemon/tests/test_eq_inotify.py (+8/-8) ubuntuone/syncdaemon/tests/test_eventqueue.py (+6/-6) ubuntuone/syncdaemon/tests/test_eventsnanny.py (+3/-3) ubuntuone/syncdaemon/tests/test_fileshelf.py (+1/-4) ubuntuone/syncdaemon/tests/test_fsm.py (+12/-11) ubuntuone/syncdaemon/tests/test_hashqueue.py (+1/-5) ubuntuone/syncdaemon/tests/test_interaction_interfaces.py (+9/-9) ubuntuone/syncdaemon/tests/test_localrescan.py (+5/-5) ubuntuone/syncdaemon/tests/test_main.py (+3/-3) ubuntuone/syncdaemon/tests/test_states.py (+1/-2) ubuntuone/syncdaemon/tests/test_sync.py (+6/-7) ubuntuone/syncdaemon/tests/test_tritcask.py (+1/-1) ubuntuone/syncdaemon/tests/test_vm.py (+6/-6) ubuntuone/syncdaemon/tests/test_vm_helper.py (+1/-1) ubuntuone/syncdaemon/utils.py (+4/-2) ubuntuone/syncdaemon/volume_manager.py (+9/-8) ubuntuone/testing/testcase.py (+16/-10) ubuntuone/tests/test_config.py (+2/-84) ubuntuone/tests/test_logger.py (+1/-1) ubuntuone/utils/__init__.py (+0/-51) ubuntuone/utils/tests/test_common.py (+0/-108) |
| To merge this branch: | bzr merge lp://staging/~nataliabidart/magicicada-client/clean-pos-ins |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Facundo Batista | Needs Information | ||
|
Review via email:
|
|||
Commit message
- Have a working setup.py that would install locally and in custom locations.
To post a comment you must log in.
Unmerged revisions
- 1446. By Natalia Bidart
-
Merged trunk in.
- 1445. By Natalia Bidart
-
Merged simpler-setup-py into clean-pos-ins.
- 1444. By Natalia Bidart
-
Merged trunk in.
- 1443. By Natalia Bidart
-
Merged trunk in.
- 1442. By Natalia Bidart
-
Fixed typo.
- 1441. By Natalia Bidart
-
Merged trunk in.
- 1440. By Natalia Bidart
-
Closer.
- 1439. By Natalia Bidart
-
Checkpoint.
- 1438. By Natalia Bidart
-
Merged no-pos into clean-pos-ins.
- 1437. By Natalia Bidart
-
Merged no-pos into clean-pos-ins.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Some comments inline.
In general, you're touching a lot of files and not fixing the copyright headers (removing specific authors, adding 2016 chicharreros, etc).
Beyond that, I wanted to check if this new "base dirs mangling" didn't break the development starting when trying a local server, but I couldn't make it work because other server issues: http://
Probably we should go with this branch, but then make sure all is ok for starting the client against a dev local server.
What do you think?