history_merge.c File Reference

Merge histories, including optional pipeline topology merge. More...

#include "common/history_merge.h"
#include "common/history_merge_gui.h"
#include "common/darktable.h"
#include "common/debug.h"
#include "common/iop_order.h"
#include "common/topological_sort.h"
#include "control/control.h"
#include "develop/blend.h"
#include "develop/dev_history.h"
#include "develop/develop.h"
#include "develop/imageop.h"
#include <glib.h>
#include <limits.h>
#include <stdlib.h>
#include <string.h>

Include dependency graph for history_merge.c:

Go to the source code of this file.

Data Structures
struct	_hm_id_info_t
struct	_hm_dest_backup_t
struct	_hm_topo_merge_ctx_t

Typedefs
typedef struct _hm_topo_merge_ctx_t	_hm_topo_merge_ctx_t

Enumerations
enum	_hm_id_origin_t {   HM_ID_FROM_MOD_LIST = 1 << 0 ,   HM_ID_FROM_SRC_IOP = 1 << 1 ,   HM_ID_FROM_DST_IOP = 1 << 2 ,   HM_ID_FROM_RULE = 1 << 3 }

Functions
char *	_hm_make_node_id (const char *op, const char *multi_name)
static void	_hm_free_input_node (dt_digraph_node_t *n)
static void	_hm_free_input_nodes (GList *input_nodes)
void	_hm_id_to_op_name (const char *id, char *op, char *name)
static int	_hm_build_prev_map_from_ids (const GList *ids, GHashTable **out_prev)
static int	_hm_build_next_map_from_ids (const GList *ids, GHashTable **out_next)
static gboolean	_hm_node_has_predecessor (const dt_digraph_node_t *n, const dt_digraph_node_t *pred)
static void	_hm_remove_predecessor (dt_digraph_node_t *n, const dt_digraph_node_t *pred)
static int	_hm_build_last_history_by_id_from_history (GList *history, const int history_end, GHashTable **out_map)
static int	_hm_backup_dest (const dt_develop_t *dev_dest, const GHashTable *mod_list_ids, _hm_dest_backup_t *backup)
static void	_hm_restore_dest_from_backup (dt_develop_t *dev_dest, _hm_dest_backup_t *backup)
static void	_hm_backup_cleanup (_hm_dest_backup_t *backup)
int	_hm_build_last_history_by_id (const dt_develop_t *dev, GHashTable **out_map)
static int	_hm_build_id_set_from_mod_list (const GList *mod_list, GHashTable **out_ids)
static _hm_id_info_t *	_hm_id_info_upsert (GHashTable *id_ht, const char *op, const char *multi_name, const _hm_id_origin_t origin, const dt_iop_module_t *mod_list, const dt_iop_module_t *src_iop, dt_iop_module_t *dst_iop)
static int	_hm_ids_from_iop_list (GList *iop, GHashTable *id_ht, const guint keep_mask, GList **out_ids)
static int	_hm_build_input_nodes_from_ids (const GList *ids, const char *tag, GList **out_nodes)
static int	_hm_build_input_nodes_from_ids_filtered (const GList *ids, const char *tag, const GHashTable *focus, GList **out_nodes)
static int	_hm_build_isolated_nodes_from_modules (const GList *modules, const char *tag, GList **out_nodes)
static int	_hm_build_raster_mask_nodes_from_modules (const GList *modules, GHashTable *id_ht, const guint keep_mask, const char *tag, GList **out_nodes)
static int	_iop_rules (GHashTable *keep, GList **out_nodes)
static void	_hm_topo_merge_cleanup (_hm_topo_merge_ctx_t *ctx)
static int	_hm_topo_build_id_info_table (_hm_topo_merge_ctx_t *ctx, dt_develop_t *dev_dest, dt_develop_t *dev_src, const GList *mod_list)
static int	_hm_topo_build_constraint_ids (_hm_topo_merge_ctx_t *ctx, dt_develop_t *dev_dest, dt_develop_t *dev_src, const GList *mod_list, const gboolean merge_iop_order)
static int	_hm_topo_resolve_incompatible_constraints (GList *flat, GHashTable *id_ht, const GList *src_ids, const GList *dest_ids)
static int	_hm_topo_flatten_constraints (_hm_topo_merge_ctx_t *ctx)
static int	_hm_topo_sort_constraints (_hm_topo_merge_ctx_t *ctx)
static int	_hm_topo_apply_solution (_hm_topo_merge_ctx_t *ctx, dt_develop_t *dev_dest, dt_develop_t *dev_src)
static int	_hm_try_merge_iop_order_topologically (dt_develop_t *dev_dest, dt_develop_t *dev_src, const GList *mod_list, const gboolean merge_iop_order)
static void	_hm_renumber_history (GList *history)
static void	_hm_truncate_dest_redo_tail (dt_develop_t *dev_dest)
void	dt_hm_batch_state_cleanup (dt_hm_batch_state_t *batch)
	Release resources held by a batch state (the cached order). Safe to call on a zeroed state.
static dt_iop_module_t *	_hm_dest_module_from_id (dt_develop_t *dev, const char *id)
static GList *	_hm_capture_order_ids (dt_develop_t *dev_dest)
static gboolean	_hm_cached_order_applicable (dt_develop_t *dev_dest, GList *order_ids)
static void	_hm_apply_cached_order (dt_develop_t *dev_dest, GList *order_ids)
static const char *	_hm_failure_message (const char *cleanup_reason)
int	dt_history_merge (dt_develop_t *dev_dest, dt_develop_t *dev_src, const int32_t dest_imgid, const GList *mod_list, const gboolean merge_iop_order, const dt_history_merge_strategy_t strategy, const gboolean force_new_modules, const char *source_label, dt_hm_batch_state_t *batch)
	Merge a list of modules into a destination image, solving pipeline topologies for proper insertion of source modules.

Detailed Description

Merge histories, including optional pipeline topology merge.

Date

2026-02-22

Merge histories, for copy-pasting and styles.

Merging histories is a twofold problems, we need to solve :

1. the inner of the module (parameters, blendops)
2. the topology of the pipeline (ordering).

Let 2 histories A and B, considering A is our existing one, and B is our candidate for pasting. They each have a devA and devB dt_develop_t object. The members of interest are dev->history, dev->iop, dev->iop_order

The first problem is simple : we have append mode (concatenate devB->history at the end of devA->history) or prepend mode (concatenate devB->history at the start of devA->history), decided by user. Histories are commited to pipeline nodes ("popped") in the order of items. Since each history item may overwrite any previous item targetting the same module, this order defines which history takes precedence over the other, in case of conflicts. We do not handle per-module conflict resolution.

The second problem is much harder, because both histories may have different topologies (number of nodes and relative ordering). For this, we need to build temporary pipelines devA->iop and devB->iop using each histories, and turn them into directed graphs. Each module will be a digraph node defined by its previous and next module in its original pipeline, identified by its module->op and module->multi_name, taken as unique ID. Modules having the same ID in both pipes will be assumed to be the same entity and merged. Then we will need a topological sort to resolve (if possible) the complete pipeline order, taking into account the ordering constraints imposed by devA and by devB, which may overconstrain each entity. Once we have the topological order sorted, we will need to create a new pipeline and apply ("pop") the concatenated histories as solved in the first problem.

This supposes users provided an explicit pipeline order as a { module -> index } list.

However, when users don't specify a pipeline order in the merge, we are to assume they don't care. In this case, we enforce a behaviour that is consistent with GUI operation :

• the base instances of modules are directly matched B to A (no re-ordering, no new instance creation)
• the additional instances of modules that exist in A and B, and have matching module->op and module->multi_name between A and B, are also directly matched (no re-ordering, no new instance),
• the additional instances of modules from B that don't exist in A will be created after the last module instance of the same type in A (consistent with GUI interaction on "add new instance" event),
• the modules from B will never overwrite the pipeline order of those from A.

There is also a special case for a "force new modules" merge. In this mode, all modules from B will be added to A as new instances. This will need to rename and reindex instances properly for the B modules, then update B history accordingly. Pipeline topology will obey the above rules, depending whether an explicit pipeline order was specified or not.

If A does not exist yet, it has to be inited with all the typical defaults applied to new edits. This is done automatically in dt_dev_history_read_history(), which either load history from database or init a fresh one, along with a pipeline (dev->iop).

Before popping the history into modules (as pipeline nodes), each history item will need to be resynced with nodes, especially the pipe order and dt_iop_module_t * references. Here again, module->op and module->multi_name act as unique IDs to match history entries and pipe nodes. History entries that don't find an existing module will need a new module to be created.

Definition in file history_merge.c.

Typedef Documentation

_hm_topo_merge_ctx_t

typedef struct _hm_topo_merge_ctx_t _hm_topo_merge_ctx_t

Enumeration Type Documentation

_hm_id_origin_t

enum _hm_id_origin_t

Enumerator
HM_ID_FROM_MOD_LIST
HM_ID_FROM_SRC_IOP
HM_ID_FROM_DST_IOP
HM_ID_FROM_RULE

Definition at line 265 of file history_merge.c.

Function Documentation

_hm_apply_cached_order()

static void _hm_apply_cached_order ( dt_develop_t *  dev_dest, GList *  order_ids  )

static

Definition at line 1636 of file history_merge.c.

References _hm_dest_module_from_id(), dt_ioppr_rebuild_iop_order_from_modules(), and dt_develop_t::iop.

Referenced by dt_history_merge().

_hm_backup_cleanup()

static void _hm_backup_cleanup ( _hm_dest_backup_t *  backup )

static

Definition at line 365 of file history_merge.c.

References dt_dev_free_history_item(), dt_free_gpointer(), _hm_dest_backup_t::history, _hm_dest_backup_t::iop_order_list, _hm_dest_backup_t::orig_ids, _hm_dest_backup_t::orig_labels, _hm_dest_backup_t::orig_styles, and TRUE.

Referenced by dt_history_merge().

_hm_backup_dest()

static int _hm_backup_dest ( const dt_develop_t *  dev_dest, const GHashTable *  mod_list_ids, _hm_dest_backup_t *  backup  )

static

Definition at line 318 of file history_merge.c.

References _hm_build_last_history_by_id_from_history(), _hm_collect_labels_from_history_map(), DT_DEBUG_HISTORY, DT_DEBUG_VERBOSE, dt_dev_get_history_end_ext(), dt_history_duplicate(), dt_ioppr_iop_order_copy_deep(), dt_print(), _hm_dest_backup_t::history, dt_develop_t::history, _hm_dest_backup_t::history_end, dt_image_t::id, dt_develop_t::image_storage, _hm_dest_backup_t::iop_order_list, dt_develop_t::iop_order_list, IS_NULL_PTR, _hm_dest_backup_t::orig_ids, _hm_dest_backup_t::orig_labels, _hm_dest_backup_t::orig_styles, and TRUE.

Referenced by dt_history_merge().

_hm_build_id_set_from_mod_list()

static int _hm_build_id_set_from_mod_list ( const GList *  mod_list, GHashTable **  out_ids  )

static

Definition at line 414 of file history_merge.c.

References _hm_make_node_id(), DT_DEBUG_HISTORY, DT_DEBUG_VERBOSE, dt_free_gpointer(), dt_print(), IS_NULL_PTR, dt_iop_module_t::multi_name, and dt_iop_module_t::op.

Referenced by dt_history_merge().

_hm_build_input_nodes_from_ids()

static int _hm_build_input_nodes_from_ids ( const GList *  ids, const char *  tag, GList **  out_nodes  )

static

Definition at line 504 of file history_merge.c.

References _hm_free_input_node(), _hm_free_input_nodes(), dt_digraph_node_new(), IS_NULL_PTR, and n.

Referenced by _hm_topo_flatten_constraints().

_hm_build_input_nodes_from_ids_filtered()

static int _hm_build_input_nodes_from_ids_filtered ( const GList *  ids, const char *  tag, const GHashTable *  focus, GList **  out_nodes  )

static

Definition at line 551 of file history_merge.c.

References _hm_free_input_node(), _hm_free_input_nodes(), dt_digraph_node_new(), dt_digraph_node_t::id, IS_NULL_PTR, and n.

Referenced by _hm_topo_flatten_constraints().

_hm_build_isolated_nodes_from_modules()

static int _hm_build_isolated_nodes_from_modules ( const GList *  modules, const char *  tag, GList **  out_nodes  )

static

Definition at line 603 of file history_merge.c.

References _hm_free_input_node(), _hm_free_input_nodes(), _hm_make_node_id(), dt_digraph_node_new(), dt_free, IS_NULL_PTR, dt_iop_module_t::multi_name, n, and dt_iop_module_t::op.

Referenced by _hm_topo_flatten_constraints().

_hm_build_last_history_by_id()

int _hm_build_last_history_by_id	(	const dt_develop_t *	dev,
		GHashTable **	out_map
	)

Definition at line 387 of file history_merge.c.

References _hm_make_node_id(), DT_DEBUG_HISTORY, DT_DEBUG_VERBOSE, dt_dev_get_history_end_ext(), dt_dev_history_get_last_item_by_module(), dt_free_gpointer(), dt_print(), dt_develop_t::history, dt_image_t::id, dt_develop_t::image_storage, dt_develop_t::iop, IS_NULL_PTR, dt_iop_module_t::multi_name, and dt_iop_module_t::op.

Referenced by _hm_show_merge_report_popup(), and dt_history_merge().

_hm_build_last_history_by_id_from_history()

static int _hm_build_last_history_by_id_from_history ( GList *  history, const int  history_end, GHashTable **  out_map  )

static

Definition at line 299 of file history_merge.c.

References _hm_make_node_id(), DT_DEBUG_HISTORY, DT_DEBUG_VERBOSE, dt_free_gpointer(), dt_print(), IS_NULL_PTR, dt_dev_history_item_t::multi_name, and dt_dev_history_item_t::op_name.

Referenced by _hm_backup_dest().

_hm_build_next_map_from_ids()

static int _hm_build_next_map_from_ids ( const GList *  ids, GHashTable **  out_next  )

static

Definition at line 210 of file history_merge.c.

References dt_free_gpointer(), and IS_NULL_PTR.

Referenced by _hm_topo_resolve_incompatible_constraints().

_hm_build_prev_map_from_ids()

static int _hm_build_prev_map_from_ids ( const GList *  ids, GHashTable **  out_prev  )

static

Definition at line 179 of file history_merge.c.

References dt_free_gpointer(), and IS_NULL_PTR.

Referenced by _hm_topo_resolve_incompatible_constraints().

_hm_build_raster_mask_nodes_from_modules()

static int _hm_build_raster_mask_nodes_from_modules ( const GList *  modules, GHashTable *  id_ht, const guint  keep_mask, const char *  tag, GList **  out_nodes  )

static

Definition at line 638 of file history_merge.c.

References _hm_free_input_node(), _hm_free_input_nodes(), _hm_make_node_id(), dt_digraph_node_new(), dt_free, _hm_id_info_t::flags, IS_NULL_PTR, dt_iop_module_t::multi_name, dt_iop_module_t::op, dt_digraph_node_t::previous, dt_iop_module_t::raster_mask, dt_iop_module_t::sink, dt_iop_module_t::source, and dt_digraph_node_t::tag.

Referenced by _hm_topo_flatten_constraints().

_hm_cached_order_applicable()

static gboolean _hm_cached_order_applicable ( dt_develop_t *  dev_dest, GList *  order_ids  )

static

Definition at line 1598 of file history_merge.c.

References _hm_make_node_id(), dt_free_gpointer(), FALSE, dt_develop_t::iop, dt_iop_module_t::iop_order, IS_NULL_PTR, dt_iop_module_t::multi_name, dt_iop_module_t::op, and TRUE.

Referenced by dt_history_merge().

_hm_capture_order_ids()

static GList * _hm_capture_order_ids ( dt_develop_t *  dev_dest )

static

Definition at line 1584 of file history_merge.c.

References _hm_make_node_id(), dt_develop_t::iop, dt_iop_module_t::iop_order, IS_NULL_PTR, dt_iop_module_t::multi_name, and dt_iop_module_t::op.

Referenced by dt_history_merge().

_hm_dest_module_from_id()

static dt_iop_module_t * _hm_dest_module_from_id ( dt_develop_t *  dev, const char *  id  )

static

Definition at line 1570 of file history_merge.c.

References _hm_id_to_op_name(), dt_iop_get_module_by_instance_name(), dt_iop_get_module_by_op_priority(), dt_develop_t::iop, IS_NULL_PTR, and name.

Referenced by _hm_apply_cached_order().

_hm_failure_message()

static const char * _hm_failure_message ( const char *  cleanup_reason )

static

Definition at line 1674 of file history_merge.c.

References IS_NULL_PTR.

Referenced by dt_history_merge().

_hm_free_input_node()

static void _hm_free_input_node ( dt_digraph_node_t *  n )

static

Definition at line 120 of file history_merge.c.

References dt_free, IS_NULL_PTR, and n.

Referenced by _hm_build_input_nodes_from_ids(), _hm_build_input_nodes_from_ids_filtered(), _hm_build_isolated_nodes_from_modules(), _hm_build_raster_mask_nodes_from_modules(), _hm_free_input_nodes(), _hm_topo_flatten_constraints(), and _iop_rules().

_hm_free_input_nodes()

static void _hm_free_input_nodes ( GList *  input_nodes )

static

Definition at line 133 of file history_merge.c.

References _hm_free_input_node().

Referenced by _hm_build_input_nodes_from_ids(), _hm_build_input_nodes_from_ids_filtered(), _hm_build_isolated_nodes_from_modules(), _hm_build_raster_mask_nodes_from_modules(), _hm_topo_flatten_constraints(), _hm_topo_merge_cleanup(), and _iop_rules().

_hm_id_info_upsert()

static _hm_id_info_t * _hm_id_info_upsert ( GHashTable *  id_ht, const char *  op, const char *  multi_name, const _hm_id_origin_t  origin, const dt_iop_module_t *  mod_list, const dt_iop_module_t *  src_iop, dt_iop_module_t *  dst_iop  )

static

Definition at line 430 of file history_merge.c.

References _hm_make_node_id(), _hm_id_info_t::dst_iop, DT_DEBUG_HISTORY, dt_free, dt_print(), _hm_id_info_t::flags, HM_ID_FROM_MOD_LIST, IS_NULL_PTR, _hm_id_info_t::mod_list, and _hm_id_info_t::src_iop.

Referenced by _hm_topo_build_id_info_table().

_hm_id_to_op_name()

void _hm_id_to_op_name	(	const char *	id,
		char *	op,
		char *	name
	)

Definition at line 151 of file history_merge.c.

References IS_NULL_PTR, MIN, and name.

Referenced by _hm_dest_module_from_id(), _hm_module_from_id(), _hm_pretty_id(), and _hm_topo_apply_solution().

_hm_ids_from_iop_list()

static int _hm_ids_from_iop_list ( GList *  iop, GHashTable *  id_ht, const guint  keep_mask, GList **  out_ids  )

static

Definition at line 485 of file history_merge.c.

References _hm_make_node_id(), dt_free, _hm_id_info_t::flags, dt_iop_module_t::multi_name, and dt_iop_module_t::op.

Referenced by _hm_topo_build_constraint_ids().

_hm_make_node_id()

char * _hm_make_node_id	(	const char *	op,
		const char *	multi_name
	)

Definition at line 98 of file history_merge.c.

Referenced by _hm_build_id_set_from_mod_list(), _hm_build_isolated_nodes_from_modules(), _hm_build_last_history_by_id(), _hm_build_last_history_by_id_from_history(), _hm_build_override_map(), _hm_build_raster_mask_nodes_from_modules(), _hm_cached_order_applicable(), _hm_capture_order_ids(), _hm_id_info_upsert(), _hm_ids_from_iop_list(), _hm_module_visible_in_report(), _hm_report_build_moved_set(), _hm_report_dest_label(), _hm_show_merge_report_popup(), and _hm_topo_build_constraint_ids().

_hm_node_has_predecessor()

static gboolean _hm_node_has_predecessor ( const dt_digraph_node_t *  n, const dt_digraph_node_t *  pred  )

static

Definition at line 238 of file history_merge.c.

References FALSE, n, p, and TRUE.

Referenced by _hm_topo_resolve_incompatible_constraints().

_hm_remove_predecessor()

static void _hm_remove_predecessor ( dt_digraph_node_t *  n, const dt_digraph_node_t *  pred  )

static

Definition at line 253 of file history_merge.c.

References n.

Referenced by _hm_topo_resolve_incompatible_constraints().

_hm_renumber_history()

static void _hm_renumber_history ( GList *  history )

static

Definition at line 1503 of file history_merge.c.

References DT_DEBUG_HISTORY, DT_DEBUG_VERBOSE, dt_print(), and dt_dev_history_item_t::num.

Referenced by dt_history_merge().

_hm_restore_dest_from_backup()

static void _hm_restore_dest_from_backup ( dt_develop_t *  dev_dest, _hm_dest_backup_t *  backup  )

static

Definition at line 345 of file history_merge.c.

References DT_DEBUG_HISTORY, DT_DEBUG_VERBOSE, dt_dev_history_free_history(), dt_dev_pop_history_items_ext(), dt_dev_set_history_end_ext(), dt_dev_write_history_ext(), dt_free_gpointer(), dt_print(), _hm_dest_backup_t::history, dt_develop_t::history, _hm_dest_backup_t::history_end, dt_image_t::id, dt_develop_t::image_storage, _hm_dest_backup_t::iop_order_list, and dt_develop_t::iop_order_list.

Referenced by dt_history_merge().

_hm_topo_apply_solution()

static int _hm_topo_apply_solution ( _hm_topo_merge_ctx_t *  ctx, dt_develop_t *  dev_dest, dt_develop_t *  dev_src  )

static

Definition at line 1371 of file history_merge.c.

References _hm_id_to_op_name(), _hm_topo_merge_ctx_t::copy_module_contents, _hm_id_info_t::dst_iop, DT_DEBUG_HISTORY, dt_dev_copy_module_contents(), dt_dev_create_module_instance(), dt_dev_get_module_instance(), dt_ioppr_rebuild_iop_order_from_modules(), dt_print(), _hm_id_info_t::flags, HM_ID_FROM_DST_IOP, _hm_topo_merge_ctx_t::id_ht, IS_NULL_PTR, _hm_topo_merge_ctx_t::keep_mask, _hm_id_info_t::mod_list, n, name, _hm_topo_merge_ctx_t::sorted, and TRUE.

Referenced by _hm_try_merge_iop_order_topologically().

_hm_topo_build_constraint_ids()

static int _hm_topo_build_constraint_ids ( _hm_topo_merge_ctx_t *  ctx, dt_develop_t *  dev_dest, dt_develop_t *  dev_src, const GList *  mod_list, const gboolean  merge_iop_order  )

static

Definition at line 860 of file history_merge.c.

References _hm_ids_from_iop_list(), _hm_make_node_id(), _hm_topo_merge_ctx_t::dest_ids, DT_DEBUG_HISTORY, dt_free, dt_free_gpointer(), dt_print(), _hm_id_info_t::flags, HM_ID_FROM_DST_IOP, HM_ID_FROM_MOD_LIST, HM_ID_FROM_RULE, _hm_topo_merge_ctx_t::id_ht, dt_develop_t::iop, IS_NULL_PTR, _hm_topo_merge_ctx_t::keep_mask, dt_iop_module_t::multi_name, dt_iop_module_t::op, _hm_topo_merge_ctx_t::src_focus_ids, and _hm_topo_merge_ctx_t::src_ids.

Referenced by _hm_try_merge_iop_order_topologically().

_hm_topo_build_id_info_table()

static int _hm_topo_build_id_info_table ( _hm_topo_merge_ctx_t *  ctx, dt_develop_t *  dev_dest, dt_develop_t *  dev_src, const GList *  mod_list  )

static

Definition at line 811 of file history_merge.c.

References _hm_id_info_upsert(), darktable, dt_free_gpointer(), HM_ID_FROM_DST_IOP, HM_ID_FROM_MOD_LIST, HM_ID_FROM_RULE, HM_ID_FROM_SRC_IOP, _hm_topo_merge_ctx_t::id_ht, dt_develop_t::iop, darktable_t::iop_order_rules, IS_NULL_PTR, dt_iop_module_t::multi_name, dt_iop_module_t::op, dt_iop_order_rule_t::op_next, and dt_iop_order_rule_t::op_prev.

Referenced by _hm_try_merge_iop_order_topologically().

_hm_topo_flatten_constraints()

static int _hm_topo_flatten_constraints ( _hm_topo_merge_ctx_t *  ctx )

static

Definition at line 916 of file history_merge.c.

References _hm_build_input_nodes_from_ids(), _hm_build_input_nodes_from_ids_filtered(), _hm_build_isolated_nodes_from_modules(), _hm_build_raster_mask_nodes_from_modules(), _hm_free_input_node(), _hm_free_input_nodes(), _hm_topo_resolve_incompatible_constraints(), _iop_rules(), d, _hm_topo_merge_ctx_t::dest_ids, _hm_topo_merge_ctx_t::dev_dest, DT_DEBUG_HISTORY, DT_DEBUG_VERBOSE, dt_digraph_node_new(), dt_print(), error(), _hm_topo_merge_ctx_t::flat, flatten_nodes(), _hm_topo_merge_ctx_t::id_ht, _hm_topo_merge_ctx_t::input_nodes, dt_develop_t::iop, IS_NULL_PTR, _hm_topo_merge_ctx_t::keep_mask, _hm_topo_merge_ctx_t::mod_list, n, p, dt_digraph_node_t::previous, _hm_topo_merge_ctx_t::source_iop_order, _hm_topo_merge_ctx_t::src_focus_ids, and _hm_topo_merge_ctx_t::src_ids.

Referenced by _hm_try_merge_iop_order_topologically().

_hm_topo_merge_cleanup()

static void _hm_topo_merge_cleanup ( _hm_topo_merge_ctx_t *  ctx )

static

Definition at line 775 of file history_merge.c.

References _hm_free_input_nodes(), _hm_topo_merge_ctx_t::dest_ids, dt_digraph_cleanup_full(), dt_free_gpointer(), _hm_topo_merge_ctx_t::flat, _hm_topo_merge_ctx_t::id_ht, _hm_topo_merge_ctx_t::input_nodes, _hm_topo_merge_ctx_t::sorted, _hm_topo_merge_ctx_t::src_focus_ids, and _hm_topo_merge_ctx_t::src_ids.

Referenced by _hm_try_merge_iop_order_topologically().

_hm_topo_resolve_incompatible_constraints()

static int _hm_topo_resolve_incompatible_constraints ( GList *  flat, GHashTable *  id_ht, const GList *  src_ids, const GList *  dest_ids  )

static

Definition at line 1119 of file history_merge.c.

References _hm_ask_user_constraints_choice(), _hm_build_next_map_from_ids(), _hm_build_prev_map_from_ids(), _hm_node_has_predecessor(), _hm_remove_predecessor(), cleanup(), DT_DEBUG_HISTORY, DT_DEBUG_VERBOSE, dt_free, dt_free_gpointer(), DT_HM_CONSTRAINTS_PREFER_SRC, dt_print(), _hm_id_info_t::flags, HM_ID_FROM_MOD_LIST, dt_digraph_node_t::id, IS_NULL_PTR, key, p, and dt_digraph_node_t::previous.

Referenced by _hm_topo_flatten_constraints().

_hm_topo_sort_constraints()

static int _hm_topo_sort_constraints ( _hm_topo_merge_ctx_t *  ctx )

static

Definition at line 1335 of file history_merge.c.

References _hm_show_toposort_cycle_popup(), DT_DEBUG_HISTORY, DT_DEBUG_VERBOSE, dt_print(), _hm_topo_merge_ctx_t::flat, _hm_topo_merge_ctx_t::id_ht, _hm_topo_merge_ctx_t::sorted, and topological_sort().

Referenced by _hm_try_merge_iop_order_topologically().

_hm_truncate_dest_redo_tail()

static void _hm_truncate_dest_redo_tail ( dt_develop_t *  dev_dest )

static

Definition at line 1521 of file history_merge.c.

References DT_DEBUG_HISTORY, DT_DEBUG_VERBOSE, dt_dev_free_history_item(), dt_dev_get_history_end_ext(), dt_print(), dt_develop_t::history, dt_image_t::id, and dt_develop_t::image_storage.

Referenced by dt_history_merge().

_hm_try_merge_iop_order_topologically()

static int _hm_try_merge_iop_order_topologically ( dt_develop_t *  dev_dest, dt_develop_t *  dev_src, const GList *  mod_list, const gboolean  merge_iop_order  )

static

Definition at line 1440 of file history_merge.c.

References _hm_topo_apply_solution(), _hm_topo_build_constraint_ids(), _hm_topo_build_id_info_table(), _hm_topo_flatten_constraints(), _hm_topo_merge_cleanup(), _hm_topo_sort_constraints(), _hm_topo_merge_ctx_t::copy_module_contents, _hm_topo_merge_ctx_t::dev_dest, DT_DEBUG_HISTORY, DT_DEBUG_VERBOSE, dt_print(), dt_develop_t::iop, dt_develop_t::iop_order_list, _hm_topo_merge_ctx_t::mod_list, and _hm_topo_merge_ctx_t::source_iop_order.

Referenced by dt_history_merge().

_iop_rules()

static int _iop_rules ( GHashTable *  keep, GList **  out_nodes  )

static

Definition at line 695 of file history_merge.c.

References _hm_free_input_node(), _hm_free_input_nodes(), darktable, dt_digraph_node_new(), darktable_t::iop_order_rules, IS_NULL_PTR, dt_digraph_node_t::previous, and dt_digraph_node_t::tag.

Referenced by _hm_topo_flatten_constraints().

dt_history_merge()

int dt_history_merge	(	struct dt_develop_t *	dev_dest,
		struct dt_develop_t *	dev_src,
		const int32_t	dest_imgid,
		const GList *	mod_list,
		const gboolean	merge_iop_order,
		const dt_history_merge_strategy_t	strategy,
		const gboolean	force_new_modules,
		const char *	source_label,
		dt_hm_batch_state_t *	batch
	)

Merge a list of modules into a destination image, solving pipeline topologies for proper insertion of source modules.

Parameters

dev_dest	Destination develop stack (must be initialized, history read and popped).
dev_src	Source develop stack (must be initialized, history read and popped). May be NULL if merge_iop_order is FALSE (masks won't be copied).
dest_imgid	Destination image id.
mod_list	List of dt_iop_module_t* to merge (usually coming from dev_src).
merge_iop_order	If TRUE, attempt to merge the pipeline order constraints from src and dest using a topological sort. On unsatisfiable constraints, falls back to overwriting the destination iop-order list with the source list.
strategy	DT_HISTORY_MERGE_APPEND or DT_HISTORY_MERGE_PREPEND.
force_new_modules	If TRUE, always add modules from source as new instances (when possible).
source_label	Optional source label for the report header (style name, for example).

Returns

0 on success, 1 on error.

Definition at line 1692 of file history_merge.c.

References _hm_apply_cached_order(), _hm_backup_cleanup(), _hm_backup_dest(), _hm_build_id_set_from_mod_list(), _hm_build_last_history_by_id(), _hm_cached_order_applicable(), _hm_capture_order_ids(), _hm_failure_message(), _hm_renumber_history(), _hm_restore_dest_from_backup(), _hm_show_merge_report_popup(), _hm_truncate_dest_redo_tail(), _hm_try_merge_iop_order_topologically(), _hm_warn_missing_raster_producers(), cleanup(), dt_hm_batch_state_t::decision, dt_control_log(), DT_DEBUG_HISTORY, DT_DEBUG_VERBOSE, dt_dev_get_history_end_ext(), dt_dev_get_module_instance(), dt_dev_history_get_last_item_by_module(), dt_dev_history_item_from_source_history_item(), dt_dev_set_history_end_ext(), DT_HISTORY_MERGE_APPEND, DT_HM_BATCH_ACCEPT, DT_HM_BATCH_REVERT, dt_iop_get_module_by_op_priority(), dt_ioppr_resync_pipeline(), dt_print(), FALSE, dt_develop_t::history, dt_develop_t::iop, IOP_FLAGS_ONE_INSTANCE, IS_NULL_PTR, dt_iop_module_t::multi_name, dt_iop_module_t::multi_priority, dt_iop_module_t::op, dt_hm_batch_state_t::order_ids, _hm_dest_backup_t::orig_ids, _hm_dest_backup_t::orig_labels, and _hm_dest_backup_t::orig_styles.

Referenced by dt_dev_merge_history_into_image().

dt_hm_batch_state_cleanup()

void dt_hm_batch_state_cleanup

(

dt_hm_batch_state_t *

batch

)

Release resources held by a batch state (the cached order). Safe to call on a zeroed state.

Definition at line 1560 of file history_merge.c.

References dt_free_gpointer(), IS_NULL_PTR, and dt_hm_batch_state_t::order_ids.

Referenced by _import_image(), _studio_style_apply_callback(), dt_history_paste_on_list(), dt_history_paste_parts_on_list(), dt_history_style_on_image(), and dt_history_style_on_list().