ItemSync can be canceled but not defered. Add assert and debug output.
ClosedPublic
Actions

Authored by dfaure on Aug 22 2018, 7:42 AM.

Details

Reviewers

dvratil
vkrause

Commits

R165:83b9a43cc4ed: ItemSync can be canceled but not defered. Add assert and debug output.
R165:161855e1935b: ItemSync can be canceled but not defered. Add assert and debug output.

Summary

And turn the warning in rollback to a debug, this isn't a problem when
it happens because the task is canceled (e.g. interval-sync with no network
available).

Test Plan

I've been running with this for some time and I never hit
the assert (after fixing the imap resource and the FatCRM resources to do this
correctly). Let's hope no other resource hits this. But OTOH, if they were deferring
an itemsync, they would get stuck forever, the job never finishing...

Diff Detail

Repository

R165 Akonadi

Branch

2018_08_defer_assert

Lint

No Linters Available

Unit

No Unit Test Coverage

Build Status

Buildable 2194
Build 2212: arc lint + arc unit

dfaure created this revision.Aug 22 2018, 7:42 AM

Restricted Application added a project: KDE PIM. · View Herald TranscriptAug 22 2018, 7:42 AM

Restricted Application edited subscribers, added: kde-pim; removed: KDE PIM. · View Herald Transcript

dfaure requested review of this revision.Aug 22 2018, 7:42 AM

Harbormaster completed remote builds in B2103: Diff 40189.Aug 22 2018, 7:42 AM

Use qCDebug

Harbormaster completed remote builds in B2192: Diff 40353.Aug 24 2018, 8:52 AM

pff

Harbormaster completed remote builds in B2194: Diff 40355.Aug 24 2018, 8:53 AM

dvratil accepted this revision.Aug 24 2018, 8:18 PM

This revision is now accepted and ready to land.Aug 24 2018, 8:18 PM

Closed by commit R165:83b9a43cc4ed: ItemSync can be canceled but not defered. Add assert and debug output. (authored by dfaure). · Explain WhyAug 25 2018, 11:20 AM

This revision was automatically updated to reflect the committed changes.

Large Diff

This large diff affects 503 files. Files without inline comments have been collapsed. Expand All Files

Showing Only Differences

This revision modifies 2 more files that are hidden because they were not modified between selected diffs and they have no inline comments.

Revision Contents
Changeset List

		Path
M		CMakeLists.txt (14 lines)
M		KF5AkonadiMacros.cmake (35 lines)
M		akonadi.categories (1 line)
A	M	akonadiwidgetstests_export.h.in (2 lines)
D	M	autotests/agentbase2/CMakeLists.txt (1 line)
M		autotests/akonadicontrol/CMakeLists.txt (2 lines)
M		autotests/libs/CMakeLists.txt (8 lines)
M		autotests/libs/actionstatemanagertest.cpp (10 lines)
P		autotests/libs/cachepolicytest.h (2 lines) Copied to autotests/libs/conflictresolvedialogtest.h
M		autotests/libs/cachepolicytest.cpp (2 lines)
M		autotests/libs/collectionattributetest.cpp (2 lines)
A	M	autotests/libs/collectioncreatetest.cpp (67 lines)
M		autotests/libs/collectionsynctest.cpp (4 lines)
P		autotests/libs/conflictresolvedialogtest.h (17 lines) Copied from autotests/libs/cachepolicytest.h
A	M	autotests/libs/conflictresolvedialogtest.cpp (64 lines)
M		autotests/libs/fakeakonadiservercommand.h (26 lines)
M		autotests/libs/fakeentitycache.h (26 lines)
M		autotests/libs/inspectablechangerecorder.cpp (2 lines)
M		autotests/libs/itemmovetest.cpp (3 lines)
M		autotests/libs/linktest.cpp (1 line)
M		autotests/libs/monitornotificationtest.cpp (25 lines)
M		autotests/libs/newmailnotifierattributetest.h (2 lines)
M		autotests/libs/newmailnotifierattributetest.cpp (2 lines)
M		autotests/libs/pop3resourceattributetest.h (2 lines)
M		autotests/libs/pop3resourceattributetest.cpp (2 lines)
M		autotests/libs/protocolhelpertest.cpp (44 lines)
M		autotests/libs/tagselectwidgettest.h (2 lines)
M		autotests/libs/tagselectwidgettest.cpp (2 lines)
M		autotests/libs/tagtest.cpp (1 line)
M		autotests/libs/testresource/CMakeLists.txt (20 lines)
M		autotests/libs/testresource/knutresource.h (2 lines)
M		autotests/libs/testrunner/main.cpp (4 lines)
M		autotests/libs/testrunner/setup.cpp (89 lines)
M		autotests/libs/testrunner/shellscript.cpp (65 lines)
M		autotests/libs/testrunner/testrunner.cpp (5 lines)
M		autotests/private/akstandarddirstest.cpp (10 lines)
M		autotests/private/notificationmessagetest.cpp (8 lines)
M		autotests/private/protocoltest.cpp (48 lines)
M		autotests/server/CMakeLists.txt (27 lines)
M		autotests/server/akappendhandlertest.cpp (18 lines)
M		autotests/server/collectionreferencetest.cpp (9 lines)
M		autotests/server/collectionstatisticstest.cpp (55 lines)
M		autotests/server/createhandlertest.cpp (28 lines)
M		autotests/server/dbconfigtest.cpp (5 lines)
M		autotests/server/dbinitializer.h (1 line)
M		autotests/server/dbinitializer.cpp (22 lines)
V		autotests/server/{dbpopulator.h → inspectablenotificationcollector.cpp}
M		autotests/server/dbpopulator.xsl (29 lines)
M		autotests/server/fakeakonadiserver.h (6 lines)
M		autotests/server/fakeakonadiserver.cpp (23 lines)
M		autotests/server/fakeclient.h (4 lines)
M		autotests/server/fakeclient.cpp (83 lines)
M		autotests/server/fakeconnection.h (4 lines)
P		autotests/server/fakeconnection.cpp (10 lines) Copied to tests/libs/conflictresolvedialogtest_gui.cpp
M		autotests/server/fakedatastore.h (17 lines)
M		autotests/server/fakedatastore.cpp (53 lines)
M		autotests/server/fakeitemretrievalmanager.cpp (4 lines)
M		autotests/server/fakesearchmanager.h (2 lines)
M		autotests/server/fetchhandlertest.cpp (4 lines)
M		autotests/server/handlertest.cpp (44 lines)
P		autotests/server/inspectablenotificationcollector.h (33 lines) Copied from src/server/handler/searchresult.h
V		autotests/server/{inspectablenotificationcollector.cpp ← dbpopulator.h} (28 lines)
M		autotests/server/linkhandlertest.cpp (34 lines)
M		autotests/server/modifyhandlertest.cpp (30 lines)
M		autotests/server/movehandlertest.cpp (18 lines)
M		autotests/server/notificationmanagertest.cpp (43 lines)
M		autotests/server/partstreamertest.cpp (2 lines)
M		autotests/server/relationhandlertest.cpp (44 lines)
M		autotests/server/taghandlertest.cpp (34 lines)
M		cmake/modules/AkonadiMacros.cmake (104 lines)
D	M	cmake/modules/FindXsltproc.cmake (49 lines)
M		metainfo.yaml (1 line)
M		src/agentbase/agentbase.h (20 lines)
M		src/agentbase/agentbase.cpp (34 lines)
M		src/agentbase/agentbase_p.h (4 lines)
M		src/agentbase/agentfactory.h (2 lines)
M		src/agentbase/preprocessorbase.h (2 lines)
M		src/agentbase/resourcebase.h (17 lines)
M		src/agentbase/resourcescheduler_p.h (1 line)
M		src/agentbase/resourcesettings.h (4 lines)
P		src/agentbase/resourcesettings.cpp (2 lines) Copied to multiple locations: src/core/favoritecollectionattribute.cpp src/core/remotelog.cpp
M		src/agentbase/transportresourcebase.cpp (4 lines)
M		src/agentserver/CMakeLists.txt (2 lines)
M		src/agentserver/agentpluginloader.h (2 lines)
M		src/agentserver/agentpluginloader.cpp (15 lines)
M		src/agentserver/agentserver.cpp (1 line)
M		src/akonadicontrol/agentinstance.h (28 lines)
M		src/akonadicontrol/agentinstance.cpp (11 lines)
M		src/akonadicontrol/agentmanager.cpp (11 lines)
M		src/akonadicontrol/agentprocessinstance.h (2 lines)
M		src/akonadicontrol/agentprocessinstance.cpp (8 lines)
M		src/akonadicontrol/agentthreadinstance.h (1 line)
M		src/akonadicontrol/agenttype.h (2 lines)
M		src/akonadicontrol/agenttype.cpp (2 lines)
M		src/akonadicontrol/processcontrol.h (2 lines)
M		src/akonadicontrol/processcontrol.cpp (18 lines)
M		src/akonadictl/CMakeLists.txt (3 lines)
M		src/akonadictl/akonadistarter.h (4 lines)
M		src/akonadictl/akonadistarter.cpp (1 line)
M		src/akonadictl/main.cpp (45 lines)
M		src/asapcat/main.cpp (4 lines)
M		src/asapcat/session.h (4 lines)
M		src/asapcat/session.cpp (5 lines)
M		src/core/CMakeLists.txt (4 lines)
M		src/core/agentinstance.h (18 lines)
M		src/core/agentinstance.cpp (4 lines)
M		src/core/agentmanager.h (8 lines)
M		src/core/agentmanager.cpp (2 lines)
M		src/core/agentmanager_p.h (1 line)
M		src/core/agenttype.h (18 lines)
M		src/core/attributefactory.cpp (2 lines)
M		src/core/braveheart.cpp (2 lines)
M		src/core/cachepolicy.h (10 lines)
M		src/core/cachepolicy.cpp (12 lines)
M		src/core/changenotification.h (10 lines)
M		src/core/changenotificationdependenciesfactory.cpp (17 lines)
M		src/core/changenotificationdependenciesfactory_p.h (9 lines)
M		src/core/changerecorder.h (4 lines)
M		src/core/changerecorder_p.cpp (647 lines)
M		src/core/collection.h (52 lines)
M		src/core/collectioncolorattribute.h (2 lines)
M		src/core/collectioncolorattribute.cpp (2 lines)
M		src/core/collectionfetchscope.h (20 lines)
M		src/core/collectionfetchscope.cpp (4 lines)
M		src/core/collectionidentificationattribute.h (2 lines)
M		src/core/collectionidentificationattribute.cpp (2 lines)
M		src/core/collectionpathresolver.h (12 lines)
M		src/core/collectionpathresolver.cpp (16 lines)
M		src/core/collectionquotaattribute.h (2 lines)
M		src/core/collectionrightsattribute_p.h (2 lines)
M		src/core/collectionstatistics.h (6 lines)
M		src/core/collectionstatistics.cpp (9 lines)
M		src/core/collectionsync.cpp (2 lines)
M		src/core/collectionsync_p.h (2 lines)
M		src/core/collectionutils.h (30 lines)
A	M	src/core/commandbuffer_p.h (146 lines)
M		src/core/conflicthandler.cpp (7 lines)
M		src/core/connection.cpp (166 lines)
M		src/core/connection_p.h (24 lines)
M		src/core/control.h (3 lines)
M		src/core/control.cpp (11 lines)
M		src/core/entityannotationsattribute.cpp (2 lines)
M		src/core/entitycache_p.h (4 lines)
M		src/core/entitydeletedattribute.h (2 lines)
M		src/core/entitydisplayattribute.h (2 lines)
M		src/core/entitydisplayattribute.cpp (1 line)
M		src/core/entityhiddenattribute.h (2 lines)
M		src/core/exceptionbase.h (2 lines)
P		src/core/favoritecollectionattribute.h (32 lines) Copied from tests/libs/etm_test_app/mainwindow.h
P		src/core/favoritecollectionattribute.cpp (27 lines) Copied from src/agentbase/resourcesettings.cpp
M		src/core/firstrun.cpp (5 lines)
M		src/core/indexpolicyattribute.h (4 lines)
M		src/core/indexpolicyattribute.cpp (4 lines)
M		src/core/item.h (12 lines)
M		src/core/item.cpp (5 lines)
M		src/core/item_p.h (2 lines)
M		src/core/itemfetchscope.h (34 lines)
M		src/core/itempayloadinternals_p.h (4 lines)
M		src/core/itemserializer.cpp (2 lines)
M		src/core/itemsync.h (6 lines)
M		src/core/jobs/agentinstancecreatejob.h (4 lines)
M		src/core/jobs/agentinstancecreatejob.cpp (3 lines)
M		src/core/jobs/collectionattributessynchronizationjob.h (2 lines)
M		src/core/jobs/collectioncopyjob.h (2 lines)
M		src/core/jobs/collectioncreatejob.h (4 lines)
M		src/core/jobs/collectiondeletejob.h (2 lines)
M		src/core/jobs/collectionfetchjob.h (6 lines)
M		src/core/jobs/collectionfetchjob.cpp (6 lines)
M		src/core/jobs/collectionmodifyjob.h (4 lines)
M		src/core/jobs/collectionstatisticsjob.h (6 lines)
M		src/core/jobs/invalidatecachejob.cpp (2 lines)
M		src/core/jobs/invalidatecachejob_p.h (1 line)
M		src/core/jobs/itemcopyjob.h (2 lines)
M		src/core/jobs/itemcreatejob.h (4 lines)
M		src/core/jobs/itemcreatejob.cpp (6 lines)
M		src/core/jobs/itemdeletejob.h (4 lines)
M		src/core/jobs/itemdeletejob.cpp (6 lines)
M		src/core/jobs/itemfetchjob.h (4 lines)
M		src/core/jobs/itemfetchjob.cpp (16 lines)
M		src/core/jobs/itemmodifyjob.h (13 lines)
M		src/core/jobs/itemmodifyjob.cpp (11 lines)
M		src/core/jobs/itemmovejob.h (6 lines)
M		src/core/jobs/itemsearchjob.h (10 lines)
M		src/core/jobs/itemsearchjob.cpp (7 lines)
M		src/core/jobs/job.h (4 lines)
M		src/core/jobs/job.cpp (18 lines)
M		src/core/jobs/job_p.h (25 lines)
M		src/core/jobs/linkjob.h (2 lines)
M		src/core/jobs/recursiveitemfetchjob.h (5 lines)
M		src/core/jobs/recursiveitemfetchjob.cpp (2 lines)
M		src/core/jobs/relationcreatejob.h (2 lines)
M		src/core/jobs/relationdeletejob.h (2 lines)
M		src/core/jobs/relationfetchjob.h (2 lines)
M		src/core/jobs/resourcesynchronizationjob.h (8 lines)
M		src/core/jobs/resourcesynchronizationjob.cpp (11 lines)
M		src/core/jobs/searchcreatejob.h (12 lines)
M		src/core/jobs/searchcreatejob.cpp (8 lines)
M		src/core/jobs/searchresultjob.cpp (2 lines)
M		src/core/jobs/searchresultjob_p.h (4 lines)
M		src/core/jobs/specialcollectionsdiscoveryjob.h (2 lines)
M		src/core/jobs/specialcollectionshelperjobs.cpp (22 lines)
M		src/core/jobs/specialcollectionshelperjobs_p.h (16 lines)
M		src/core/jobs/specialcollectionsrequestjob.h (5 lines)
M		src/core/jobs/specialcollectionsrequestjob.cpp (2 lines)
M		src/core/jobs/subscriptionjob_p.h (2 lines)
M		src/core/jobs/tagcreatejob.h (2 lines)
M		src/core/jobs/tagcreatejob.cpp (3 lines)
M		src/core/jobs/tagdeletejob.h (2 lines)
M		src/core/jobs/tagfetchjob.h (2 lines)
M		src/core/jobs/tagfetchjob.cpp (1 line)
M		src/core/jobs/tagmodifyjob.h (2 lines)
M		src/core/jobs/tagmodifyjob.cpp (2 lines)
M		src/core/jobs/transactionjobs.h (2 lines)
M		src/core/jobs/transactionsequence.h (2 lines)
M		src/core/jobs/transactionsequence.cpp (29 lines)
M		src/core/jobs/trashjob.h (4 lines)
M		src/core/jobs/trashrestorejob.h (4 lines)
M		src/core/jobs/trashrestorejob.cpp (2 lines)
M		src/core/jobs/unlinkjob.h (2 lines)
M		src/core/mimetypechecker.h (16 lines)
M		src/core/models/agentfilterproxymodel.h (2 lines)
M		src/core/models/agentinstancemodel.h (22 lines)
M		src/core/models/agentinstancemodel.cpp (14 lines)
M		src/core/models/agenttypemodel.h (14 lines)
M		src/core/models/agenttypemodel.cpp (2 lines)
M		src/core/models/collectionfilterproxymodel.h (8 lines)
M		src/core/models/collectionfilterproxymodel.cpp (5 lines)
M		src/core/models/collectionmodel.h (31 lines)
M		src/core/models/collectionmodel.cpp (4 lines)
M		src/core/models/collectionmodel_p.h (4 lines)
M		src/core/models/collectionmodel_p.cpp (2 lines)
M		src/core/models/entitymimetypefiltermodel.h (14 lines)
M		src/core/models/entityorderproxymodel.h (12 lines)
M		src/core/models/entityorderproxymodel.cpp (107 lines)
M		src/core/models/entityrightsfiltermodel.h (8 lines)
M		src/core/models/entitytreemodel.h (52 lines)
M		src/core/models/entitytreemodel.cpp (14 lines)
M		src/core/models/entitytreemodel_p.cpp (7 lines)
M		src/core/models/favoritecollectionsmodel.h (22 lines)
M		src/core/models/favoritecollectionsmodel.cpp (32 lines)
M		src/core/models/itemmodel.h (26 lines)
M		src/core/models/quotacolorproxymodel.h (10 lines)
M		src/core/models/quotacolorproxymodel.cpp (12 lines)
M		src/core/models/recursivecollectionfilterproxymodel.h (6 lines)
M		src/core/models/recursivecollectionfilterproxymodel.cpp (17 lines)
M		src/core/models/statisticsproxymodel.h (14 lines)
M		src/core/models/statisticsproxymodel.cpp (7 lines)
M		src/core/models/subscriptionmodel_p.h (2 lines)
M		src/core/models/tagmodel.h (16 lines)
M		src/core/models/tagmodel_p.h (4 lines)
M		src/core/models/trashfilterproxymodel.h (4 lines)
M		src/core/models/trashfilterproxymodel.cpp (3 lines)
M		src/core/monitor.h (28 lines)
M		src/core/monitor.cpp (17 lines)
M		src/core/monitor_p.h (13 lines)
M		src/core/monitor_p.cpp (487 lines)
M		src/core/newmailnotifierattribute.h (4 lines)
M		src/core/newmailnotifierattribute.cpp (2 lines)
M		src/core/notificationsubscriber.h (9 lines)
M		src/core/notificationsubscriber.cpp (39 lines)
M		src/core/partfetcher.h (2 lines)
M		src/core/pastehelper.cpp (4 lines)
M		src/core/persistentsearchattribute.h (2 lines)
M		src/core/persistentsearchattribute.cpp (10 lines)
M		src/core/pluginloader.cpp (3 lines)
M		src/core/pop3resourceattribute.h (4 lines)
M		src/core/pop3resourceattribute.cpp (2 lines)
M		src/core/protocolhelper.cpp (265 lines)
M		src/core/protocolhelper_p.h (15 lines)
M		src/core/qtest_akonadi.h (10 lines)
M		src/core/relation.h (10 lines)
M		src/core/relationsync.h (6 lines)
M		src/core/relationsync.cpp (4 lines)
P		src/core/remotelog.cpp (34 lines) Copied from src/agentbase/resourcesettings.cpp
M		src/core/searchquery.h (16 lines)
M		src/core/searchquery.cpp (3 lines)
M		src/core/servermanager.h (20 lines)
M		src/core/servermanager.cpp (35 lines)
M		src/core/session.h (6 lines)
M		src/core/session.cpp (164 lines)
M		src/core/session_p.h (15 lines)
M		src/core/sessionthread.cpp (68 lines)
M		src/core/sessionthread_p.h (16 lines)
M		src/core/specialcollectionattribute.h (2 lines)
M		src/core/specialcollections.h (11 lines)
M		src/core/tag.h (12 lines)
M		src/core/tag.cpp (11 lines)
M		src/core/tagattribute.cpp (7 lines)
M		src/core/tagfetchscope.cpp (3 lines)
M		src/core/tagsync.h (2 lines)
M		src/core/trashsettings.h (2 lines)
P		src/core/vectorhelper.h (2 lines) Copied to src/shared/vectorhelper.h
M		src/private/CMakeLists.txt (32 lines)
A	M	src/private/channel.h (105 lines)
A	M	src/private/channel.cpp (101 lines)
M		src/private/datastream_p.cpp (50 lines)
M		src/private/datastream_p_p.h (13 lines)
M		src/private/dbus.cpp (7 lines)
M		src/private/externalpartstorage.cpp (2 lines)
M		src/private/protocol.cpp (437 lines)
M		src/private/protocol.xml (96 lines)
M		src/private/protocol_exception_p.h (5 lines)
M		src/private/protocol_p.h (148 lines)
M		src/private/protocolgen/cppgenerator.cpp (230 lines)
M		src/private/protocolgen/nodetree.h (8 lines)
M		src/private/protocolgen/nodetree.cpp (12 lines)
M		src/private/protocolgen/typehelper.h (1 line)
M		src/private/protocolgen/typehelper.cpp (5 lines)
M		src/private/protocolgen/xmlparser.cpp (2 lines)
M		src/private/scope.cpp (42 lines)
M		src/private/scope_p.h (4 lines)
M		src/private/standarddirs.cpp (156 lines)
M		src/private/standarddirs_p.h (70 lines)
D	M	src/private/xdgbasedirs.cpp (587 lines)
D	M	src/private/xdgbasedirs_p.h (335 lines)
M		src/qsqlite/src/qsql_sqlite.cpp (2 lines)
M		src/rds/bridgeconnection.cpp (6 lines)
M		src/rds/bridgeserver.cpp (2 lines)
M		src/server/CMakeLists.txt (45 lines)
A	M	src/server/aggregatedfetchscope.h (138 lines)
A	M	src/server/aggregatedfetchscope.cpp (602 lines)
M		src/server/akonadi.h (5 lines)
M		src/server/akonadi.cpp (67 lines)
M		src/server/akthread.h (2 lines)
M		src/server/akthread.cpp (15 lines)
M		src/server/cachecleaner.h (2 lines)
M		src/server/collectionscheduler.h (4 lines)
M		src/server/collectionscheduler.cpp (12 lines)
M		src/server/connection.h (77 lines)
M		src/server/connection.cpp (351 lines)
M		src/server/dbustracer.h (4 lines)
M		src/server/filetracer.h (2 lines)
M		src/server/handler.h (59 lines)
M		src/server/handler.cpp (62 lines)
M		src/server/handler/akappend.h (3 lines)
M		src/server/handler/akappend.cpp (52 lines)
M		src/server/handler/colcopy.h (3 lines)
M		src/server/handler/colcopy.cpp (35 lines)
M		src/server/handler/colmove.h (3 lines)
M		src/server/handler/colmove.cpp (8 lines)
M		src/server/handler/copy.h (13 lines)
M		src/server/handler/copy.cpp (22 lines)
M		src/server/handler/create.h (9 lines)
M		src/server/handler/create.cpp (33 lines)
M		src/server/handler/delete.h (3 lines)
M		src/server/handler/delete.cpp (8 lines)
M		src/server/handler/fetch.h (3 lines)
M		src/server/handler/fetch.cpp (6 lines)
M		src/server/handler/fetchhelper.h (17 lines)
M		src/server/handler/fetchhelper.cpp (126 lines)
M		src/server/handler/link.h (3 lines)
M		src/server/handler/link.cpp (14 lines)
M		src/server/handler/list.h (40 lines)
M		src/server/handler/list.cpp (22 lines)
M		src/server/handler/login.h (3 lines)
M		src/server/handler/login.cpp (4 lines)
M		src/server/handler/logout.h (3 lines)
M		src/server/handler/logout.cpp (4 lines)
M		src/server/handler/modify.h (3 lines)
M		src/server/handler/move.h (9 lines)
M		src/server/handler/move.cpp (34 lines)
M		src/server/handler/relationfetch.h (3 lines)
M		src/server/handler/relationremove.h (3 lines)
M		src/server/handler/relationstore.h (4 lines)
M		src/server/handler/remove.h (13 lines)
M		src/server/handler/resourceselect.h (5 lines)
M		src/server/handler/search.h (11 lines)
M		src/server/handler/search.cpp (25 lines)
M		src/server/handler/searchpersistent.h (3 lines)
M		src/server/handler/searchpersistent.cpp (15 lines)
P		src/server/handler/searchresult.h (3 lines) Copied to autotests/server/inspectablenotificationcollector.h
M		src/server/handler/status.h (3 lines)
M		src/server/handler/status.cpp (14 lines)
M		src/server/handler/store.h (31 lines)
M		src/server/handler/store.cpp (22 lines)
M		src/server/handler/tagappend.h (4 lines)
M		src/server/handler/tagappend.cpp (2 lines)
M		src/server/handler/tagfetch.h (3 lines)
M		src/server/handler/tagfetchhelper.h (5 lines)
M		src/server/handler/tagfetchhelper.cpp (19 lines)
M		src/server/handler/tagremove.h (3 lines)
M		src/server/handler/tagremove.cpp (6 lines)
P		src/server/handler/tagstore.h (4 lines) Copied to src/shared/akremotelog.h
M		src/server/handler/transaction.h (5 lines)
M		src/server/handlerhelper.h (9 lines)
M		src/server/handlerhelper.cpp (76 lines)
M		src/server/intervalcheck.h (2 lines)
M		src/server/intervalcheck.cpp (4 lines)
M		src/server/notificationmanager.h (19 lines)
M		src/server/notificationmanager.cpp (79 lines)
M		src/server/notificationsubscriber.h (14 lines)
M		src/server/notificationsubscriber.cpp (121 lines)
M		src/server/nulltracer.h (2 lines)
M		src/server/preprocessorinstance.h (6 lines)
M		src/server/preprocessorinstance.cpp (4 lines)
M		src/server/search/agentsearchengine.cpp (6 lines)
M		src/server/search/agentsearchinstance.h (2 lines)
M		src/server/search/searchmanager.h (2 lines)
M		src/server/search/searchmanager.cpp (66 lines)
M		src/server/search/searchrequest.cpp (14 lines)
M		src/server/search/searchtaskmanager.cpp (40 lines)
D	M	src/server/storage/CMakeLists.txt (8 lines)
M		src/server/storage/collectionstatistics.cpp (4 lines)
M		src/server/storage/collectiontreecache.h (2 lines)
M		src/server/storage/datastore.h (26 lines)
M		src/server/storage/datastore.cpp (97 lines)
M		src/server/storage/dbconfig.cpp (5 lines)
M		src/server/storage/dbconfigmysql.cpp (31 lines)
M		src/server/storage/dbconfigpostgresql.cpp (7 lines)
M		src/server/storage/dbconfigsqlite.cpp (11 lines)
M		src/server/storage/itemretrievaljob.h (2 lines)
M		src/server/storage/itemretrievalmanager.h (2 lines)
M		src/server/storage/itemretriever.cpp (6 lines)
M		src/server/storage/notificationcollector.h (23 lines)
M		src/server/storage/notificationcollector.cpp (250 lines)
M		src/server/storage/partstreamer.h (11 lines)
M		src/server/storage/partstreamer.cpp (43 lines)
M		src/server/storage/querybuilder.cpp (3 lines)
M		src/server/storagejanitor.h (2 lines)
M		src/server/storagejanitor.cpp (23 lines)
M		src/server/tracer.h (33 lines)
M		src/server/tracer.cpp (35 lines)
M		src/server/tracerinterface.h (7 lines)
M		src/server/utils.cpp (3 lines)
M		src/shared/CMakeLists.txt (1 line)
M		src/shared/akapplication.cpp (2 lines)
M		src/shared/akdebug.cpp (45 lines)
P		src/shared/akremotelog.h (26 lines) Copied from src/server/handler/tagstore.h
A	M	src/shared/akremotelog.cpp (221 lines)
M		src/shared/aktest.h (4 lines)
P		src/shared/vectorhelper.h (21 lines) Copied from src/core/vectorhelper.h
M		src/widgets/CMakeLists.txt (1 line)
M		src/widgets/actionstatemanager.cpp (21 lines)
M		src/widgets/actionstatemanager_p.h (7 lines)
M		src/widgets/agentactionmanager.h (6 lines)
M		src/widgets/agentactionmanager.cpp (4 lines)
M		src/widgets/agentinstancewidget.h (10 lines)
M		src/widgets/agenttypedialog.h (6 lines)
M		src/widgets/agenttypedialog.cpp (3 lines)
M		src/widgets/agenttypewidget.h (6 lines)
M		src/widgets/agenttypewidget.cpp (2 lines)
A	M	src/widgets/autotests/CMakeLists.txt
M		src/widgets/cachepolicypage.h (9 lines)
M		src/widgets/cachepolicypage.cpp (15 lines)
M		src/widgets/collectioncombobox.h (8 lines)
M		src/widgets/collectioncombobox.cpp (2 lines)
M		src/widgets/collectiondialog.h (15 lines)
M		src/widgets/collectiondialog.cpp (18 lines)
M		src/widgets/collectionmaintenancepage.h (2 lines)
M		src/widgets/collectionmaintenancepage.cpp (14 lines)
M		src/widgets/collectionpropertiesdialog.cpp (3 lines)
M		src/widgets/collectionrequester.h (8 lines)
M		src/widgets/collectionrequester.cpp (11 lines)
M		src/widgets/collectionstatisticsdelegate.h (2 lines)
M		src/widgets/collectionstatisticsdelegate.cpp (6 lines)
M		src/widgets/collectionview.h (2 lines)
M		src/widgets/collectionview.cpp (3 lines)
M		src/widgets/conflictresolvedialog.cpp (87 lines)
M		src/widgets/conflictresolvedialog_p.h (7 lines)
M		src/widgets/controlgui.h (1 line)
M		src/widgets/controlgui.cpp (2 lines)
M		src/widgets/entitylistview.h (4 lines)
M		src/widgets/entitylistview.cpp (8 lines)
M		src/widgets/entitytreeview.h (8 lines)
M		src/widgets/entitytreeview.cpp (3 lines)
M		src/widgets/erroroverlay_p.h (2 lines)
M		src/widgets/itemview.h (2 lines)
M		src/widgets/itemview.cpp (5 lines)
M		src/widgets/manageaccountwidget.h (14 lines)
M		src/widgets/manageaccountwidget.cpp (5 lines)
M		src/widgets/progressspinnerdelegate.cpp (4 lines)
M		src/widgets/recentcollectionaction.cpp (4 lines)
M		src/widgets/recentcollectionaction_p.h (2 lines)
M		src/widgets/renamefavoritedialog.h (4 lines)
M		src/widgets/renamefavoritedialog.cpp (2 lines)
M		src/widgets/selftestdialog.cpp (26 lines)
M		src/widgets/standardactionmanager.cpp (72 lines)
M		src/widgets/tageditwidget.h (4 lines)
M		src/widgets/tageditwidget.cpp (10 lines)
M		src/widgets/tagmanagementdialog.h (4 lines)
M		src/widgets/tagmanagementdialog.cpp (3 lines)
M		src/widgets/tagselectiondialog.h (6 lines)
M		src/widgets/tagselectiondialog.cpp (2 lines)
M		src/widgets/tagselectwidget.h (6 lines)
M		src/widgets/tagselectwidget.cpp (5 lines)
M		src/widgets/tagwidget.h (2 lines)
M		src/widgets/tagwidget.cpp (2 lines)
M		src/xml/autotests/CMakeLists.txt (2 lines)
M		src/xml/xmldocument.h (22 lines)
M		src/xml/xmlreader.h (10 lines)
M		src/xml/xmlwritejob.h (5 lines)
M		src/xml/xmlwriter.h (6 lines)
M		templates/akonadiresource/CMakeLists.txt (17 lines)
M		templates/akonadiresource/akonadiresource.kdevtemplate (9 lines)
D	M	templates/akonadiresource/cmake/modules/FindXsltproc.cmake (33 lines)
M		templates/akonadiserializer/CMakeLists.txt (7 lines)
M		templates/akonadiserializer/akonadiserializer.kdevtemplate (9 lines)
M		tests/libs/CMakeLists.txt (3 lines)
M		tests/libs/agenttypewidgettest.cpp (4 lines)
P		tests/libs/conflictresolvedialogtest_gui.cpp (56 lines) Copied from autotests/server/fakeconnection.cpp
P		tests/libs/etm_test_app/mainwindow.h (2 lines) Copied to src/core/favoritecollectionattribute.h

Diff	ID	Base	Description	Created	Lint	Unit
Base			Base
Diff 1	40189	4aca388		Aug 22 2018, 7:42 AM	★	★
Diff 2	40353	36e8681	Use qCDebug	Aug 24 2018, 8:52 AM	★	★
Diff 3	40355	4aca388	pff	Aug 24 2018, 8:53 AM	★	★
Diff 4	40410	6b0cfb2	R165:83b9a43cc4edb79ed2e981d8537080b2ce62a9cf	Aug 25 2018, 11:18 AM	★	★

Commit	Tree	Parents	Author	Summary	Date
80c53f7ceab4	b8a2c1f6e3db	4aca38836ab3	David Faure	ItemSync can be canceled but not defered. Add assert and debug output. (Show More…)	Aug 24 2018, 8:51 AM

ItemSync can be canceled but not defered. Add assert and debug output.ClosedPublicActions

Details

Diff Detail

Large Diff

Showing Only Differences

Revision ContentsChangeset List

Diff 40355

CMakeLists.txt

KF5AkonadiMacros.cmake

akonadi.categories

akonadiwidgetstests_export.h.in

autotests/agentbase2/CMakeLists.txt

autotests/akonadicontrol/CMakeLists.txt

autotests/libs/CMakeLists.txt

autotests/libs/actionstatemanagertest.cpp

autotests/libs/cachepolicytest.h

autotests/libs/cachepolicytest.cpp

autotests/libs/collectionattributetest.cpp

autotests/libs/collectioncreatetest.cpp

autotests/libs/collectionsynctest.cpp

autotests/libs/conflictresolvedialogtest.h

autotests/libs/conflictresolvedialogtest.cpp

autotests/libs/fakeakonadiservercommand.h

autotests/libs/fakeentitycache.h

autotests/libs/inspectablechangerecorder.cpp

autotests/libs/itemmovetest.cpp

autotests/libs/linktest.cpp

autotests/libs/monitornotificationtest.cpp

autotests/libs/newmailnotifierattributetest.h

autotests/libs/newmailnotifierattributetest.cpp

autotests/libs/pop3resourceattributetest.h

autotests/libs/pop3resourceattributetest.cpp

autotests/libs/protocolhelpertest.cpp

autotests/libs/tagselectwidgettest.h

autotests/libs/tagselectwidgettest.cpp

autotests/libs/tagtest.cpp

autotests/libs/testresource/CMakeLists.txt

autotests/libs/testresource/knutresource.h

autotests/libs/testrunner/main.cpp

autotests/libs/testrunner/setup.cpp

autotests/libs/testrunner/shellscript.cpp

autotests/libs/testrunner/testrunner.cpp

autotests/private/akstandarddirstest.cpp

autotests/private/notificationmessagetest.cpp

autotests/private/protocoltest.cpp

autotests/server/CMakeLists.txt

autotests/server/akappendhandlertest.cpp

autotests/server/collectionreferencetest.cpp

autotests/server/collectionstatisticstest.cpp

autotests/server/createhandlertest.cpp

autotests/server/dbconfigtest.cpp

autotests/server/dbinitializer.h

autotests/server/dbinitializer.cpp

autotests/server/dbpopulator.h

autotests/server/dbpopulator.xsl

autotests/server/fakeakonadiserver.h

autotests/server/fakeakonadiserver.cpp

autotests/server/fakeclient.h

autotests/server/fakeclient.cpp

autotests/server/fakeconnection.h

autotests/server/fakeconnection.cpp

autotests/server/fakedatastore.h

autotests/server/fakedatastore.cpp

autotests/server/fakeitemretrievalmanager.cpp

autotests/server/fakesearchmanager.h

autotests/server/fetchhandlertest.cpp

autotests/server/handlertest.cpp

autotests/server/inspectablenotificationcollector.h

autotests/server/inspectablenotificationcollector.cpp

autotests/server/linkhandlertest.cpp

autotests/server/modifyhandlertest.cpp

autotests/server/movehandlertest.cpp

autotests/server/notificationmanagertest.cpp

autotests/server/partstreamertest.cpp

autotests/server/relationhandlertest.cpp

autotests/server/taghandlertest.cpp

cmake/modules/AkonadiMacros.cmake

cmake/modules/FindXsltproc.cmake

metainfo.yaml

src/agentbase/agentbase.h

ItemSync can be canceled but not defered. Add assert and debug output.
ClosedPublic
Actions

Revision Contents
Changeset List