java.lang.Object
org.eclipse.jgit.diff.DiffEntry
org.eclipse.jgit.patch.FileHeader
org.eclipse.jgit.patch.CombinedFileHeader
A file in the Git "diff --cc" or "diff --combined" format.
A combined diff shows an n-way comparison between two or more ancestors and the final revision. Its primary function is to perform code reviews on a merge which introduces changes not in any ancestor.
-
Nested Class Summary
Nested classes/interfaces inherited from class org.eclipse.jgit.patch.FileHeader
FileHeader.PatchType
Nested classes/interfaces inherited from class org.eclipse.jgit.diff.DiffEntry
DiffEntry.ChangeType, DiffEntry.Side
-
Field Summary
-
Method Summary
Modifier and TypeMethodDescriptionList<? extends CombinedHunkHeader>
getHunks()
Get hunks altering this file; in order of appearance in patchgetOldId()
Get the old object id from theindex
.getOldId
(int nthParent) Get the ObjectId of the nth ancestorGet the old file modegetOldMode
(int nthParent) Get the file mode of the nth ancestorint
getScriptText
(Charset[] charsetGuess) getScriptText
(Charset ocs, Charset ncs) Convert the patch script for this file into a string.protected void
parseIndexLine
(int ptr, int eol) protected void
parseNewFileMode
(int ptr, int eol) Methods inherited from class org.eclipse.jgit.patch.FileHeader
getBuffer, getEndOffset, getForwardBinaryHunk, getPatchType, getReverseBinaryHunk, getScriptText, getStartOffset, hasMetaDataChanges, toEditList
Methods inherited from class org.eclipse.jgit.diff.DiffEntry
getChangeType, getDiffAttribute, getId, getMode, getNewId, getNewMode, getNewPath, getOldPath, getPath, getScore, getTreeFilterMarks, isMarked, scan, scan, scan, toString
-
Method Details
-
getHunks
Description copied from class:FileHeader
Get hunks altering this file; in order of appearance in patch- Overrides:
getHunks
in classFileHeader
- Returns:
- hunks altering this file; in order of appearance in patch.
-
getParentCount
public int getParentCount()- Returns:
- number of ancestor revisions mentioned in this diff.
-
getOldMode
Get the old file mode- Overrides:
getOldMode
in classDiffEntry
- Returns:
- get the file mode of the first parent.
-
getOldMode
Get the file mode of the nth ancestor- Parameters:
nthParent
- the ancestor to get the mode of- Returns:
- the mode of the requested ancestor.
-
getOldId
Get the old object id from theindex
. -
getOldId
Get the ObjectId of the nth ancestor- Parameters:
nthParent
- the ancestor to get the object id of- Returns:
- the id of the requested ancestor.
-
getScriptText
Description copied from class:FileHeader
Convert the patch script for this file into a string.- Overrides:
getScriptText
in classFileHeader
- Parameters:
ocs
- hint character set to decode the old lines with.ncs
- hint character set to decode the new lines with.- Returns:
- the patch script, as a Unicode string.
-
getScriptText
-
parseIndexLine
protected void parseIndexLine(int ptr, int eol) -
parseNewFileMode
protected void parseNewFileMode(int ptr, int eol)
-