kicad_merge_engine.cpp File Reference

#include <diff_merge/kicad_merge_engine.h>
#include <json_conversions.h>
#include <nlohmann/json.hpp>
#include <map>
#include <set>
#include <stdexcept>

Go to the source code of this file.

Namespaces
namespace	KICAD_DIFF

Functions
const char *	KICAD_DIFF::PropResToString (PROP_RES aRes)
	Canonical lower-case spellings for PROP_RES used inside the JSON serialization of PROPERTY_RESOLUTION (ours / theirs / ancestor / custom).
PROP_RES	KICAD_DIFF::PropResFromString (const std::string &aStr)
const char *	KICAD_DIFF::ItemResToString (ITEM_RES aRes)
	Canonical snake_case spellings used in MERGE_PLAN JSON serialization (take_ours / take_theirs / take_ancestor / merge_props / delete / keep).
ITEM_RES	KICAD_DIFF::ItemResFromString (const std::string &aStr)
std::map< KIID_PATH, const ITEM_CHANGE * >	KICAD_DIFF::IndexChangesByKiid (const DOCUMENT_DIFF &aDiff)
	Flatten a DOCUMENT_DIFF's ITEM_CHANGE tree into a KIID_PATH -> ITEM_CHANGE* map, recursing into child changes.
std::map< wxString, const PROPERTY_DELTA * >	KICAD_DIFF::IndexPropertiesByName (const ITEM_CHANGE &aChange)
	Index property deltas inside one ITEM_CHANGE by property name.
PROPERTY_RESOLUTION_OUTCOME	KICAD_DIFF::ResolvePropertyConflict (const PROPERTY_DELTA *aOurs, const PROPERTY_DELTA *aTheirs, const KICAD_MERGE_ENGINE::OPTIONS &aOptions)
	Decide how to resolve a single property edit between two sides.