lp:~jameinel/u1db/c-pysync

Branch merges

Merged into lp:u1db at revision 225

Eric Casteleijn (community): Approve on 2012-03-07

Diff: 390 lines (+146/-78)

7 files modified

include/u1db/u1db_internal.h (+5/-0)
src/u1db_query.c (+3/-3)
src/u1db_sync_target.c (+6/-0)
u1db/__init__.py (+1/-1)
u1db/tests/__init__.py (+1/-0)
u1db/tests/test_c_backend.py (+42/-1)
u1db/tests/test_sync.py (+88/-73)

api

Propose for merging

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

226. By John A Meinel on 2012-03-07

Change u1db_get_from_index so that it *doesn't* try to set the has_conflicts flag.

We have a couple tests that are asserting this (by accident), waiting to hear what we want
in the final version.

225. By John A Meinel on 2012-03-07

Get the sync tests running against the C backend using the Python sync code.

There are curretnly 2 'conflicted during sync' tests that are failing, everything else passes.

224. By John A Meinel on 2012-03-07

Work on getting a C implementation to pass the full test_sync tests.

223. By John A Meinel on 2012-03-07

Move the conflict tests to all backends, and fix the C code to handle put/delete when a doc is conflicted.

222. By John A Meinel on 2012-03-06

Add SyncTarget._set_trace_hook.

This allows us to run the tests that used to monkeypatch whats_changed, and instead use
a trace hook to trigger at the appropriate time.

221. By John A Meinel on 2012-03-06

Add the code for CSyncTarget.sync_exchange and clean up the test suite to run local C permutations for SyncTarget tests.

220. By John A Meinel on 2012-03-06

Change u1db__get_db_generation into u1db__get_generation

219. By John A Meinel on 2012-03-06

Migrate some more code to using const char * and common typedefs.

218. By John A Meinel on 2012-03-06

Add u1db__sync_exchange_return_docs.

This iterates through the documents we are interested in, and returns them
via the callback.

217. By John A Meinel on 2012-03-06

Merge the initial u1db_sync_exchange struct.

This gets us things like find_doc_ids_to_return.