lp:~kamstrup/libunity/merge-strategy

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:libunity at revision 103

Michal Hruby (community): Approve on 2012-01-06

Diff: 390 lines (+205/-34)

8 files modified

examples/merge-strategy.py (+27/-0)
src/Makefile.am (+1/-0)
src/unity-lens-merge-strategy.vala (+38/-0)
src/unity-lens-private.vala (+31/-7)
src/unity-lens-tools.vala (+41/-24)
src/unity-lens.vala (+19/-0)
src/unity-scope-proxy-local.vala (+1/-3)
test/vala/test-lens.vala (+47/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #911686: Allow lenses to control how results from scopes are merged

High

Fix Released

Link a bug report

Related blueprints

115. By Mikkel Kamstrup Erlandsen on 2012-01-06

Sync with trunk

114. By Mikkel Kamstrup Erlandsen on 2012-01-06

Add FIXMEs noting that we must remove (not only add the new-) provider/receiver from the synchronizers when models are switched in the scopes. This'll require a bit of refactoring in the synchronizers, so is out of scope for this particular branch.

113. By Mikkel Kamstrup Erlandsen on 2012-01-06

If a scope has models at the ready when we first see it add the models to the synchronizers immediately. In order for this to work the local scope proxy should not emit notifies on the models in an idle call after construction (which is hacky anyway). This fixes the /Unit/LocalScope/MergeStrategy test when run stand alone.

112. By Mikkel Kamstrup Erlandsen on 2012-01-05

Reinstate the old async way of adding scopes in order to unbreak remote scopes.

More assertions in the merge-strategy test + unbreaking the /Unit/Lens/ModelSync because we had overridden the merge-strategy it failed (so we revert to the old one by the end of the test)

111. By Mikkel Kamstrup Erlandsen on 2012-01-05

Simply examples/merge-strategy.py

110. By Mikkel Kamstrup Erlandsen on 2012-01-05

Sync with trunk

109. By Mikkel Kamstrup Erlandsen on 2012-01-03

Add more assertions to the lens merge strategy test

108. By Mikkel Kamstrup Erlandsen on 2012-01-03

Add scope models to the synchronizers immediately when registering the scope

107. By Mikkel Kamstrup Erlandsen on 2012-01-03

Add Python example for overriding the default merge strategy for Unity.Lens

106. By Mikkel Kamstrup Erlandsen on 2012-01-03

Fix truncated row buffer array for the Unity.Tools.ResultsSynchronizer