24#ifndef LIB_MERGE_APPLIER_H
25#define LIB_MERGE_APPLIER_H
58template <
typename ITEM>
62 using ITEM_MAP = std::map<wxString, const ITEM*>;
94 std::vector<std::unique_ptr<ITEM>>
Apply()
98 std::map<wxString, const ITEM*> live =
m_ancestor;
99 std::map<wxString, std::unique_ptr<ITEM>>
combined;
101 std::map<KIID_PATH, const ITEM_RESOLUTION*> actionsById;
104 actionsById[
res.id] = &
res;
108 for(
const wxString&
name : allNames )
112 if( resIt == actionsById.end() )
154 live[
name] = item.get();
164 m_report.mergePropsFallbackIds.push_back(
res.id );
166 wxT(
"lib_merge_applier: MERGE_PROPS for '%s' fell back to "
173 std::vector<std::unique_ptr<ITEM>> out;
174 out.reserve( live.size() );
176 for(
const auto& [
name, item] : live )
179 out.push_back( std::move( it->second ) );
181 out.emplace_back( std::make_unique<ITEM>( *item ) );
192 auto it = aMap.find( aName );
193 return it == aMap.end() ? nullptr : it->second;
198 std::set<wxString> out;
200 for(
const auto& [
name,
_] : aAncestor )
202 for(
const auto& [
name,
_] : aOurs )
204 for(
const auto& [
name,
_] : aTheirs )
210 static void takeFrom(
const ITEM_MAP& aSource,
const wxString& aName, std::map<wxString, const ITEM*>& aLive,
211 std::size_t& aCounter )
216 aLive.erase( aName );
static const ITEM * findItem(const ITEM_MAP &aMap, const wxString &aName)
const ITEM_MAP & m_theirs
static void takeFrom(const ITEM_MAP &aSource, const wxString &aName, std::map< wxString, const ITEM * > &aLive, std::size_t &aCounter)
const REPORT & GetReport() const
std::map< wxString, const LIB_SYMBOL * > ITEM_MAP
std::vector< std::unique_ptr< ITEM > > Apply()
const ITEM_MAP & m_ancestor
LIB_MERGE_APPLIER(const ITEM_MAP &aAncestor, const ITEM_MAP &aOurs, const ITEM_MAP &aTheirs, MERGE_PLAN aPlan, COMBINER aCombine={})
static std::set< wxString > collectNames(const ITEM_MAP &aAncestor, const ITEM_MAP &aOurs, const ITEM_MAP &aTheirs)
std::function< std::unique_ptr< LIB_SYMBOL >(const KIID_PATH &aId)> COMBINER
const wxChar *const traceDiffMerge
Flag to enable diff/merge engine and renderer debugging output.
KIID_PATH LibraryItemKiidPath(const wxString &aName)
Build a deterministic synthetic KIID_PATH from a library item name (symbol name or footprint name).
std::size_t mergePropsFallback
std::size_t itemsTakenOurs
std::size_t itemsTakenTheirs
std::size_t itemsTakenAncestor
std::size_t itemsCombined
std::vector< KIID_PATH > mergePropsFallbackIds
Item IDs (KIID_PATH from LibraryItemKiidPath) for resolutions that the applier silently downgraded (c...
Result of planning a 3-way merge.
wxLogTrace helper definitions.