Merge lp://qastaging/~mandel/desktopcouch/add_platform_module into lp://qastaging/desktopcouch
Proposed by
Manuel de la Peña
| Status: | Merged |
|---|---|
| Approved by: | Vincenzo Di Somma |
| Approved revision: | 191 |
| Merged at revision: | 190 |
| Proposed branch: | lp://qastaging/~mandel/desktopcouch/add_platform_module |
| Merge into: | lp://qastaging/desktopcouch |
| Diff against target: |
1691 lines (+819/-576) 21 files modified
bin/desktopcouch-service (+6/-162) desktopcouch/__init__.py (+0/-206) desktopcouch/contacts/testing/create.py (+2/-1) desktopcouch/local_files.py (+35/-68) desktopcouch/pair/couchdb_pairing/couchdb_io.py (+2/-1) desktopcouch/pair/tests/test_network_io.py (+0/-2) desktopcouch/platform/__init__.py (+23/-0) desktopcouch/platform/linux/__init__.py (+199/-0) desktopcouch/platform/linux/ipc.py (+50/-0) desktopcouch/platform/linux/keyring.py (+81/-0) desktopcouch/platform/windows/__init__.py (+4/-0) desktopcouch/records/server.py (+2/-1) desktopcouch/records/tests/test_server.py (+1/-1) desktopcouch/service.py (+178/-0) desktopcouch/start_local_couchdb.py (+4/-27) desktopcouch/tests/__init__.py (+50/-1) desktopcouch/tests/test_local_files.py (+20/-64) desktopcouch/tests/test_service.py (+135/-0) desktopcouch/tests/test_start_local_couchdb.py (+0/-40) desktopcouch/util.py (+25/-0) runtests.py (+2/-2) |
| To merge this branch: | bzr merge lp://qastaging/~mandel/desktopcouch/add_platform_module |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Vincenzo Di Somma (community) | Approve | ||
| Eric Casteleijn (community) | Approve | ||
|
Review via email:
|
|||
Commit message
First attempt to move all the dependent platform code to its location. More work to be done on this topic will come.
Description of the change
First attempt to move all the dependent platform code to its location. More work to be done on this topic will come.
To post a comment you must log in.
Revision history for this message
| Vincenzo Di Somma (vds) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Tests pass +1