Class CombinedFileHeader


  • public class CombinedFileHeader
    extends FileHeader
    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.

    • Method Detail

      • getHunks

        public java.util.List<? extends CombinedHunkHeader> getHunks()
        Overrides:
        getHunks in class FileHeader
        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

        public FileMode getOldMode​(int nthParent)
        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

        public AbbreviatedObjectId getOldId​(int nthParent)
        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

        public java.lang.String getScriptText​(java.nio.charset.Charset ocs,
                                              java.nio.charset.Charset ncs)
        Description copied from class: FileHeader
        Convert the patch script for this file into a string.
        Overrides:
        getScriptText in class FileHeader
        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

        public java.lang.String getScriptText​(java.nio.charset.Charset[] charsetGuess)
        Convert the patch script for this file into a string.
        Parameters:
        charsetGuess - optional array to suggest the character set to use when decoding each file's line. If supplied the array must have a length of getParentCount() + 1 representing the old revision character sets and the new revision character set.
        Returns:
        the patch script, as a Unicode string.
      • parseIndexLine

        protected void parseIndexLine​(int ptr,
                                      int eol)
      • parseNewFileMode

        protected void parseNewFileMode​(int ptr,
                                        int eol)