lp:~thisfred/u1db/json_vs_content

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:u1db at revision 307

Samuele Pedroni: Approve on 2012-05-23

Diff: 1280 lines (+264/-152)

24 files modified

include/u1db/u1db.h (+4/-4)
src/u1db.c (+23/-23)
src/u1db_http_sync_target.c (+2/-2)
u1db/__init__.py (+74/-8)
u1db/backends/__init__.py (+1/-1)
u1db/backends/inmemory.py (+8/-8)
u1db/backends/sqlite_backend.py (+10/-10)
u1db/commandline/client.py (+3/-4)
u1db/remote/http_app.py (+4/-3)
u1db/remote/http_database.py (+2/-2)
u1db/remote/http_target.py (+3/-1)
u1db/tests/__init__.py (+1/-2)
u1db/tests/c_backend_wrapper.pyx (+14/-15)
u1db/tests/commandline/test_client.py (+6/-6)
u1db/tests/test_backends.py (+16/-16)
u1db/tests/test_c_backend.py (+4/-4)
u1db/tests/test_document.py (+55/-10)
u1db/tests/test_http_app.py (+2/-2)
u1db/tests/test_http_database.py (+6/-3)
u1db/tests/test_remote_sync_target.py (+4/-4)
u1db/tests/test_sqlite_backend.py (+1/-1)
u1db/tests/test_sync.py (+10/-10)
u1todo/test_u1todo.py (+4/-4)
u1todo/u1todo.py (+7/-9)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1002855: Change document object API

High

Fix Released

Link a bug report

Related blueprints

313. By Eric Casteleijn on 2012-05-23

merged trunk and fixed tests and commandline client

312. By Eric Casteleijn on 2012-05-23

changed delete/is_deleted to make_tombstone/is_tombstone

311. By Eric Casteleijn on 2012-05-22

use delete() consistently

310. By Eric Casteleijn on 2012-05-22

added delete() method, added tests, switched to is_deleted

309. By Eric Casteleijn on 2012-05-22

added same_content_as and is_deleted, fixed erroneous use of .content

308. By Eric Casteleijn on 2012-05-22

added tests for .content and a comment about the optional nature of implementing it.

307. By Eric Casteleijn on 2012-05-22

unchanged: attach bug

306. By Eric Casteleijn on 2012-05-22

switched .content to get_json and set_json and made .content a property in python that accesses the dict.

305. By Eric Casteleijn on 2012-05-21

Fixed two memory leaks.

304. By John Lenton on 2012-05-21

[r=pedronis] Adds get-index-keys to u1db-client