public interface IDiff2Delegator
Modifier and Type | Method and Description |
---|---|
java.util.List<IFileDiff> |
getFileDiffs(IFileSpec file1,
IFileSpec file2,
java.lang.String branchSpecName,
DiffType diffType,
boolean quiet,
boolean includeNonTextDiffs,
boolean gnuDiffs)
Run diff on the Perforce server of two files in the depot.
|
java.util.List<IFileDiff> |
getFileDiffs(IFileSpec file1,
IFileSpec file2,
java.lang.String branchSpecName,
GetFileDiffsOptions opts)
Run diff on the Perforce server of two files in the depot.
|
java.io.InputStream |
getFileDiffsStream(IFileSpec file1,
IFileSpec file2,
java.lang.String branchSpecName,
GetFileDiffsOptions opts)
Run diff on the Perforce server of two files in the depot.
|
java.io.InputStream |
getServerFileDiffs(IFileSpec file1,
IFileSpec file2,
java.lang.String branchSpecName,
DiffType diffType,
boolean quiet,
boolean includeNonTextDiffs,
boolean gnuDiffs)
Run diff on the Perforce server of two files in the depot.
|
java.util.List<IFileDiff> getFileDiffs(IFileSpec file1, IFileSpec file2, java.lang.String branchSpecName, GetFileDiffsOptions opts) throws P4JavaException
With a branch view, fromFile and toFile are optional; fromFile limits the scope of the source file set, and toFile limits the scope of the target. If only one file argument is given, it is assumed to be toFile.
This method corresponds closely to the standard diff2 command, and that command's documentation should be consulted for the overall and detailed semantics.
file1
- (optional, with a branch view) source file IFileSpecfile2
- (optional, with a branch view) target file IFileSpecbranchSpecName
- optional branch spec nameopts
- GetFileDiffsOptions object describing optional parameters; if null, no
options are set.P4JavaException
- if an error occurs processing this method and its parameters.java.util.List<IFileDiff> getFileDiffs(IFileSpec file1, IFileSpec file2, java.lang.String branchSpecName, DiffType diffType, boolean quiet, boolean includeNonTextDiffs, boolean gnuDiffs) throws ConnectionException, RequestException, AccessException
This method corresponds closely to the standard diff2 command, and that command's documentation should be consulted for the overall and detailed semantics. In particular, the various potentially-valid combinations of branch spec and file specs can be complicated and won't be repeated here.
file1
- optional first file IFileSpecfile2
- optional second file IFileSpecbranchSpecName
- optional branch spec namediffType
- diff typequiet
- if true, suppresses the display of the header lines of files
whose content and types are identical and suppresses the
actual diff for all files.includeNonTextDiffs
- if true, forces 'p4 diff2' to diff even files with non-text
(binary) typesgnuDiffs
- see "-u" option in the main diff2 documentation.ConnectionException
- if the Perforce server is unreachable or is not connected.RequestException
- if the Perforce server encounters an error during its
processing of the requestAccessException
- if the Perforce server denies access to the callerjava.io.InputStream getFileDiffsStream(IFileSpec file1, IFileSpec file2, java.lang.String branchSpecName, GetFileDiffsOptions opts) throws P4JavaException
With a branch view, fromFile and toFile are optional; fromFile limits the scope of the source file set, and toFile limits the scope of the target. If only one file argument is given, it is assumed to be toFile.
This method corresponds closely to the standard diff2 command, and that command's documentation should be consulted for the overall and detailed semantics.
As with other streams-based IServer methods, callers should ensure that the stream returned here is always explicitly closed after use; if not closed, the stream's associated temporary files managed by P4Java (if they exist) may not be properly deleted.
file1
- (optional, with a branch view) source file IFileSpecfile2
- (optional, with a branch view) target file IFileSpecbranchSpecName
- optional branch spec nameopts
- GetFileDiffsOptions object describing optional parameters; if null, no
options are set.P4JavaException
- if an error occurs processing this method and its parameters.java.io.InputStream getServerFileDiffs(IFileSpec file1, IFileSpec file2, java.lang.String branchSpecName, DiffType diffType, boolean quiet, boolean includeNonTextDiffs, boolean gnuDiffs) throws ConnectionException, RequestException, AccessException
This method corresponds closely to the standard diff2 command, and that command's documentation should be consulted for the overall and detailed semantics. In particular, the various potentially-valid combinations of branch spec and file specs can be complicated and won't be repeated here.
As with other streams-based IServer methods, callers should ensure that the stream returned here is always explicitly closed after use; if not closed, the stream's associated temporary files managed by P4Java (if they exist) may not be properly deleted.
file1
- optional first file IFileSpecfile2
- optional second file IFileSpecbranchSpecName
- optional branch spec namediffType
- diff typequiet
- if true, suppresses the display of the header lines of files
whose content and types are identical and suppresses the
actual diff for all files.includeNonTextDiffs
- if true, forces 'p4 diff2' to diff even files with non-text
(binary) typesgnuDiffs
- see "-u" option in the main diff2 documentation.ConnectionException
- if the Perforce server is unreachable or is not connected.RequestException
- if the Perforce server encounters an error during its
processing of the requestAccessException
- if the Perforce server denies access to the caller