[Home]	[About]
[Screenshots]	[Download]
[News]	[Community]
[Documentation]	[Manual]
[Bugs & Requests]	[Wiki]

/home/tetron/hack/vos/libs/vos/extensions/revcontrol/list3waymerge.hh

Go to the documentation of this file.

#ifndef _LIST3WAYMERGE_HH_
#define _LIST3WAYMERGE_HH_

#include <vector>
#include <deque>
#include <string>
#include <iostream>

struct Entry
{
    unsigned int pos;
    std::string name;
    std::string child;

    Entry(){}
    Entry(const Entry& c)
        : pos(c.pos),
            name(c.name),
          child(c.child)
        { }
    Entry& operator=(const Entry& c) {
        pos = c.pos;
        name = c.name;
        child = c.child;
        return *this;
    }
};

#undef NOOP
#undef INSERT
#undef DELETE
#undef SET

struct Change
{
    enum { NOOP, INSERT, DELETE, SET } type;
    unsigned int pos;
    std::string name;
    std::string child;

    std::string oldname;
    std::string oldchild;

    Change(){}
    Change(const Change& c)
        : type(c.type),
          pos(c.pos),
          name(c.name),
          child(c.child),
          oldname(c.oldname),
          oldchild(c.oldchild)
        { }

    Change& operator=(const Change& c) {
        type = c.type;
        pos = c.pos;
        name = c.name;
        child = c.child;
        oldname = c.oldname;
        oldchild = c.oldchild;
        return *this;
    }
};

struct ListMergeConflict
{
    Change head;
    Change branch;
};

inline bool operator==(const Entry& x, const Entry& y)
{
    return (x.name == y.name && x.child == y.child);
}

inline bool operator!=(const Entry& x, const Entry& y)
{
    return !(x == y);
}

inline bool operator==(const Change& x, const Change& y)
{
    return (x.type == y.type && x.pos == y.pos && x.name == y.name && x.child == y.child);
}

inline bool operator!=(const Change& x, const Change& y)
{
    return !(x == y);
}

void applyChanges(std::deque<Entry>& entries, std::deque<Change>& history);
void undoChanges(std::deque<Entry>& entries, std::deque<Change>& history);
void listIt(std::deque<Entry>& entries);
void pushDelete(std::deque<Change>& history, int pos);
void pushSet(std::deque<Change>& history, int pos, const std::string& name, const std::string& child);
void pushInsert(std::deque<Change>& history, int pos, const std::string& name, const std::string& child);
void diffEntries(std::deque<Entry>& entries, std::deque<Entry>& base_entries,
                 std::deque<Change>& delete_list, std::deque<Change>& insert_list);
void printChangelist(std::deque<Change>& clist);
void mergeEntries(std::deque<Entry>& branchA,
                  std::deque<Entry>& branchB,
                  std::deque<Entry>& base_entries,
                  std::deque<Change>& delete_listBtoM,
                  std::deque<Change>& insert_listBtoM,
                  std::deque<ListMergeConflict>& conflicts,
                  bool printstuff = false);

#endif