lp://qastaging/~thisfred/desktopcouch/cut-gordian-knot

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://qastaging/desktopcouch at revision 224

Chad Miller (community): Approve on 2010-11-24

Vincenzo Di Somma (community): Approve on 2010-11-23

Diff: 1052 lines (+229/-184)

30 files modified

bin/desktopcouch-pair (+2/-2)
desktopcouch/application/migration/__init__.py (+7/-7)
desktopcouch/application/migration/tests/test_migration.py (+11/-10)
desktopcouch/application/pair/couchdb_pairing/couchdb_io.py (+6/-6)
desktopcouch/application/pair/couchdb_pairing/ubuntuone_pairing.py (+2/-2)
desktopcouch/application/pair/tests/test_couchdb_io.py (+4/-4)
desktopcouch/application/platform/linux/__init__.py (+1/-1)
desktopcouch/application/platform/windows/__init__.py (+1/-1)
desktopcouch/application/replication_services/ubuntuone.py (+3/-3)
desktopcouch/application/server.py (+48/-50)
desktopcouch/application/service.py (+7/-12)
desktopcouch/application/start_local_couchdb.py (+2/-2)
desktopcouch/application/tests/test_replication.py (+4/-4)
desktopcouch/application/tests/test_start_local_couchdb.py (+3/-2)
desktopcouch/records/database.py (+40/-8)
desktopcouch/records/doc/records.txt (+2/-2)
desktopcouch/records/server.py (+9/-0)
desktopcouch/records/server_base.py (+9/-0)
desktopcouch/records/tests/__init__.py (+1/-2)
desktopcouch/records/tests/test_record.py (+3/-3)
desktopcouch/records/tests/test_server.py (+12/-13)
desktopcouch/recordtypes/contacts/__init__.py (+0/-1)
desktopcouch/recordtypes/contacts/testing/create.py (+2/-2)
desktopcouch/recordtypes/contacts/tests/test_record.py (+1/-1)
desktopcouch/recordtypes/contacts/tests/test_view.py (+2/-2)
desktopcouch/recordtypes/contacts/view.py (+42/-37)
desktopcouch/recordtypes/notes.py (+1/-0)
desktopcouch/recordtypes/tasks.py (+1/-1)
desktopcouch/recordtypes/tests/test_notes.py (+2/-5)
desktopcouch/recordtypes/tests/test_tasks.py (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #510159: Split desktopcouch in two: a records library that can be used on the server and a desktop application/library

Medium

Fix Released

Link a bug report

Related blueprints

224. By Eric Casteleijn on 2010-11-24

removed unused import

223. By Eric Casteleijn on 2010-11-24

remerged from trunk

222. By Eric Casteleijn on 2010-11-23

fixed all pep8 issues

221. By Eric Casteleijn on 2010-11-23

unchanged: attach bug

220. By Eric Casteleijn on 2010-11-23

fixed comment

219. By Eric Casteleijn on 2010-11-23

fixed all deprecation warnings

218. By Eric Casteleijn on 2010-11-23

working with no dependencies on desktopcouch.application in desktopcouch.records, outside of tests and one deprecated class.

217. By Eric Casteleijn on 2010-11-23

This makes desktopcouch use the ubuntuone-dev-tools for testing and lint/pep8 checking. It will enforce lintless code.

216. By Eric Casteleijn on 2010-11-22

This reorganizes the code in preparation for the actual split into two or more packages. All the old import paths should still work.

215. By Eric Casteleijn on 2010-11-22

Makes RecordDict and MergeableList use Abstract Base Classes, so the code is smaller, and the interfaces are more guaranteed.