Merge lp://staging/~ted/ubuntu-app-launch/instance-compare into lp://staging/ubuntu-app-launch

Proposed by Ted Gould
Status: Superseded
Proposed branch: lp://staging/~ted/ubuntu-app-launch/instance-compare
Merge into: lp://staging/ubuntu-app-launch
Diff against target: 3939 lines (+859/-844)
44 files modified
libubuntu-app-launch/abi-check/CMakeLists.txt (+1/-1)
libubuntu-app-launch/app-store-base.cpp (+8/-8)
libubuntu-app-launch/app-store-base.h (+13/-15)
libubuntu-app-launch/app-store-legacy.cpp (+13/-18)
libubuntu-app-launch/app-store-legacy.h (+8/-15)
libubuntu-app-launch/app-store-libertine.cpp (+12/-17)
libubuntu-app-launch/app-store-libertine.h (+8/-15)
libubuntu-app-launch/app-store-snap.cpp (+18/-23)
libubuntu-app-launch/app-store-snap.h (+8/-15)
libubuntu-app-launch/application-impl-base.cpp (+2/-2)
libubuntu-app-launch/application-impl-base.h (+10/-10)
libubuntu-app-launch/application-impl-legacy.cpp (+8/-8)
libubuntu-app-launch/application-impl-legacy.h (+2/-2)
libubuntu-app-launch/application-impl-libertine.cpp (+8/-8)
libubuntu-app-launch/application-impl-libertine.h (+2/-2)
libubuntu-app-launch/application-impl-snap.cpp (+14/-14)
libubuntu-app-launch/application-impl-snap.h (+7/-7)
libubuntu-app-launch/application-info-desktop.cpp (+3/-3)
libubuntu-app-launch/application-info-desktop.h (+5/-3)
libubuntu-app-launch/application.cpp (+71/-34)
libubuntu-app-launch/application.h (+7/-1)
libubuntu-app-launch/helper-impl.h (+22/-6)
libubuntu-app-launch/helper.cpp (+64/-25)
libubuntu-app-launch/helper.h (+7/-1)
libubuntu-app-launch/info-watcher-zg.cpp (+1/-1)
libubuntu-app-launch/info-watcher-zg.h (+1/-1)
libubuntu-app-launch/info-watcher.cpp (+2/-1)
libubuntu-app-launch/info-watcher.h (+2/-1)
libubuntu-app-launch/jobs-base.cpp (+92/-125)
libubuntu-app-launch/jobs-base.h (+23/-23)
libubuntu-app-launch/jobs-systemd.cpp (+239/-281)
libubuntu-app-launch/jobs-systemd.h (+8/-2)
libubuntu-app-launch/registry-impl.cpp (+31/-7)
libubuntu-app-launch/registry-impl.h (+26/-9)
libubuntu-app-launch/registry.cpp (+9/-32)
libubuntu-app-launch/registry.h (+6/-4)
libubuntu-app-launch/type-tagger.h (+8/-0)
tests/application-info-desktop.cpp (+2/-2)
tests/info-watcher-zg.cpp (+3/-2)
tests/jobs-base-test.cpp (+2/-2)
tests/jobs-systemd.cpp (+14/-12)
tests/libual-cpp-test.cc (+40/-49)
tests/list-apps.cpp (+6/-6)
tests/registry-mock.h (+23/-31)
To merge this branch: bzr merge lp://staging/~ted/ubuntu-app-launch/instance-compare
Reviewer Review Type Date Requested Status
unity-api-1-bot continuous-integration Needs Fixing
Indicator Applet Developers Pending
Review via email: mp+321492@code.staging.launchpad.net

This proposal has been superseded by a proposal from 2017-03-31.

Commit message

Provide equality operators for Application and Application::Instance objects.

To post a comment you must log in.
Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

FAILED: Continuous integration, rev:310
https://jenkins.canonical.com/unity-api-1/job/lp-ubuntu-app-launch-ci/286/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1896/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1903
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1685/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1685
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1685/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1685/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1685
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1685/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1685/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1685
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1685/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-ubuntu-app-launch-ci/286/rebuild

review: Needs Fixing (continuous-integration)
311. By Ted Gould

Comparison operators for helpers too

312. By Ted Gould

Disable ABI check for now

313. By Ted Gould

Try and avoid conflicts

314. By Ted Gould

Merge the registry cleanup branch

315. By Ted Gould

Reenable ABI check

Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

FAILED: Continuous integration, rev:312
https://jenkins.canonical.com/unity-api-1/job/lp-ubuntu-app-launch-ci/287/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1898/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1905
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1687
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1687/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1687
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1687/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1687/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1687
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1687/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1687
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1687/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1687
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1687/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-ubuntu-app-launch-ci/287/rebuild

review: Needs Fixing (continuous-integration)
316. By Ted Gould

App equality test

317. By Ted Gould

Merge registry cleanup changes

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches