Modifier and Type	Class and Description
public static enum	FileHeader.PatchType Type of patch used by this file.

Field Summary

Modifier and Type	Field and Description
pack-priv final byte[]	buf Buffer holding the patch data for this file.
private static final byte[]	COPY_FROM
private static final byte[]	COPY_TO
pack-priv static final byte[]	DELETED_FILE_MODE
private static final byte[]	DISSIMILARITY_INDEX
pack-priv int	endOffset Position 1 past the end of this file within `buf`.
pack-priv BinaryHunk	forwardBinaryHunk If `patchType` is `PatchType#GIT_BINARY`, the new image
private List<HunkHeader>	hunks The hunks of this file
pack-priv static final byte[]	INDEX
pack-priv static final byte[]	NEW_FILE_MODE
private static final byte[]	NEW_MODE
pack-priv static final byte[]	NEW_NAME
private static final byte[]	OLD_MODE
pack-priv static final byte[]	OLD_NAME
pack-priv FileHeader.PatchType	patchType Type of patch used to modify this file
private static final byte[]	RENAME_FROM
private static final byte[]	RENAME_NEW
private static final byte[]	RENAME_OLD
private static final byte[]	RENAME_TO
pack-priv BinaryHunk	reverseBinaryHunk If `patchType` is `PatchType#GIT_BINARY`, the old image
private static final byte[]	SIMILARITY_INDEX
pack-priv final int	startOffset Offset within `buf` to the "diff ..." line.

Inherited from org.eclipse.jgit.diff.DiffEntry:: changeType DEV_NULL diffAttribute newId newMode newPath oldId oldMode oldPath score

Constructor Summary

Access	Constructor and Description
public	FileHeader(byte[] buffer holding the diff header for this file headerLines, EditList the edits for this file edits, FileHeader.PatchType the type of patch used to modify this file type) Constructs a new FileHeader
pack-priv	FileHeader(byte[] b, int offset)

Method Summary

Modifier and Type	Method and Description
pack-priv void	addHunk(HunkHeader h)
private boolean	eq(int aPtr, int aEnd, int bPtr, int bEnd)
private String[]	extractFileLines(Charset[] csGuess)
public byte[]	Returns: the byte array holding this file's patch script. getBuffer() Get the byte array holding this file's patch script.
public int	Returns: offset one past the end of the file script. getEndOffset() Get offset one past the end of the file script.
public BinaryHunk	Returns: the new-image delta/literal if this is a `PatchType#GIT_BINARY`. getForwardBinaryHunk() Get the new-image delta/literal if this is a `PatchType#GIT_BINARY`.
public List<? extends HunkHeader>	Returns: hunks altering this file; in order of appearance in patch. getHunks() Get hunks altering this file; in order of appearance in patch
pack-priv int	getParentCount()
public FileHeader.PatchType	Returns: style of patch used to modify this file. getPatchType() Get style of patch used to modify this file.
public BinaryHunk	Returns: the old-image delta/literal if this is a `PatchType#GIT_BINARY`. getReverseBinaryHunk() Get the old-image delta/literal if this is a `PatchType#GIT_BINARY`.
public String	Returns: the patch script, as a Unicode string. getScriptText() Convert the patch script for this file into a string.
public String	Returns: the patch script, as a Unicode string. getScriptText(Charset hint character set to decode the old lines with. oldCharset, Charset hint character set to decode the new lines with. newCharset) Convert the patch script for this file into a string.
pack-priv String	Returns: the patch script, as a Unicode string. getScriptText(Charset[] hint which charset is used charsetGuess) Convert the patch script for this file into a string.
public int	Returns: offset of the start of this file's script in `getBuffer()`. getStartOffset() Get offset of the start of this file's script in `getBuffer()`.
public boolean	Returns: `true` if this patch modifies metadata about a file . hasMetaDataChanges() Whether this patch modifies metadata about a file
pack-priv static int	Returns: the number of "ancestor revisions" in the hunk header. A traditional two-way diff ("@@ -...") returns 1; a combined diff for a 3 way-merge returns 3. If this is not a hunk header, 0 is returned instead. isHunkHdr(byte[] the buffer to scan buf, int first position in the buffer to evaluate start, int last position to consider; usually the end of the buffer ( `buf.length`) or the first position on the next line. This is only used to avoid very long runs of '@' from killing the scan loop. end) Determine if this is a patch hunk header.
pack-priv HunkHeader	newHunkHeader(int offset)
private static String	p1(final String r)
pack-priv FileMode	parseFileMode(int ptr, int end)
pack-priv int	Returns: first character after the LF at the end of the line; -1 on error. parseGitFileName(int first character after the "diff --git " or "diff --cc " part. ptr, int one past the last position to parse. end) Parse a "diff --git" or "diff --cc" line.
pack-priv int	parseGitHeaders(int ptr, int end)
pack-priv void	parseIndexLine(int ptr, int end)
private String	parseName(String expect, int ptr, int end)
pack-priv void	parseNewFileMode(int ptr, int eol)
pack-priv void	parseNewName(int ptr, int eol)
pack-priv void	parseOldName(int ptr, int eol)
pack-priv int	parseTraditionalHeaders(int ptr, int end)
public EditList	Returns: a list describing the content edits performed on this file. toEditList() Convert to a list describing the content edits performed on this file.
private static boolean	trySimpleConversion(Charset[] charsetGuess)

Inherited from org.eclipse.jgit.diff.DiffEntry:: getChangeType getDiffAttribute getId getMode getNewId getNewMode getNewPath getOldId getOldMode getOldPath getPath getScore getTreeFilterMarks isMarked scan scan scan toString

Field Detail

buf	back to summary
pack-priv final byte[] buf Buffer holding the patch data for this file.

COPY_FROM	back to summary
private static final byte[] COPY_FROM

COPY_TO	back to summary
private static final byte[] COPY_TO

DELETED_FILE_MODE	back to summary
pack-priv static final byte[] DELETED_FILE_MODE

DISSIMILARITY_INDEX	back to summary
private static final byte[] DISSIMILARITY_INDEX

endOffset	back to summary
pack-priv int endOffset Position 1 past the end of this file within `buf`.

forwardBinaryHunk	back to summary
pack-priv BinaryHunk forwardBinaryHunk If `patchType` is `PatchType#GIT_BINARY`, the new image

hunks	back to summary
private List<HunkHeader> hunks The hunks of this file

INDEX	back to summary
pack-priv static final byte[] INDEX

NEW_FILE_MODE	back to summary
pack-priv static final byte[] NEW_FILE_MODE

NEW_MODE	back to summary
private static final byte[] NEW_MODE

NEW_NAME	back to summary
pack-priv static final byte[] NEW_NAME

OLD_MODE	back to summary
private static final byte[] OLD_MODE

OLD_NAME	back to summary
pack-priv static final byte[] OLD_NAME

patchType	back to summary
pack-priv FileHeader.PatchType patchType Type of patch used to modify this file

RENAME_FROM	back to summary
private static final byte[] RENAME_FROM

RENAME_NEW	back to summary
private static final byte[] RENAME_NEW

RENAME_OLD	back to summary
private static final byte[] RENAME_OLD

RENAME_TO	back to summary
private static final byte[] RENAME_TO

reverseBinaryHunk	back to summary
pack-priv BinaryHunk reverseBinaryHunk If `patchType` is `PatchType#GIT_BINARY`, the old image

SIMILARITY_INDEX	back to summary
private static final byte[] SIMILARITY_INDEX

startOffset	back to summary
pack-priv final int startOffset Offset within `buf` to the "diff ..." line.

Constructor Detail

FileHeader	back to summary
public FileHeader(byte[] headerLines, EditList edits, FileHeader.PatchType type) Constructs a new FileHeader Parameters headerLines:byte[] buffer holding the diff header for this file edits:EditList the edits for this file type:FileHeader.PatchType the type of patch used to modify this file

FileHeader

back to summary

public FileHeader(byte[] headerLines, EditList edits, FileHeader.PatchType type)

Constructs a new FileHeader

Parameters

headerLines:byte[]: buffer holding the diff header for this file
edits:EditList: the edits for this file
type:FileHeader.PatchType: the type of patch used to modify this file

FileHeader	back to summary
pack-priv FileHeader(byte[] b, int offset)

Method Detail

addHunk	back to summary
pack-priv void addHunk(HunkHeader h)

eq	back to summary
private boolean eq(int aPtr, int aEnd, int bPtr, int bEnd)

extractFileLines	back to summary
private String[] extractFileLines(Charset[] csGuess)

getBuffer	back to summary
public byte[] getBuffer() Get the byte array holding this file's patch script. Returns:byte[] the byte array holding this file's patch script.

getBuffer

back to summary

public byte[] getBuffer()

Get the byte array holding this file's patch script.

Returns:byte[]: the byte array holding this file's patch script.

getEndOffset	back to summary
public int getEndOffset() Get offset one past the end of the file script. Returns:int offset one past the end of the file script.

getEndOffset

back to summary

public int getEndOffset()

Get offset one past the end of the file script.

Returns:int: offset one past the end of the file script.

getForwardBinaryHunk back to summary

getForwardBinaryHunk	back to summary
public BinaryHunk getForwardBinaryHunk() Get the new-image delta/literal if this is a `PatchType#GIT_BINARY`. Returns:BinaryHunk the new-image delta/literal if this is a `PatchType#GIT_BINARY`.

public BinaryHunk getForwardBinaryHunk()

Get the new-image delta/literal if this is a PatchType#GIT_BINARY.

Returns:BinaryHunk: the new-image delta/literal if this is a PatchType#GIT_BINARY.

getHunks	back to summary
public List<? extends HunkHeader> getHunks() Get hunks altering this file; in order of appearance in patch Returns:List<? extends HunkHeader> hunks altering this file; in order of appearance in patch.

getHunks

back to summary

public List<? extends HunkHeader> getHunks()

Get hunks altering this file; in order of appearance in patch

Returns:List<? extends HunkHeader>: hunks altering this file; in order of appearance in patch.

getParentCount	back to summary
pack-priv int getParentCount()

getPatchType	back to summary
public FileHeader.PatchType getPatchType() Get style of patch used to modify this file. Returns:FileHeader.PatchType style of patch used to modify this file.

getPatchType

back to summary

public FileHeader.PatchType getPatchType()

Get style of patch used to modify this file.

Returns:FileHeader.PatchType: style of patch used to modify this file.

getReverseBinaryHunk back to summary

getReverseBinaryHunk	back to summary
public BinaryHunk getReverseBinaryHunk() Get the old-image delta/literal if this is a `PatchType#GIT_BINARY`. Returns:BinaryHunk the old-image delta/literal if this is a `PatchType#GIT_BINARY`.

public BinaryHunk getReverseBinaryHunk()

Get the old-image delta/literal if this is a PatchType#GIT_BINARY.

Returns:BinaryHunk: the old-image delta/literal if this is a PatchType#GIT_BINARY.

getScriptText back to summary

getScriptText	back to summary
public String getScriptText() Convert the patch script for this file into a string. The default character encoding (`java.nio.charset.StandardCharsets#UTF_8`) is assumed for both the old and new files. Returns:String the patch script, as a Unicode string.

public String getScriptText()

Convert the patch script for this file into a string.

The default character encoding (java.nio.charset.StandardCharsets#UTF_8) is assumed for both the old and new files.

Returns:String: the patch script, as a Unicode string.

getScriptText	back to summary
public String getScriptText(Charset oldCharset, Charset newCharset) Convert the patch script for this file into a string. Parameters oldCharset:Charset hint character set to decode the old lines with. newCharset:Charset hint character set to decode the new lines with. Returns:String the patch script, as a Unicode string.

getScriptText

back to summary

public String getScriptText(Charset oldCharset, Charset newCharset)

Convert the patch script for this file into a string.

Parameters

oldCharset:Charset: hint character set to decode the old lines with.
newCharset:Charset: hint character set to decode the new lines with.

Returns:String

the patch script, as a Unicode string.

getScriptText	back to summary
pack-priv String getScriptText(Charset[] charsetGuess) Convert the patch script for this file into a string. Parameters charsetGuess:Charset[] hint which charset is used Returns:String the patch script, as a Unicode string.

getScriptText

back to summary

pack-priv String getScriptText(Charset[] charsetGuess)

Convert the patch script for this file into a string.

Parameters

charsetGuess:Charset[]: hint which charset is used

Returns:String

the patch script, as a Unicode string.

getStartOffset back to summary

getStartOffset	back to summary
public int getStartOffset() Get offset of the start of this file's script in `getBuffer()`. Returns:int offset of the start of this file's script in `getBuffer()`.

public int getStartOffset()

Get offset of the start of this file's script in getBuffer().

Returns:int: offset of the start of this file's script in getBuffer().

hasMetaDataChanges back to summary

public boolean hasMetaDataChanges()

Whether this patch modifies metadata about a file

Returns:boolean: true if this patch modifies metadata about a file .

isHunkHdr back to summary

isHunkHdr	back to summary
pack-priv static int isHunkHdr(byte[] buf, int start, int end) Determine if this is a patch hunk header. Parameters buf:byte[] the buffer to scan start:int first position in the buffer to evaluate end:int last position to consider; usually the end of the buffer ( `buf.length`) or the first position on the next line. This is only used to avoid very long runs of '@' from killing the scan loop. Returns:int the number of "ancestor revisions" in the hunk header. A traditional two-way diff ("@@ -...") returns 1; a combined diff for a 3 way-merge returns 3. If this is not a hunk header, 0 is returned instead.

pack-priv static int isHunkHdr(byte[] buf, int start, int end)

Determine if this is a patch hunk header.

Parameters

buf:byte[]: the buffer to scan
start:int: first position in the buffer to evaluate
end:int: last position to consider; usually the end of the buffer ( buf.length) or the first position on the next line. This is only used to avoid very long runs of '@' from killing the scan loop.

Returns:int

the number of "ancestor revisions" in the hunk header. A traditional two-way diff ("@@ -...") returns 1; a combined diff for a 3 way-merge returns 3. If this is not a hunk header, 0 is returned instead.

newHunkHeader	back to summary
pack-priv HunkHeader newHunkHeader(int offset)

p1	back to summary
private static String p1(final String r)

parseFileMode	back to summary
pack-priv FileMode parseFileMode(int ptr, int end)

parseGitFileName	back to summary
pack-priv int parseGitFileName(int ptr, int end) Parse a "diff --git" or "diff --cc" line. Parameters ptr:int first character after the "diff --git " or "diff --cc " part. end:int one past the last position to parse. Returns:int first character after the LF at the end of the line; -1 on error.

parseGitFileName

back to summary

pack-priv int parseGitFileName(int ptr, int end)

Parse a "diff --git" or "diff --cc" line.

Parameters

ptr:int: first character after the "diff --git " or "diff --cc " part.
end:int: one past the last position to parse.

Returns:int

first character after the LF at the end of the line; -1 on error.

parseGitHeaders	back to summary
pack-priv int parseGitHeaders(int ptr, int end)

parseIndexLine	back to summary
pack-priv void parseIndexLine(int ptr, int end)

parseName	back to summary
private String parseName(String expect, int ptr, int end)

parseNewFileMode	back to summary
pack-priv void parseNewFileMode(int ptr, int eol)

parseNewName	back to summary
pack-priv void parseNewName(int ptr, int eol)

parseOldName	back to summary
pack-priv void parseOldName(int ptr, int eol)

parseTraditionalHeaders	back to summary
pack-priv int parseTraditionalHeaders(int ptr, int end)

toEditList

back to summary

public EditList toEditList()

Convert to a list describing the content edits performed on this file.

Returns:EditList: a list describing the content edits performed on this file.

trySimpleConversion	back to summary
private static boolean trySimpleConversion(Charset[] charsetGuess)

org.eclipse.jgit.patch back to summary

public final Enum FileHeader.PatchType

Class Inheritance

extends Enum<FileHeader.PatchType>

java.lang.Object
java.lang.Enum
org.eclipse.jgit.patch.FileHeader.PatchType

Type of patch used by this file.

Field Summary

Modifier and Type	Field and Description
public static final FileHeader.PatchType	BINARY An empty patch with a message "Binary files ...
public static final FileHeader.PatchType	GIT_BINARY A Git binary patch, holding pre and post image deltas
public static final FileHeader.PatchType	UNIFIED A traditional unified diff style patch of a text file.

Constructor Summary

Access	Constructor and Description
private	PatchType()

Method Summary

Modifier and Type	Method and Description
public static FileHeader.PatchType	valueOf(String name)
public static FileHeader.PatchType[]	values()

Inherited from java.lang.Enum:: clone compareTo describeConstable equals finalize getDeclaringClass hashCode name ordinal toString valueOf

Field Detail

BINARY	back to summary
public static final FileHeader.PatchType BINARY An empty patch with a message "Binary files ... differ"

GIT_BINARY	back to summary
public static final FileHeader.PatchType GIT_BINARY A Git binary patch, holding pre and post image deltas

UNIFIED	back to summary
public static final FileHeader.PatchType UNIFIED A traditional unified diff style patch of a text file.

Constructor Detail

PatchType	back to summary
private PatchType()

Method Detail

valueOf	back to summary
public static FileHeader.PatchType valueOf(String name)

values	back to summary
public static FileHeader.PatchType[] values()

public Class FileHeader

Nested and Inner Type Summary

Field Summary

Constructor Summary

Method Summary

Field Detail

Constructor Detail

Method Detail

public final Enum FileHeader.PatchType

Field Summary

Constructor Summary

Method Summary

Field Detail

Constructor Detail

Method Detail