Merge lp://qastaging/~kevin-wright-1/u1db-qt/synchronizer-07-juni-2013 into lp://qastaging/u1db-qt
Proposed by
Cris Dywan
| Status: | Merged |
|---|---|
| Merged at revision: | 100 |
| Proposed branch: | lp://qastaging/~kevin-wright-1/u1db-qt/synchronizer-07-juni-2013 |
| Merge into: | lp://qastaging/u1db-qt |
| Diff against target: |
1293 lines (+1197/-3) (has conflicts) 9 files modified
CMakeLists.txt (+0/-1) examples/u1db-qt-example-6/u1db-qt-example-6.qdoc (+387/-0) examples/u1db-qt-example-6/u1db-qt-example-6.qml (+174/-0) modules/U1db/plugin.cpp (+2/-0) src/CMakeLists.txt (+3/-1) src/database.cpp (+4/-0) src/index.cpp (+13/-1) src/synchronizer.cpp (+526/-0) src/synchronizer.h (+88/-0) Text conflict in src/database.cpp Text conflict in src/index.cpp |
| To merge this branch: | bzr merge lp://qastaging/~kevin-wright-1/u1db-qt/synchronizer-07-juni-2013 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| U1DB Qt developers | Pending | ||
|
Review via email:
|
|||
To post a comment you must log in.
Revision history for this message
| Cris Dywan (kalikiana) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
syncLocalToLocal should use U1db::Database to re-use the initialization, which would also give it the existing sanity checks
the logic of onSyncChanged is probably best moved into a separate callback. Changing resolve_to_source and targets would trigger it as well. Thus it becomes possible to delay/ thread the real sync and avoid any delay at startup.
Even with keeping in mind it's incomplete //uncommented code and conflicts make reviewing a little hard.
I love the description of the sync via HTTP/ JSON, this would be nice to get into one qdoc-ified comment and make it accessible as documentation.