dee

Merge lp://qastaging/~mhr3/dee/add-changesets into lp://qastaging/dee

add-changesets
Merge into trunk

Proposed by Michal Hruby on 2013-09-11

Status:

Merged

Approved by:

Paweł Stołowski on 2013-09-17

Approved revision:

430

Merged at revision:

429

Proposed branch:

lp://qastaging/~mhr3/dee/add-changesets

Merge into:

lp://qastaging/dee

Diff against target:

956 lines (+510/-21)

15 files modified

configure.ac (+1/-1)
debian/changelog (+6/-0)
debian/libdee-1.0-4.symbols (+2/-0)
src/dee-filter-model.c (+55/-0)
src/dee-model.c (+111/-0)
src/dee-model.h (+12/-4)
src/dee-proxy-model.c (+61/-1)
src/dee-sequence-model.c (+3/-3)
src/dee-serializable-model.c (+52/-0)
src/dee-shared-model.c (+5/-2)
tests/test-client-server.c (+15/-0)
tests/test-filter-model.c (+138/-8)
tests/test-model-interactions.c (+15/-0)
tests/test-resource-manager.c (+30/-2)
vapi/dee-1.0.vapi (+4/-0)

To merge this branch:

bzr merge lp://qastaging/~mhr3/dee/add-changesets

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Paweł Stołowski (community)		2013-09-11	Approve on 2013-09-17
PS Jenkins bot (community)	continuous-integration		Approve on 2013-09-16
Review via email: mp+185111@code.qastaging.launchpad.net

Commit message

Add support for changesets to DeeModel API.

Description of the change

Add support for changesets to DeeModel API.

This will allow us to make dee models more compatible with the way Qt models work and therefore enable us to implement more efficient Qt model wrapper for DeeModel.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-09-11:

FAILED: Continuous integration, rev:429
http://jenkins.qa.ubuntu.com/job/dee-ci/10/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dee-saucy-amd64-ci/7
    FAILURE: http://jenkins.qa.ubuntu.com/job/dee-saucy-armhf-ci/7/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dee-saucy-i386-ci/7

Click here to trigger a rebuild:
http://s-jenkins:8080/job/dee-ci/10/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-09-12:

PASSED: Continuous integration, rev:429
http://jenkins.qa.ubuntu.com/job/dee-ci/11/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dee-saucy-amd64-ci/8
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dee-saucy-armhf-ci/8
        deb: http://jenkins.qa.ubuntu.com/job/dee-saucy-armhf-ci/8/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dee-saucy-i386-ci/8

Click here to trigger a rebuild:
http://s-jenkins:8080/job/dee-ci/11/rebuild

review: Approve (continuous-integration)

Revision history for this message

Paweł Stołowski (stolowski) wrote on 2013-09-16:

Great stuff, looks good, some suggestions though:

1) I think it would make sense to implement a rudimentary check for dee_model_begin_changeset / dee_model_end_changeset calls to ensure they're called in a sequence, e.g. by maintaining an internal flag, so that calling end/begin or begin/begin etc. would give a warning.

2) Can you extend the tests to check that "started" signal arrives before "end"?

review: Needs Fixing

lp://qastaging/~mhr3/dee/add-changesets updated on 2013-09-16

430. By Michal Hruby on 2013-09-16: Act on review comments

Revision history for this message

Michal Hruby (mhr3) wrote on 2013-09-16:

> Great stuff, looks good, some suggestions though:
>
> 1) I think it would make sense to implement a rudimentary check for
> dee_model_begin_changeset / dee_model_end_changeset calls to ensure they're
> called in a sequence, e.g. by maintaining an internal flag, so that calling
> end/begin or begin/begin etc. would give a warning.
>
> 2) Can you extend the tests to check that "started" signal arrives before
> "end"?

Done.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-09-16:

PASSED: Continuous integration, rev:430
http://jenkins.qa.ubuntu.com/job/dee-ci/12/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dee-saucy-amd64-ci/9
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dee-saucy-armhf-ci/9
        deb: http://jenkins.qa.ubuntu.com/job/dee-saucy-armhf-ci/9/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dee-saucy-i386-ci/9