\Text_Diff3
A class for computing three way diffs.
- Author: Geoffrey T. Dairiki <dairiki@dairiki.org>
Synopsis
class Text_Diff3
extends Text_Diff
{
- // members
- public integer $_conflictingBlocks = 0;
- // Inherited members from Text_Diff
- public $_edits;
- // methods
- public void Text_Diff3()
- public void mergedOutput()
- public void _diff3()
- // Inherited methods from Text_Diff
- public void Text_Diff()
- public void getDiff()
- public integer countAddedLines()
- public integer countDeletedLines()
- public Text_Diff reverse()
- public boolean isEmpty()
- public integer lcs()
- public array getOriginal()
- public array getFinal()
- public static void trimNewlines()
- public string _getTempDir()
- public void _check()
Hierarchy
Extends
Members
public
- $_conflictingBlocks
—
integer
Conflict counter. - $_edits
—
array
Array of changes.
Methods
public
- Text_Diff3() — Computes diff between 3 sequences of strings.
- _diff3()
- mergedOutput()
Inherited from Text_Diff
public
- Text_Diff() — Computes diffs between sequences of strings.
- _check() — Checks a diff for validity.
- _getTempDir() — Determines the location of the system temporary directory.
- countAddedLines() — returns the number of new (added) lines in a given diff.
- countDeletedLines() — Returns the number of deleted (removed) lines in a given diff.
- getDiff() — Returns the array of differences.
- getFinal() — Gets the final set of lines.
- getOriginal() — Gets the original set of lines.
- isEmpty() — Checks for an empty diff.
- lcs() — Computes the length of the Longest Common Subsequence (LCS).
- reverse() — Computes a reversed diff.
- trimNewlines() — Removes trailing newlines from a line of text. This is meant to be used with array_walk().