Merge lp://staging/~phablet-team/history-service/trace_sqlite into lp://staging/history-service
Proposed by
Gustavo Pichorim Boiko
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://staging/~phablet-team/history-service/trace_sqlite |
| Merge into: | lp://staging/history-service |
| Diff against target: |
3373 lines (+1280/-447) 49 files modified
CMakeLists.txt (+5/-0) Ubuntu/History/historyeventmodel.cpp (+39/-42) Ubuntu/History/historyeventmodel.h (+2/-5) Ubuntu/History/historygroupedthreadsmodel.cpp (+54/-2) Ubuntu/History/historygroupedthreadsmodel.h (+5/-0) Ubuntu/History/historymodel.cpp (+108/-10) Ubuntu/History/historymodel.h (+11/-0) Ubuntu/History/historythreadmodel.cpp (+48/-9) Ubuntu/History/historythreadmodel.h (+2/-0) cmake/modules/GenerateTest.cmake (+1/-0) daemon/HistoryService.xml (+29/-0) daemon/callchannelobserver.cpp (+16/-2) daemon/callchannelobserver.h (+2/-1) daemon/historydaemon.cpp (+323/-186) daemon/historydaemon.h (+21/-10) daemon/historyservicedbus.cpp (+111/-8) daemon/historyservicedbus.h (+25/-0) daemon/main.cpp (+15/-5) daemon/textchannelobserver.cpp (+1/-14) daemon/textchannelobserver.h (+1/-2) plugins/sqlite/schema/v18.sql (+14/-0) plugins/sqlite/sqlitedatabase.cpp (+10/-0) plugins/sqlite/sqlitehistoryeventview.cpp (+8/-1) plugins/sqlite/sqlitehistoryplugin.cpp (+136/-53) plugins/sqlite/sqlitehistoryplugin.h (+6/-1) plugins/sqlite/sqlitehistorythreadview.cpp (+8/-1) src/contactmatcher.cpp (+57/-22) src/contactmatcher_p.h (+2/-0) src/eventview.cpp (+6/-2) src/eventview.h (+3/-1) src/manager.cpp (+24/-0) src/manager.h (+4/-1) src/managerdbus.cpp (+55/-10) src/managerdbus_p.h (+10/-2) src/participant.cpp (+9/-0) src/participant.h (+1/-0) src/plugin.h (+6/-0) src/thread.cpp (+16/-0) src/thread.h (+2/-0) src/threadview.cpp (+15/-0) src/threadview.h (+8/-0) src/threadview_p.h (+4/-0) src/utils.cpp (+16/-1) src/utils_p.h (+2/-0) tests/Ubuntu.History/HistoryEventModelTest.cpp (+1/-1) tests/daemon/DaemonTest.cpp (+0/-8) tests/libhistoryservice/ManagerTest.cpp (+16/-43) tests/plugins/sqlite/SqliteEventViewTest.cpp (+22/-2) tests/plugins/sqlite/SqlitePluginTest.cpp (+0/-2) |
| To merge this branch: | bzr merge lp://staging/~phablet-team/history-service/trace_sqlite |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| system-apps-ci-bot | continuous-integration | Approve | |
| PS Jenkins bot | continuous-integration | Pending | |
| Ubuntu Phablet Team | Pending | ||
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2017-03-21.
Commit message
Make it possible to debug sqlite commands.
Description of the change
Make it possible to debug sqlite commands.
To post a comment you must log in.
Revision history for this message
| system-apps-ci-bot (system-apps-ci-bot) wrote | # |
Download full text (3.3 KiB)
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| system-apps-ci-bot (system-apps-ci-bot) wrote | # |
review:
Approve
(continuous-integration)
Unmerged revisions
- 229. By Gustavo Pichorim Boiko
-
Rebase this branch using the VOIP and IRC changes.
- 228. By Gustavo Pichorim Boiko
-
Add option sqlite command tracing
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
FAILED: Continuous integration, rev:228
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/