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

[Michal Hruby]

Add support for changesets to DeeModel API.

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.

[PS Jenkins bot (ps-jenkins)]

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)

[PS Jenkins bot (ps-jenkins)]

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)

[Paweł Stołowski (stolowski)]

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:~mhr3/dee/add-changesets]

430. By Michal Hruby on 2013-09-16

Act on review comments

[Michal Hruby (mhr3)]

> 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.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Paweł Stołowski (stolowski)]

Yay, awesome! +1

review: Approve

=== modified file 'configure.ac'
--- configure.ac	2013-07-19 10:13:05 +0000
+++ configure.ac	2013-09-16 18:51:54 +0000
@@ -5,7 +5,7 @@
 # Don't forget to check also GIR_VERSION
 m4_define([dee_major], [1])
 m4_define([dee_minor], [2])
-m4_define([dee_micro], [6])
+m4_define([dee_micro], [7])
 m4_define([dee_api],
           [dee_major.dee_minor])
 m4_define([dee_version],

=== modified file 'debian/changelog'
--- debian/changelog	2013-09-04 02:32:11 +0000
+++ debian/changelog	2013-09-16 18:51:54 +0000
@@ -1,3 +1,9 @@
+dee (1.2.7-0ubuntu1) UNRELEASED; urgency=low
+
+  * Added begin and end changeset API.
+
+ -- Michal Hruby <[e-mail]>  Tue, 10 Sep 2013 11:59:21 +0100
+
 dee (1.2.6+13.10.20130904-0ubuntu1) saucy; urgency=low
 
   [ Michal Hruby ]

=== modified file 'debian/libdee-1.0-4.symbols'
--- debian/libdee-1.0-4.symbols	2013-05-31 04:30:18 +0000
+++ debian/libdee-1.0-4.symbols	2013-09-16 18:51:54 +0000
@@ -54,12 +54,14 @@
  dee_index_lookup_one@Base 0.5.16
  dee_model_append@Base 0.5.2
  dee_model_append_row@Base 0.5.2
+ dee_model_begin_changeset@Base 0replaceme
  dee_model_build_named_row@Base 1.2.0daily12.12.05
  dee_model_build_named_row_sunk@Base 1.2.0daily12.12.05
  dee_model_build_named_row_valist@Base 1.2.0daily12.12.05
  dee_model_build_row@Base 0.5.2
  dee_model_clear@Base 0.5.2
  dee_model_clear_tag@Base 0.5.12
+ dee_model_end_changeset@Base 0replaceme
  dee_model_find_row_sorted@Base 1.0.0
  dee_model_find_row_sorted_with_sizes@Base 1.0.14
  dee_model_find_sorted@Base 1.0.0

=== modified file 'src/dee-filter-model.c'
--- src/dee-filter-model.c	2013-01-04 17:53:43 +0000
+++ src/dee-filter-model.c	2013-09-16 18:51:54 +0000
@@ -97,6 +97,8 @@
   gulong      on_orig_row_added_id;
   gulong      on_orig_row_removed_id;
   gulong      on_orig_row_changed_id;
+  gulong      on_orig_changeset_started_id;
+  gulong      on_orig_changeset_finished_id;
 };
 
 enum
@@ -162,6 +164,12 @@
 static void        on_orig_model_row_changed     (DeeFilterModel *self,
                                                   DeeModelIter   *iter);
 
+static void        on_orig_model_changeset_started  (DeeFilterModel *self,
+                                                     DeeModel       *iter);
+
+static void        on_orig_model_changeset_finished (DeeFilterModel *self,
+                                                     DeeModel       *iter);
+
 /* GObject stuff */
 static void
 dee_filter_model_finalize (GObject *object)
@@ -192,10 +200,16 @@
     g_signal_handler_disconnect (priv->orig_model, priv->on_orig_row_removed_id);
   if (priv->on_orig_row_changed_id != 0)
     g_signal_handler_disconnect (priv->orig_model, priv->on_orig_row_changed_id);
+  if (priv->on_orig_changeset_started_id != 0)
+    g_signal_handler_disconnect (priv->orig_model, priv->on_orig_changeset_started_id);
+  if (priv->on_orig_changeset_finished_id != 0)
+    g_signal_handler_disconnect (priv->orig_model, priv->on_orig_changeset_finished_id);
 
   priv->on_orig_row_added_id = 0;
   priv->on_orig_row_removed_id = 0;
   priv->on_orig_row_changed_id = 0;
+  priv->on_orig_changeset_started_id = 0;
+  priv->on_orig_changeset_finished_id = 0;
 
   if (priv->orig_model)
     {
@@ -242,6 +256,16 @@
     g_signal_connect_swapped (priv->orig_model, "row-changed",
                               G_CALLBACK (on_orig_model_row_changed), object);
 
+  priv->on_orig_changeset_started_id =
+    g_signal_connect_swapped (priv->orig_model, "changeset-started",
+                              G_CALLBACK (on_orig_model_changeset_started),
+                              object);
+
+  priv->on_orig_changeset_finished_id =
+    g_signal_connect_swapped (priv->orig_model, "changeset-finished",
+                              G_CALLBACK (on_orig_model_changeset_finished),
+                              object);
+
   if (G_OBJECT_CLASS (dee_filter_model_parent_class)->constructed)
     G_OBJECT_CLASS (dee_filter_model_parent_class)->constructed (object);
 }
@@ -327,6 +351,8 @@
   priv->on_orig_row_added_id = 0;
   priv->on_orig_row_removed_id = 0;
   priv->on_orig_row_changed_id = 0;
+  priv->on_orig_changeset_started_id = 0;
+  priv->on_orig_changeset_finished_id = 0;
 }
 
 static void
@@ -681,6 +707,35 @@
     }
 }
 
+static void
+on_orig_model_changeset_started (DeeFilterModel *self,
+                                 DeeModel *model)
+{
+  DeeFilterModelPrivate *priv;
+  
+  priv = self->priv;
+  
+  if (priv->ignore_orig_signals)
+    return;
+
+  /* this can end up being an empty changeset, but that's ok */
+  g_signal_emit_by_name (self, "changeset-started");
+}
+
+static void
+on_orig_model_changeset_finished (DeeFilterModel *self,
+                                  DeeModel *model)
+{
+  DeeFilterModelPrivate *priv;
+  
+  priv = self->priv;
+  
+  if (priv->ignore_orig_signals)
+    return;
+  
+  g_signal_emit_by_name (self, "changeset-finished");
+}
+
 /*
  * DeeModel Interface Implementation
  */

=== modified file 'src/dee-model.c'
--- src/dee-model.c	2013-03-08 15:03:27 +0000
+++ src/dee-model.c	2013-09-16 18:51:54 +0000
@@ -98,6 +98,8 @@
   DEE_MODEL_SIGNAL_ROW_ADDED,
   DEE_MODEL_SIGNAL_ROW_REMOVED,
   DEE_MODEL_SIGNAL_ROW_CHANGED,
+  DEE_MODEL_SIGNAL_CHANGESET_STARTED,
+  DEE_MODEL_SIGNAL_CHANGESET_FINISHED,
 
   DEE_MODEL_LAST_SIGNAL
 };
@@ -229,6 +231,44 @@
                   g_cclosure_marshal_VOID__BOXED,
                   G_TYPE_NONE, 1,
                   DEE_TYPE_MODEL_ITER);
+
+  /**
+   * DeeModel::changeset-started
+   * @self: the #DeeModel on which the signal is emitted
+   *
+   * Connect to this signal to be notified when a changeset that can contain
+   * multiple row additions / changes / removals is about to be committed
+   * to the model.
+   * Note that not all model implementations use the changeset approach and
+   * you might still get a row change signal outside of changeset-started and
+   * changeset-finished signals. It also isn't guaranteed that a changeset
+   * would always be non-empty.
+   */
+  dee_model_signals[DEE_MODEL_SIGNAL_CHANGESET_STARTED] =
+    g_signal_new ("changeset-started",
+                  DEE_TYPE_MODEL,
+                  G_SIGNAL_RUN_LAST,
+                  G_STRUCT_OFFSET (DeeModelIface, changeset_started),
+                  NULL, NULL,
+                  g_cclosure_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  /**
+   * DeeModel::changeset-finished
+   * @self: the #DeeModel on which the signal is emitted
+   *
+   * Connect to this signal to be notified when a changeset that can contain
+   * multiple row additions / changes / removals has been committed
+   * to the model.
+   */
+  dee_model_signals[DEE_MODEL_SIGNAL_CHANGESET_FINISHED] =
+    g_signal_new ("changeset-finished",
+                  DEE_TYPE_MODEL,
+                  G_SIGNAL_RUN_LAST,
+                  G_STRUCT_OFFSET (DeeModelIface, changeset_finished),
+                  NULL, NULL,
+                  g_cclosure_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
 }
 
 /**
@@ -646,6 +686,77 @@
   return (* iface->get_n_rows) (self);
 }
 
+/**
+ * dee_model_begin_changeset:
+ * @self: a #DeeModel
+ *
+ * Notify listeners that the model is about to be changed, which means that
+ * multiple row additions / changes / removals will follow.
+ * The default implementation of this method will emit
+ * the ::changeset-started signal.
+ *
+ * It is not stricly necessary to enclose every change to a model 
+ * in a dee_model_begin_changeset() and dee_model_end_changeset() calls, but
+ * doing so is highly recommended and allows implementing various optimizations.
+ *
+ * The usual way to perform multiple changes to a model is as follows:
+ *
+ * <programlisting>
+ * void update_model (DeeModel *model)
+ * {
+ *   GVariant **added_row_data1 = ...;
+ *   GVariant **added_row_data2 = ...;
+ *
+ *   dee_model_begin_changeset (model);
+ *
+ *   dee_model_remove (model, dee_model_get_first_iter (model));
+ *   dee_model_append_row (model, added_row_data1);
+ *   dee_model_append_row (model, added_row_data2);
+ *
+ *   dee_model_end_changeset (model);
+ * }
+ * </programlisting>
+ */
+void
+dee_model_begin_changeset (DeeModel *self)
+{
+  DeeModelIface *iface;
+
+  g_return_if_fail (DEE_IS_MODEL (self));
+
+  iface = DEE_MODEL_GET_IFACE (self);
+
+  if (iface->begin_changeset)
+    (* iface->begin_changeset) (self);
+  else
+    g_signal_emit (self, dee_model_signals[DEE_MODEL_SIGNAL_CHANGESET_STARTED], 0);
+}
+
+/**
+ * dee_model_end_changeset:
+ * @self: a #DeeModel
+ *
+ * Notify listeners that all changes have been committed to the model.
+ * The default implementation of this method will emit
+ * the ::changeset-finished signal.
+ *
+ * See also dee_model_begin_changeset().
+ */
+void
+dee_model_end_changeset (DeeModel *self)
+{
+  DeeModelIface *iface;
+
+  g_return_if_fail (DEE_IS_MODEL (self));
+
+  iface = DEE_MODEL_GET_IFACE (self);
+
+  if (iface->end_changeset)
+    (* iface->end_changeset) (self);
+  else
+    g_signal_emit (self, dee_model_signals[DEE_MODEL_SIGNAL_CHANGESET_FINISHED], 0);
+}
+
 static GVariant*
 collect_variant (const gchar* col_schema, va_list *args)
 {

=== modified file 'src/dee-model.h'
--- src/dee-model.h	2012-11-27 17:49:57 +0000
+++ src/dee-model.h	2013-09-16 18:51:54 +0000
@@ -266,14 +266,18 @@
                                      DeeModelIter   *iter,
                                      GVariant      **out_row_members);
 
+  void           (*begin_changeset)    (DeeModel    *self);
+
+  void           (*end_changeset)      (DeeModel    *self);
+
+  void           (*changeset_started)  (DeeModel    *self);
+
+  void           (*changeset_finished) (DeeModel    *self);
+
   /*< private >*/
   void     (*_dee_model_1) (void);
   void     (*_dee_model_2) (void);
   void     (*_dee_model_3) (void);
-  void     (*_dee_model_4) (void);
-  void     (*_dee_model_5) (void);
-  void     (*_dee_model_6) (void);
-  void     (*_dee_model_7) (void);
 };
 
 GType           dee_model_iter_get_type         (void);
@@ -494,6 +498,10 @@
                                            DeeModelIter   *iter,
                                            DeeModelTag    *tag);
 
+void            dee_model_begin_changeset (DeeModel       *self);
+
+void            dee_model_end_changeset   (DeeModel       *self);
+
 GVariant**      dee_model_build_row       (DeeModel  *self,
                                            GVariant **out_row_members,
                                            ...);

=== modified file 'src/dee-proxy-model.c'
--- src/dee-proxy-model.c	2013-01-04 17:53:43 +0000
+++ src/dee-proxy-model.c	2013-09-16 18:51:54 +0000
@@ -81,6 +81,8 @@
   gulong     row_added_handler;
   gulong     row_removed_handler;
   gulong     row_changed_handler;
+  gulong     changeset_started_handler;
+  gulong     changeset_finished_handler;
 };
 
 #define DEE_PROXY_MODEL_BACK_END(model) (DEE_PROXY_MODEL(model)->priv->back_end)
@@ -233,6 +235,10 @@
                                                       DeeModelTag    *tag,
                                                       gpointer        value);
 
+static void           dee_proxy_model_begin_changeset (DeeModel *self);
+
+static void           dee_proxy_model_end_changeset   (DeeModel *self);
+
 /*
  * Callbacks for relaying signals from the back end model
  */
@@ -245,6 +251,12 @@
 static void           on_back_end_row_changed        (DeeProxyModel *self,
                                                       DeeModelIter  *iter);
 
+static void           on_back_end_changeset_started  (DeeProxyModel *self,
+                                                      DeeModel *model);
+
+static void           on_back_end_changeset_finished (DeeProxyModel *self,
+                                                      DeeModel *model);
+
 /*
  * Overrides for DeeSerializableModel
  */
@@ -270,6 +282,10 @@
         g_signal_handler_disconnect (priv->back_end, priv->row_removed_handler);
       if (priv->row_changed_handler != 0)
         g_signal_handler_disconnect (priv->back_end, priv->row_changed_handler);
+      if (priv->changeset_started_handler != 0)
+        g_signal_handler_disconnect (priv->back_end, priv->changeset_started_handler);
+      if (priv->changeset_finished_handler != 0)
+        g_signal_handler_disconnect (priv->back_end, priv->changeset_finished_handler);
 
       g_object_unref (priv->back_end);
     }
@@ -302,6 +318,16 @@
       priv->row_changed_handler =
         g_signal_connect_swapped (priv->back_end, "row-changed",
                                   G_CALLBACK (on_back_end_row_changed), object);
+
+      priv->changeset_started_handler =
+        g_signal_connect_swapped (priv->back_end, "changeset-started",
+                                  G_CALLBACK (on_back_end_changeset_started),
+                                  object);
+
+      priv->changeset_finished_handler =
+        g_signal_connect_swapped (priv->back_end, "changeset-finished",
+                                  G_CALLBACK (on_back_end_changeset_finished),
+                                  object);
     }
   
   /* GObjectClass has NULL 'constructed' member, but we add this check for
@@ -407,7 +433,7 @@
    * from the back end model.
    * You will most likely want to set this property to false
    * if the implementation manipulates with the rows in the model and keep
-   * track of seqnums.
+   * track of seqnums yourself.
    **/
   pspec = g_param_spec_boolean ("inherit-seqnums", "Inherit seqnums",
                                 "Whether or not to inherit seqnums",
@@ -462,6 +488,8 @@
   iface->register_tag          = dee_proxy_model_register_tag;
   iface->get_tag               = dee_proxy_model_get_tag;
   iface->set_tag               = dee_proxy_model_set_tag;
+  iface->begin_changeset       = dee_proxy_model_begin_changeset;
+  iface->end_changeset         = dee_proxy_model_end_changeset;
 
   iface->register_vardict_schema = dee_proxy_model_register_vardict_schema;
   iface->get_vardict_schema      = dee_proxy_model_get_vardict_schema;
@@ -479,6 +507,8 @@
   priv->row_added_handler = 0;
   priv->row_removed_handler = 0;
   priv->row_changed_handler = 0;
+  priv->changeset_started_handler = 0;
+  priv->changeset_finished_handler = 0;
 }
 
 /*
@@ -891,6 +921,22 @@
   return dee_model_set_tag (DEE_PROXY_MODEL_BACK_END (self), iter, tag, value);
 }
 
+static void
+dee_proxy_model_begin_changeset (DeeModel *self)
+{
+  g_return_if_fail (DEE_IS_PROXY_MODEL (self));
+
+  dee_model_begin_changeset (DEE_PROXY_MODEL_BACK_END (self));
+}
+
+static void
+dee_proxy_model_end_changeset (DeeModel *self)
+{
+  g_return_if_fail (DEE_IS_PROXY_MODEL (self));
+
+  dee_model_end_changeset (DEE_PROXY_MODEL_BACK_END (self));
+}
+
 /*
  * Relay signals from back end
  */
@@ -916,6 +962,20 @@
   g_signal_emit_by_name (self, "row-changed", iter);
 }
 
+static void
+on_back_end_changeset_started (DeeProxyModel *self,
+                               DeeModel *model)
+{
+  g_signal_emit_by_name (self, "changeset-started");
+}
+
+static void
+on_back_end_changeset_finished (DeeProxyModel *self,
+                                DeeModel *model)
+{
+  g_signal_emit_by_name (self, "changeset-finished");
+}
+
 /*
  * Overrides for DeeSerializableModel
  */

=== modified file 'src/dee-sequence-model.c'
--- src/dee-sequence-model.c	2012-02-28 00:34:40 +0000
+++ src/dee-sequence-model.c	2013-09-16 18:51:54 +0000
@@ -280,9 +280,9 @@
   obj_class->get_property = dee_sequence_model_get_property;
 
   /* Find signal ids for the model modification signals */
-  sigid_row_added = g_signal_lookup ("row-added", DEE_TYPE_SEQUENCE_MODEL);
-  sigid_row_removed = g_signal_lookup ("row-removed", DEE_TYPE_SEQUENCE_MODEL);
-  sigid_row_changed = g_signal_lookup ("row-changed", DEE_TYPE_SEQUENCE_MODEL);
+  sigid_row_added = g_signal_lookup ("row-added", DEE_TYPE_MODEL);
+  sigid_row_removed = g_signal_lookup ("row-removed", DEE_TYPE_MODEL);
+  sigid_row_changed = g_signal_lookup ("row-changed", DEE_TYPE_MODEL);
 
   /* Add private data */
   g_type_class_add_private (obj_class, sizeof (DeeSequenceModelPrivate));

=== modified file 'src/dee-serializable-model.c'
--- src/dee-serializable-model.c	2013-07-21 22:29:56 +0000
+++ src/dee-serializable-model.c	2013-09-16 18:51:54 +0000
@@ -77,6 +77,7 @@
   gchar     **column_names;   // NULL terminated
   guint32    *column_name_hashes;
   GHashTable *field_schemas;
+  gboolean    inside_changeset;
 };
 
 typedef struct _FieldSchemaInfo FieldSchemaInfo;
@@ -238,6 +239,13 @@
 static gboolean       dee_serializable_model_is_last        (DeeModel     *self,
                                                          DeeModelIter *iter);
 
+static void           dee_serializable_model_begin_changeset (DeeModel    *self);
+
+static void           dee_serializable_model_end_changeset   (DeeModel    *self);
+
+static guint sigid_changeset_started = 0;
+static guint sigid_changeset_finished = 0;
+
 /* FieldSchemaInfo methods */
 static FieldSchemaInfo*
 field_schema_info_new (const gchar *schema, guint column)
@@ -352,6 +360,9 @@
   klass->set_seqnum = dee_serializable_model_set_seqnum_real;
   klass->inc_seqnum = dee_serializable_model_inc_seqnum_real;
 
+  sigid_changeset_started = g_signal_lookup ("changeset-started", DEE_TYPE_MODEL);
+  sigid_changeset_finished = g_signal_lookup ("changeset-finished", DEE_TYPE_MODEL);
+
   /* Add private data */
   g_type_class_add_private (obj_class, sizeof (DeeSerializableModelPrivate));
 }
@@ -1328,6 +1339,44 @@
     }
 }
 
+static void
+dee_serializable_model_begin_changeset (DeeModel *self)
+{
+  DeeSerializableModelPrivate  *priv;
+  
+  priv = DEE_SERIALIZABLE_MODEL (self)->priv;
+
+  if (!priv->inside_changeset)
+    {
+      priv->inside_changeset = TRUE;
+      g_signal_emit (self, sigid_changeset_started, 0);
+    }
+  else
+    {
+      g_warning ("Ignored call to dee_model_begin_changeset, finish "
+                 "the current changeset using dee_model_end_changeset first");
+    }
+}
+
+static void
+dee_serializable_model_end_changeset (DeeModel *self)
+{
+  DeeSerializableModelPrivate  *priv;
+  
+  priv = DEE_SERIALIZABLE_MODEL (self)->priv;
+
+  if (priv->inside_changeset)
+    {
+      priv->inside_changeset = FALSE;
+      g_signal_emit (self, sigid_changeset_finished, 0);
+    }
+  else
+    {
+      g_warning ("Ignored call to dee_model_end_changeset, "
+                 "dee_model_begin_changeset has to be called first");
+    }
+}
+
 static DeeModelTag*
 dee_serializable_model_register_tag    (DeeModel       *self,
                                         GDestroyNotify  tag_destroy)
@@ -1635,6 +1684,9 @@
     dee_serializable_model_register_vardict_schema;
   iface->get_vardict_schema =
     dee_serializable_model_get_vardict_schema;
+
+  iface->begin_changeset       = dee_serializable_model_begin_changeset;
+  iface->end_changeset         = dee_serializable_model_end_changeset;
 }
 
 static void

=== modified file 'src/dee-shared-model.c'
--- src/dee-shared-model.c	2013-07-21 22:29:56 +0000
+++ src/dee-shared-model.c	2013-09-16 18:51:54 +0000
@@ -1477,6 +1477,7 @@
   trace_object (self, "Applying transaction of %i rows", n_rows);
 
   /* Phew. Finally. We're ready to merge the changes */
+  g_signal_emit_by_name (self, "changeset-started");
   g_signal_emit (self, _signals[BEGIN_TRANSACTION], 0, seqnum_before, seqnum_after);
   priv->suppress_remote_signals = TRUE;
   for (i = 0; i < n_rows; i++) /* Begin outer loop */
@@ -1513,8 +1514,9 @@
           g_critical ("Commit from %s contains rows of illegal length. "
                       "The model may have been left in a dirty state",
                       sender_name);
-          // FIXME: cleanup
-          return;
+          /* cleanup */
+          g_variant_unref (row);
+          continue;
         }
 
       /* Read the row cells into our stack allocated row buffer.
@@ -1570,6 +1572,7 @@
   priv->last_committed_seqnum = seqnum_after;
 
   g_signal_emit (self, _signals[END_TRANSACTION], 0, seqnum_before, seqnum_after);
+  g_signal_emit_by_name (self, "changeset-finished");
 }
 
 static void

=== modified file 'tests/test-client-server.c'
--- tests/test-client-server.c	2012-02-28 10:56:27 +0000
+++ tests/test-client-server.c	2013-09-16 18:51:54 +0000
@@ -820,6 +820,12 @@
 }
 
 static void
+changeset_signal (DeeModel *model, gboolean *value)
+{
+    *value = TRUE;
+}
+
+static void
 test_remote_append (Fixture *fix, gconstpointer data)
 {
   if (gtx_wait_for_signal (G_OBJECT (fix->model), TIMEOUT, "notify::synchronized", NULL))
@@ -829,6 +835,13 @@
   g_assert (dee_shared_model_is_leader (DEE_SHARED_MODEL (fix->model)));
   g_assert_cmpuint (dee_model_get_n_rows (fix->model), ==, 0);
 
+  gboolean got_changeset_start = FALSE;
+  gboolean got_changeset_finish = FALSE;
+  g_signal_connect (fix->model, "changeset-started",
+                    G_CALLBACK (changeset_signal), &got_changeset_start);
+  g_signal_connect (fix->model, "changeset-finished",
+                    G_CALLBACK (changeset_signal), &got_changeset_finish);
+
   if (gtx_wait_for_command (TESTDIR,
                             MODEL_HELPER (append1, MODEL_NAME),
                             2000))
@@ -838,6 +851,8 @@
 
   /* There should be a new row in the model */
   g_assert_cmpuint (dee_model_get_n_rows (fix->model), ==, 1);
+  g_assert (got_changeset_start);
+  g_assert (got_changeset_finish);
 }
 
 static void

=== modified file 'tests/test-filter-model.c'
--- tests/test-filter-model.c	2013-05-31 12:38:11 +0000
+++ tests/test-filter-model.c	2013-09-16 18:51:54 +0000
@@ -28,8 +28,16 @@
 
 } FilterFixture;
 
-static void setup    (FilterFixture *fix, gconstpointer data);
-static void teardown (FilterFixture *fix, gconstpointer data);
+typedef struct
+{
+  gint first;
+  gint second;
+
+} TwoIntsTuple;
+
+static void setup       (FilterFixture *fix, gconstpointer data);
+static void setup_empty (FilterFixture *fix, gconstpointer data);
+static void teardown    (FilterFixture *fix, gconstpointer data);
 
 static void test_empty_orig                    (FilterFixture *fix,
                                                 gconstpointer  data);
@@ -54,6 +62,9 @@
 static void test_regex                         (FilterFixture *fix,
                                                 gconstpointer  data);
 
+static void test_changesets                    (FilterFixture *fix,
+                                                gconstpointer  data);
+
 void
 test_filter_model_create_suite (void)
 {
@@ -78,22 +89,35 @@
               setup, test_any, teardown);
   g_test_add (DOMAIN"/Regex", FilterFixture, 0,
               setup, test_regex, teardown);
+  g_test_add (DOMAIN"/Changesets", FilterFixture, 0,
+              setup_empty, test_changesets, teardown);
 }
 
 static void
-setup (FilterFixture *fix, gconstpointer data)
+setup_empty (FilterFixture *fix, gconstpointer data)
 {
   fix->model = dee_sequence_model_new ();
   dee_model_set_schema (fix->model, "i", "s", NULL);
   
-  dee_model_append (fix->model, 0, "Zero");
-  dee_model_append (fix->model, 1, "One");
-  dee_model_append (fix->model, 2, "Two");
-
   g_assert (DEE_IS_SEQUENCE_MODEL (fix->model));
 }
 
 static void
+add_3rows(DeeModel *model)
+{
+  dee_model_append (model, 0, "Zero");
+  dee_model_append (model, 1, "One");
+  dee_model_append (model, 2, "Two");
+}
+
+static void
+setup (FilterFixture *fix, gconstpointer data)
+{
+  setup_empty (fix, data);
+  add_3rows (fix->model);
+}
+
+static void
 teardown (FilterFixture *fix, gconstpointer data)
 {
   g_object_unref (fix->model);
@@ -282,7 +306,28 @@
   g_assert_cmpint (27, ==, dee_model_get_int32 (fix->model, iter, 0));
   g_assert_cmpstr ("TwentySeven", ==, dee_model_get_string (m, iter, 1));
   g_assert_cmpstr ("TwentySeven", ==, dee_model_get_string (fix->model, iter, 1));
-  
+
+  /* And append two more rows to the filtered model, to ensure the order */  
+  dee_model_prepend (m, -1, "MinusOne");
+  dee_model_append (m, 39, "ThirtyNine");
+  g_assert_cmpint (3, ==, filter_add_count);
+  g_assert_cmpint (5, ==, orig_add_count);
+  g_assert_cmpint (3, ==, dee_model_get_n_rows (m));
+  g_assert_cmpint (8, ==, dee_model_get_n_rows (fix->model));
+  g_assert_cmpuint (3, ==, dee_serializable_model_get_seqnum (m));
+  iter = dee_model_prev (m, dee_model_get_last_iter (m));
+  g_assert_cmpint (39, ==, dee_model_get_int32 (m, iter, 0));
+  g_assert_cmpstr ("ThirtyNine", ==, dee_model_get_string (m, iter, 1));
+  iter = dee_model_prev (m, iter);
+  g_assert_cmpint (27, ==, dee_model_get_int32 (m, iter, 0));
+  g_assert_cmpstr ("TwentySeven", ==, dee_model_get_string (m, iter, 1));
+  iter = dee_model_prev (m, iter);
+  g_assert_cmpint (-1, ==, dee_model_get_int32 (m, iter, 0));
+  g_assert_cmpstr ("MinusOne", ==, dee_model_get_string (m, iter, 1));
+  iter = dee_model_prev (fix->model, dee_model_get_last_iter (fix->model));
+  g_assert_cmpint (39, ==, dee_model_get_int32 (fix->model, iter, 0));
+  g_assert_cmpstr ("ThirtyNine", ==, dee_model_get_string (fix->model, iter, 1));
+
   g_object_unref (m);
 }
 
@@ -616,3 +661,88 @@
   _test_orig_ordering (fix, &filter);
   g_regex_unref (regex);
 }
+
+static void
+increment_first (TwoIntsTuple *tuple)
+{
+  tuple->first++;
+  // first always has to be incremented before second
+  g_assert (tuple->first > tuple->second);
+}
+
+static void
+increment_second (TwoIntsTuple *tuple)
+{
+  tuple->second++;
+  // second needs to be incremented after first
+  g_assert (tuple->second == tuple->first);
+}
+
+static void
+test_changesets (FilterFixture *fix, gconstpointer data)
+{
+  GRegex       *regex;
+  DeeFilter     filter;
+  DeeModel     *filter_m1;
+  DeeModel     *filter_m2;
+  DeeModel     *filter_m3;
+
+  regex = g_regex_new ("^..[eo]", 0, 0, NULL);
+  dee_filter_new_regex (1, regex, &filter);
+  filter_m1 = dee_filter_model_new (fix->model, &filter);
+  g_regex_unref (regex);
+
+  regex = g_regex_new ("^Z", 0, 0, NULL);
+  dee_filter_new_regex (1, regex, &filter);
+  filter_m2 = dee_filter_model_new (fix->model, &filter);
+  g_regex_unref (regex);
+
+  regex = g_regex_new ("^X", 0, 0, NULL);
+  dee_filter_new_regex (1, regex, &filter);
+  filter_m3 = dee_filter_model_new (fix->model, &filter);
+  g_regex_unref (regex);
+
+  g_assert_cmpuint (0, ==, dee_model_get_n_rows (fix->model));
+  g_assert_cmpuint (0, ==, dee_model_get_n_rows (filter_m1));
+  g_assert_cmpuint (0, ==, dee_model_get_n_rows (filter_m2));
+  g_assert_cmpuint (0, ==, dee_model_get_n_rows (filter_m3));
+
+  TwoIntsTuple tuple_m0 = { 0, 0 };
+  TwoIntsTuple tuple_m1 = { 0, 0 };
+  TwoIntsTuple tuple_m2 = { 0, 0 };
+  TwoIntsTuple tuple_m3 = { 0, 0 };
+
+  g_signal_connect_swapped (fix->model, "changeset-started",
+                            G_CALLBACK (increment_first), &tuple_m0);
+  g_signal_connect_swapped (fix->model, "changeset-finished",
+                            G_CALLBACK (increment_second), &tuple_m0);
+  g_signal_connect_swapped (filter_m1, "changeset-started",
+                            G_CALLBACK (increment_first), &tuple_m1);
+  g_signal_connect_swapped (filter_m1, "changeset-finished",
+                            G_CALLBACK (increment_second), &tuple_m1);
+  g_signal_connect_swapped (filter_m2, "changeset-started",
+                            G_CALLBACK (increment_first), &tuple_m2);
+  g_signal_connect_swapped (filter_m2, "changeset-finished",
+                            G_CALLBACK (increment_second), &tuple_m2);
+  g_signal_connect_swapped (filter_m3, "changeset-started",
+                            G_CALLBACK (increment_first), &tuple_m3);
+  g_signal_connect_swapped (filter_m3, "changeset-finished",
+                            G_CALLBACK (increment_second), &tuple_m3);
+
+  dee_model_begin_changeset (fix->model);
+  add_3rows (fix->model);
+  dee_model_end_changeset (fix->model);
+
+  g_assert_cmpuint (3, ==, dee_model_get_n_rows (fix->model));
+  g_assert_cmpuint (2, ==, dee_model_get_n_rows (filter_m1));
+  g_assert_cmpuint (1, ==, dee_model_get_n_rows (filter_m2));
+  g_assert_cmpuint (0, ==, dee_model_get_n_rows (filter_m3));
+  g_assert_cmpint (tuple_m0.first, ==, 1);
+  g_assert_cmpint (tuple_m0.second, ==, 1);
+  g_assert_cmpint (tuple_m1.first, ==, 1);
+  g_assert_cmpint (tuple_m1.second, ==, 1);
+  g_assert_cmpint (tuple_m2.first, ==, 1);
+  g_assert_cmpint (tuple_m2.second, ==, 1);
+  g_assert_cmpint (tuple_m3.first, ==, 1);
+  g_assert_cmpint (tuple_m3.second, ==, 1);
+}

=== modified file 'tests/test-model-interactions.c'
--- tests/test-model-interactions.c	2013-07-16 08:32:59 +0000
+++ tests/test-model-interactions.c	2013-09-16 18:51:54 +0000
@@ -699,6 +699,12 @@
 }
 
 static void
+changeset_signal (DeeModel *model, gboolean *value)
+{
+  *value = TRUE;
+}
+
+static void
 test_remote_append (Fixture *fix, gconstpointer data)
 {
   if (gtx_wait_for_signal (G_OBJECT (fix->model), TIMEOUT, "notify::synchronized", NULL))
@@ -708,6 +714,13 @@
   g_assert (dee_shared_model_is_leader (DEE_SHARED_MODEL (fix->model)));
   g_assert_cmpuint (dee_model_get_n_rows (fix->model), ==, 0);
 
+  gboolean got_changeset_start = FALSE;
+  gboolean got_changeset_finish = FALSE;
+  g_signal_connect (fix->model, "changeset-started",
+                    G_CALLBACK (changeset_signal), &got_changeset_start);
+  g_signal_connect (fix->model, "changeset-finished",
+                    G_CALLBACK (changeset_signal), &got_changeset_finish);
+
   if (gtx_wait_for_command (TESTDIR,
                             MODEL_HELPER (append1, MODEL_NAME),
                             2000))
@@ -717,6 +730,8 @@
 
   /* There should be a new row in the model */
   g_assert_cmpuint (dee_model_get_n_rows (fix->model), ==, 1);
+  g_assert (got_changeset_start);
+  g_assert (got_changeset_finish);
 }
 
 static void

=== modified file 'tests/test-resource-manager.c'
--- tests/test-resource-manager.c	2011-03-01 20:55:42 +0000
+++ tests/test-resource-manager.c	2013-09-16 18:51:54 +0000
@@ -38,17 +38,21 @@
 static void shared_model_teardown (Fixture *fix, gconstpointer data);
 
 static void test_model_persistence (Fixture *fix, gconstpointer data);
+static void test_resource_manager_default (Fixture *fix, gconstpointer data);
 
 void
 test_resource_manager_create_suite (void)
 {
 #define DOMAIN "/ResourceManager"
 
+  g_test_add (DOMAIN"/Default", Fixture, 0,
+              NULL, test_resource_manager_default, NULL);
+
   g_test_add (DOMAIN"/SequenceModel", Fixture, 0,
-                  sequence_model_setup, test_model_persistence, sequence_model_teardown);
+              sequence_model_setup, test_model_persistence, sequence_model_teardown);
 
   g_test_add (DOMAIN"/SharedModel", Fixture, 0,
-                  shared_model_setup, test_model_persistence, shared_model_teardown);
+              shared_model_setup, test_model_persistence, shared_model_teardown);
 }
 
 static void
@@ -192,3 +196,27 @@
 
   dee_assert_cmpmodel (fix->orig, fix->copy);
 }
+
+static void
+test_resource_manager_default (Fixture *fix, gconstpointer data)
+{
+  DeeResourceManager *manager;
+  GError             *error;
+  GObject            *result;
+  gchar              *primary_path;
+
+  error = NULL;
+
+  manager = dee_resource_manager_get_default ();
+  g_object_get (manager, "primary-path", &primary_path, NULL);
+  g_assert (g_str_has_suffix (primary_path, "resources"));
+  g_free (primary_path);
+
+  result = dee_resource_manager_load (manager,
+                                      "com.this.hopefully.doesnt.exist.com",
+                                      &error);
+  g_assert (result == NULL);
+  /* loading non-existing resource just returns NULL, doesn't throw error */
+  g_assert_no_error (error);
+}
+

=== modified file 'vapi/dee-1.0.vapi'
--- vapi/dee-1.0.vapi	2013-04-10 14:30:44 +0000
+++ vapi/dee-1.0.vapi	2013-09-16 18:51:54 +0000
@@ -212,11 +212,13 @@
 	public interface Model : GLib.Object {
 		public unowned Dee.ModelIter append (...);
 		public abstract unowned Dee.ModelIter append_row ([CCode (array_length = false, array_null_terminated = true)] GLib.Variant[] row_members);
+		public abstract void begin_changeset ();
 		[CCode (array_length_pos = 1.33333, array_length_type = "guint", cname = "dee_model_build_named_row_sunk")]
 		public GLib.Variant[] build_named_row ([CCode (array_length = false)] GLib.Variant[]? out_row_members, string first_column_name, ...);
 		[CCode (array_length_pos = 1.33333, array_length_type = "guint", cname = "dee_model_build_named_row_sunk")]
 		public unowned GLib.Variant[] build_named_row_static ([CCode (array_length = false)] GLib.Variant[] out_row_members, string first_column_name, ...);
 		public abstract void clear ();
+		public abstract void end_changeset ();
 		public abstract unowned Dee.ModelIter find_row_sorted ([CCode (array_length = false, array_null_terminated = true)] GLib.Variant[] row_spec, [CCode (delegate_target_pos = 2.5)] Dee.CompareRowFunc cmp_func, out bool out_was_found);
 		public unowned Dee.ModelIter find_row_sorted_with_sizes ([CCode (array_length = false, array_null_terminated = true)] GLib.Variant[] row_spec, [CCode (delegate_target_pos = 2.5)] Dee.CompareRowSizedFunc cmp_func, out bool out_was_found);
 		public unowned Dee.ModelIter find_sorted ([CCode (delegate_target_pos = 1.5)] Dee.CompareRowFunc cmp_func, out bool out_was_found, ...);
@@ -271,6 +273,8 @@
 		public void set_schema (...);
 		public abstract void set_schema_full ([CCode (array_length_cname = "num_columns", array_length_pos = 1.1, array_length_type = "guint", array_null_terminated = true)] string[] column_schemas);
 		public abstract void set_value (Dee.ModelIter iter, uint column, GLib.Variant value);
+		public virtual signal void changeset_finished ();
+		public virtual signal void changeset_started ();
 		public virtual signal void row_added (Dee.ModelIter iter);
 		public virtual signal void row_changed (Dee.ModelIter iter);
 		public virtual signal void row_removed (Dee.ModelIter iter);