DiffTypes.h++

Go to the documentation of this file.

#ifndef __libquark_diff_DiffTypes_hxx
#define __libquark_diff_DiffTypes_hxx

#include <QtGlobal>

namespace quark {
namespace diff {

// The role identifies the component of a 2- or 3-way diff.
enum DiffRole { DIFF_BASE, DIFF_THEIRS, DIFF_YOURS };

// The "direction" of a diff. Affects whether the "delete" and "insert" chunk
// types are swapped.
//
// "kDiffFromBase" indicates that we are diffing "from" the base to the other
// file(s). This is always the case for 2-way diffs. For 3-way diffs, it
// indicates that we consider the base file to be the "old" file. This would
// be used to present a 3-way diff to the user which shows how the "theirs"
// and "yours" files differ from a "base" file.
//
// "kDiffToBase" indicates that we are diffing "to" the base from the other
// file(s). This is never the case for 2-way diffs. For 3-way diffs, it
// indicates that we consider the base file to be the "new" file. This would
// be used to present a 3-way merge to the user, in which the "base" file is
// the result of the merge between a common ancestor and the "theirs" and
// "yours" files; it shows how edits in the "theirs" and "yours" files
// have contributed to the resulting merged file.
enum DiffDirection { DIFF_FROM_BASE, DIFF_TO_BASE };

// Simple data structure for storing diff chunk counts.
struct DiffCounts
{
  DiffCounts()
    : theirs(0),
      yours(0),
      both(0),
      conflicting(0)
  {
  }

  inline void reset()
  {
    theirs = yours = both = conflicting = 0;
  }

  uint theirs;
  uint yours;
  uint both;
  uint conflicting;
};

} // namespace diff
} // namespace quark

#endif // __libquark_diff_DiffTypes_hxx