Merge into release : release-1.3.2 : Code : Libertine Scope

Status:

Merged

Approved by:

Larry Price on 2016-07-29

Approved revision:

56

Merged at revision:

57

Proposed branch:

lp://qastaging/~townsend/libertine-scope/release-1.3.2

Merge into:

lp://qastaging/libertine-scope/release

Diff against target:

494 lines (+203/-57)

15 files modified

CMakeLists.txt (+1/-1)
debian/changelog (+11/-0)
scope/apps/action.cpp (+26/-15)
scope/apps/action.h (+21/-15)
scope/apps/config.h.in (+1/-3)
scope/apps/libertine.cpp (+1/-2)
scope/apps/libertine.h (+1/-1)
scope/apps/query.cpp (+7/-5)
scope/apps/query.h (+2/-2)
scope/apps/scope.cpp (+14/-1)
scope/apps/scope.h (+1/-0)
tests/CMakeLists.txt (+2/-0)
tests/mock_hidden_apps.h (+32/-0)
tests/test_action.cpp (+82/-0)
tests/test_query.cpp (+1/-12)

To merge this branch:

bzr merge lp://qastaging/~townsend/libertine-scope/release-1.3.2

Related bugs:

Bug #1592407: Showing/Hiding apps undoes filters without updating filter UI	Medium	Fix Committed
Bug #1595944: requires a refresh after boot (on unity8 desktop)	Medium	Fix Committed

Link a bug report

Reviewer	Review Type	Date Requested	Status
Larry Price		2016-07-29	Approve on 2016-07-29
Libertine CI Bot	continuous-integration	2016-07-29	Pending
Review via email: mp+301524@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2016-07-29.

Commit message

* Use full scope name in canned queries to properly return from Show/Hide actions.
* Initialize libertine object in Query::run() to allow constructor to execute in time. (LP: #1595944)
* Showing/hiding applications should retain filter state. (LP: #1592407)

Revision history for this message

Libertine CI Bot (libertine-ci-bot) wrote on 2016-07-29: Posted in a previous version of this proposal

#

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/lp-libertine-scope-ci/63/rebuild

PASSED: Continuous integration, rev:56
https://jenkins.canonical.com/libertine/job/lp-libertine-scope-ci/63/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/build/224
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=default/182
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=default/182
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=default/182
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=vivid+overlay,testname=default/182
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=xenial+overlay,testname=default/182
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=yakkety,testname=default/182
    None: https://jenkins.canonical.com/libertine/job/lp-generic-update-mp/170/console
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/227
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=vivid+overlay/212
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=xenial+overlay/212
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=yakkety/212
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/205
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/205/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/205
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/205/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=yakkety/205
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=yakkety/205/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/205
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/205/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/205
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/205/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=yakkety/205
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=yakkety/205/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/lp-libertine-scope-ci/63/rebuild

review: Approve (continuous-integration)

Revision history for this message

Larry Price (larryprice) wrote on 2016-07-29:

#

lgtm

review: Approve

lp://qastaging/~townsend/libertine-scope/release-1.3.2 updated on 2016-08-01

57. By Christopher Townsend on 2016-08-01: Change version to 1.3.2.

Libertine Scope

Merge lp://qastaging/~townsend/libertine-scope/release-1.3.2 into lp://qastaging/libertine-scope/release

Commit message

Description of the change

Preview Diff

Subscribers