public final class UnifiedDiffUtils
extends java.lang.Object
| Modifier and Type | Field and Description |
|---|---|
private static java.lang.String |
NULL_FILE_INDICATOR |
private static java.util.regex.Pattern |
UNIFIED_DIFF_CHUNK_REGEXP |
| Modifier | Constructor and Description |
|---|---|
private |
UnifiedDiffUtils() |
| Modifier and Type | Method and Description |
|---|---|
static java.util.List<java.lang.String> |
generateUnifiedDiff(java.lang.String originalFileName,
java.lang.String revisedFileName,
java.util.List<java.lang.String> originalLines,
Patch<java.lang.String> patch,
int contextSize)
generateUnifiedDiff takes a Patch and some other arguments, returning the Unified Diff format
text representing the Patch.
|
private static java.util.List<java.lang.String> |
getDeltaText(AbstractDelta<java.lang.String> delta)
getDeltaText returns the lines to be added to the Unified Diff text from the Delta parameter.
|
static Patch<java.lang.String> |
parseUnifiedDiff(java.util.List<java.lang.String> diff)
Parse the given text in unified format and creates the list of deltas for it.
|
private static java.util.List<java.lang.String> |
processDeltas(java.util.List<java.lang.String> origLines,
java.util.List<AbstractDelta<java.lang.String>> deltas,
int contextSize,
boolean newFile)
processDeltas takes a list of Deltas and outputs them together in a single block of
Unified-Diff-format text.
|
private static void |
processLinesInPrevChunk(java.util.List<java.lang.String[]> rawChunk,
Patch<java.lang.String> patch,
int old_ln,
int new_ln) |
private static final java.util.regex.Pattern UNIFIED_DIFF_CHUNK_REGEXP
private static final java.lang.String NULL_FILE_INDICATOR
public static Patch<java.lang.String> parseUnifiedDiff(java.util.List<java.lang.String> diff)
diff - the text in unified formatprivate static void processLinesInPrevChunk(java.util.List<java.lang.String[]> rawChunk,
Patch<java.lang.String> patch,
int old_ln,
int new_ln)
public static java.util.List<java.lang.String> generateUnifiedDiff(java.lang.String originalFileName,
java.lang.String revisedFileName,
java.util.List<java.lang.String> originalLines,
Patch<java.lang.String> patch,
int contextSize)
originalFileName - - Filename of the original (unrevised file)revisedFileName - - Filename of the revised fileoriginalLines - - Lines of the original filepatch - - Patch created by the diff() functioncontextSize - - number of lines of context output around each difference in the file.private static java.util.List<java.lang.String> processDeltas(java.util.List<java.lang.String> origLines,
java.util.List<AbstractDelta<java.lang.String>> deltas,
int contextSize,
boolean newFile)
origLines - - the lines of the original filedeltas - - the Deltas to be output as a single blockcontextSize - - the number of lines of context to place around blockprivate static java.util.List<java.lang.String> getDeltaText(AbstractDelta<java.lang.String> delta)
delta - - the Delta to output