lp:~thisfred/desktopcouch/split-attempt-2
Created by
Eric Casteleijn
and last modified
- Get this branch:
- bzr branch lp:~thisfred/desktopcouch/split-attempt-2
Only
Eric Casteleijn
can upload to this branch. If you are
Eric Casteleijn
please log in for upload directions.
Branch merges
Propose for merging
No branches
dependent on this one.
- dobey (community): Abstain
- Vincenzo Di Somma (community): Approve
- Manuel de la Peña (community): Approve
- Chad Miller (community): Approve
-
Diff: 4040 lines (+1093/-878)78 files modifiedbin/desktopcouch-pair (+1/-1)
desktopcouch/__init__.py (+1/-0)
desktopcouch/application/local_files.py (+67/-53)
desktopcouch/application/migration/__init__.py (+3/-3)
desktopcouch/application/migration/tests/test_migration.py (+6/-6)
desktopcouch/application/pair/couchdb_pairing/couchdb_io.py (+5/-5)
desktopcouch/application/pair/couchdb_pairing/dbus_io.py (+65/-40)
desktopcouch/application/pair/couchdb_pairing/network_io.py (+68/-58)
desktopcouch/application/pair/couchdb_pairing/ubuntuone_pairing.py (+1/-1)
desktopcouch/application/pair/tests/test_couchdb_io.py (+4/-4)
desktopcouch/application/pair/tests/test_network_io.py (+47/-125)
desktopcouch/application/pair/tests/test_ubuntuone_pairing.py (+2/-2)
desktopcouch/application/platform/__init__.py (+17/-9)
desktopcouch/application/platform/linux/ipc.py (+11/-5)
desktopcouch/application/platform/linux/keyring.py (+24/-19)
desktopcouch/application/replication.py (+48/-31)
desktopcouch/application/replication_services/ubuntuone.py (+20/-10)
desktopcouch/application/service.py (+34/-31)
desktopcouch/application/start_local_couchdb.py (+2/-2)
desktopcouch/application/stop_local_couchdb.py (+6/-2)
desktopcouch/application/tests/__init__.py (+53/-31)
desktopcouch/application/tests/test_local_files.py (+34/-19)
desktopcouch/application/tests/test_replication.py (+17/-10)
desktopcouch/application/tests/test_service.py (+20/-16)
desktopcouch/application/tests/test_start_local_couchdb.py (+7/-3)
desktopcouch/bookmarks/__init__.py (+0/-20)
desktopcouch/bookmarks/record.py (+9/-0)
desktopcouch/contacts/__init__.py (+0/-20)
desktopcouch/contacts/record.py (+9/-0)
desktopcouch/contacts/view.py (+9/-0)
desktopcouch/local_files.py (+9/-0)
desktopcouch/notes/__init__.py (+0/-19)
desktopcouch/notes/record.py (+9/-0)
desktopcouch/notes/tests/__init__.py (+0/-18)
desktopcouch/pair/__init__.py (+9/-0)
desktopcouch/pair/couchdb_pairing/__init__.py (+1/-0)
desktopcouch/pair/couchdb_pairing/couchdb_io.py (+10/-0)
desktopcouch/pair/couchdb_pairing/dbus_io.py (+10/-0)
desktopcouch/pair/couchdb_pairing/network_io.py (+10/-0)
desktopcouch/pair/couchdb_pairing/ubuntuone_pairing.py (+10/-0)
desktopcouch/records/__init__.py (+0/-23)
desktopcouch/records/doc/an_example_application.txt (+3/-3)
desktopcouch/records/doc/field_registry.txt (+1/-1)
desktopcouch/records/doc/records.txt (+1/-1)
desktopcouch/records/field_registry.py (+1/-1)
desktopcouch/records/server.py (+5/-4)
desktopcouch/records/server_base.py (+11/-6)
desktopcouch/records/tests/test_field_registry.py (+1/-1)
desktopcouch/records/tests/test_record.py (+4/-4)
desktopcouch/records/tests/test_server.py (+4/-4)
desktopcouch/recordtypes/__init__.py (+1/-0)
desktopcouch/recordtypes/bookmarks.py (+14/-6)
desktopcouch/recordtypes/contacts/__init__.py (+2/-2)
desktopcouch/recordtypes/contacts/testing/create.py (+23/-9)
desktopcouch/recordtypes/contacts/tests/__init__.py (+2/-3)
desktopcouch/recordtypes/contacts/tests/test_create.py (+15/-13)
desktopcouch/recordtypes/contacts/tests/test_record.py (+1/-1)
desktopcouch/recordtypes/contacts/tests/test_view.py (+220/-62)
desktopcouch/recordtypes/contacts/view.py (+1/-1)
desktopcouch/recordtypes/notes.py (+1/-1)
desktopcouch/recordtypes/tasks.py (+1/-1)
desktopcouch/recordtypes/tests/__init__.py (+1/-0)
desktopcouch/recordtypes/tests/test_bookmarks.py (+1/-2)
desktopcouch/recordtypes/tests/test_notes.py (+1/-1)
desktopcouch/recordtypes/tests/test_tasks.py (+1/-1)
desktopcouch/replication.py (+9/-0)
desktopcouch/replication_services/__init__.py (+10/-0)
desktopcouch/replication_services/example.py (+10/-0)
desktopcouch/replication_services/ubuntuone.py (+10/-0)
desktopcouch/service.py (+9/-0)
desktopcouch/start_local_couchdb.py (+16/-0)
desktopcouch/stop_local_couchdb.py (+15/-0)
desktopcouch/tasks/__init__.py (+0/-19)
desktopcouch/tasks/record.py (+9/-0)
desktopcouch/tests/__init__.py (+9/-0)
desktopcouch/util.py (+9/-0)
po/desktopcouch.pot (+0/-137)
runtests.py (+13/-8)
Related source package recipes
Related bugs
Related blueprints
Branch information
Recent revisions
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:desktopcouch
