<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> <!--NewPage--> <HTML> <HEAD> <!-- Generated by javadoc (build 1.6.0_06) on Tue Nov 30 14:45:46 PST 2010 --> <TITLE> Diff2Task (P4Ant) </TITLE> <META NAME="date" CONTENT="2010-11-30"> <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style"> <SCRIPT type="text/javascript"> function windowTitle() { if (location.href.indexOf('is-external=true') == -1) { parent.document.title="Diff2Task (P4Ant)"; } } </SCRIPT> <NOSCRIPT> </NOSCRIPT> </HEAD> <BODY BGCOLOR="white" onload="windowTitle();"> <HR> <!-- ========= START OF TOP NAVBAR ======= --> <A NAME="navbar_top"><!-- --></A> <A HREF="#skip-navbar_top" title="Skip navigation links"></A> <TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY=""> <TR> <TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A NAME="navbar_top_firstrow"><!-- --></A> <TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY=""> <TR ALIGN="center" VALIGN="top"> <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD> <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD> <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT> </TD> <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="class-use/Diff2Task.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A> </TD> <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A> </TD> <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD> <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A> </TD> <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD> </TR> </TABLE> </TD> <TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM> </EM> </TD> </TR> <TR> <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2"> <A HREF="../../../../../com/perforce/p4java/ant/tasks/DeleteTask.html" title="class in com.perforce.p4java.ant.tasks"><B>PREV CLASS</B></A> <A HREF="../../../../../com/perforce/p4java/ant/tasks/EditTask.html" title="class in com.perforce.p4java.ant.tasks"><B>NEXT CLASS</B></A></FONT></TD> <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2"> <A HREF="../../../../../index.html?com/perforce/p4java/ant/tasks/Diff2Task.html" target="_top"><B>FRAMES</B></A> <A HREF="Diff2Task.html" target="_top"><B>NO FRAMES</B></A> <SCRIPT type="text/javascript"> <!-- if(window==top) { document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>'); } //--> </SCRIPT> <NOSCRIPT> <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A> </NOSCRIPT> </FONT></TD> </TR> <TR> <TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2"> SUMMARY: <A HREF="#nested_classes_inherited_from_class_com.perforce.p4java.ant.tasks.ServerTask">NESTED</A> | <A HREF="#field_summary">FIELD</A> | <A HREF="#constructor_summary">CONSTR</A> | <A HREF="#method_summary">METHOD</A></FONT></TD> <TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2"> DETAIL: <A HREF="#field_detail">FIELD</A> | <A HREF="#constructor_detail">CONSTR</A> | <A HREF="#method_detail">METHOD</A></FONT></TD> </TR> </TABLE> <A NAME="skip-navbar_top"></A> <!-- ========= END OF TOP NAVBAR ========= --> <HR> <!-- ======== START OF CLASS DATA ======== --> <H2> <FONT SIZE="-1"> com.perforce.p4java.ant.tasks</FONT> <BR> Class Diff2Task</H2> <PRE> java.lang.Object <IMG SRC="../../../../../resources/inherit.gif" ALT="extended by ">org.apache.tools.ant.ProjectComponent <IMG SRC="../../../../../resources/inherit.gif" ALT="extended by ">org.apache.tools.ant.Task <IMG SRC="../../../../../resources/inherit.gif" ALT="extended by "><A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html" title="class in com.perforce.p4java.ant.tasks">com.perforce.p4java.ant.tasks.PerforceTask</A> <IMG SRC="../../../../../resources/inherit.gif" ALT="extended by "><A HREF="../../../../../com/perforce/p4java/ant/tasks/ServerTask.html" title="class in com.perforce.p4java.ant.tasks">com.perforce.p4java.ant.tasks.ServerTask</A> <IMG SRC="../../../../../resources/inherit.gif" ALT="extended by "><A HREF="../../../../../com/perforce/p4java/ant/tasks/ClientTask.html" title="class in com.perforce.p4java.ant.tasks">com.perforce.p4java.ant.tasks.ClientTask</A> <IMG SRC="../../../../../resources/inherit.gif" ALT="extended by "><B>com.perforce.p4java.ant.tasks.Diff2Task</B> </PRE> <DL> <DT><B>All Implemented Interfaces:</B> <DD>java.lang.Cloneable</DD> </DL> <HR> <DL> <DT><PRE>public class <B>Diff2Task</B><DT>extends <A HREF="../../../../../com/perforce/p4java/ant/tasks/ClientTask.html" title="class in com.perforce.p4java.ant.tasks">ClientTask</A></DL> </PRE> <P> Run diff (on the server) of two files in the depot. Both files may optionally include a revision specification; the default is to compare the head revision. Wildcards may be used, but they must match between file1 and file2. Note if using clients or labels as file arguments they must be preceded with a file path e.g. //...@mylabel //...@yourlabel.</p> <P> <P> <DL> <DT><B>See Also:</B><DD><A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html" title="class in com.perforce.p4java.ant.tasks"><CODE>PerforceTask</CODE></A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/ServerTask.html" title="class in com.perforce.p4java.ant.tasks"><CODE>ServerTask</CODE></A></DL> <HR> <P> <!-- ======== NESTED CLASS SUMMARY ======== --> <A NAME="nested_class_summary"><!-- --></A> <TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY=""> <TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor"> <TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2"> <B>Nested Class Summary</B></FONT></TH> </TR> </TABLE> <A NAME="nested_classes_inherited_from_class_com.perforce.p4java.ant.tasks.ServerTask"><!-- --></A> <TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY=""> <TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor"> <TH ALIGN="left"><B>Nested classes/interfaces inherited from class com.perforce.p4java.ant.tasks.<A HREF="../../../../../com/perforce/p4java/ant/tasks/ServerTask.html" title="class in com.perforce.p4java.ant.tasks">ServerTask</A></B></TH> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD><CODE><A HREF="../../../../../com/perforce/p4java/ant/tasks/ServerTask.GlobalOption.html" title="class in com.perforce.p4java.ant.tasks">ServerTask.GlobalOption</A></CODE></TD> </TR> </TABLE> <A NAME="nested_classes_inherited_from_class_com.perforce.p4java.ant.tasks.PerforceTask"><!-- --></A> <TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY=""> <TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor"> <TH ALIGN="left"><B>Nested classes/interfaces inherited from class com.perforce.p4java.ant.tasks.<A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html" title="class in com.perforce.p4java.ant.tasks">PerforceTask</A></B></TH> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD><CODE><A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.Field.html" title="class in com.perforce.p4java.ant.tasks">PerforceTask.Field</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.File.html" title="class in com.perforce.p4java.ant.tasks">PerforceTask.File</A></CODE></TD> </TR> </TABLE> <!-- =========== FIELD SUMMARY =========== --> <A NAME="field_summary"><!-- --></A> <TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY=""> <TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor"> <TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2"> <B>Field Summary</B></FONT></TH> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> <CODE>protected java.lang.String</CODE></FONT></TD> <TD><CODE><B><A HREF="../../../../../com/perforce/p4java/ant/tasks/Diff2Task.html#branch">branch</A></B></CODE> <BR> If not null, it causes diff2 to use the branch view to specify the pairs of files to compare.</TD> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> <CODE>protected int</CODE></FONT></TD> <TD><CODE><B><A HREF="../../../../../com/perforce/p4java/ant/tasks/Diff2Task.html#diffContext">diffContext</A></B></CODE> <BR> If positive, specifies the number of context diff lines; if zero, lets server pick context number; if negative, no options are generated.</TD> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> <CODE>protected java.lang.String</CODE></FONT></TD> <TD><CODE><B><A HREF="../../../../../com/perforce/p4java/ant/tasks/Diff2Task.html#file1">file1</A></B></CODE> <BR> The first depot file and revision specifier for diff2.</TD> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> <CODE>protected IFileSpec</CODE></FONT></TD> <TD><CODE><B><A HREF="../../../../../com/perforce/p4java/ant/tasks/Diff2Task.html#file1FileSpec">file1FileSpec</A></B></CODE> <BR> Left depot file and revision specifier used as input for this Perforce command.</TD> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> <CODE>protected java.lang.String</CODE></FONT></TD> <TD><CODE><B><A HREF="../../../../../com/perforce/p4java/ant/tasks/Diff2Task.html#file2">file2</A></B></CODE> <BR> The second depot file and revision specifier for diff2.</TD> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> <CODE>protected IFileSpec</CODE></FONT></TD> <TD><CODE><B><A HREF="../../../../../com/perforce/p4java/ant/tasks/Diff2Task.html#file2FileSpec">file2FileSpec</A></B></CODE> <BR> Right depot file and revision specifier used as input for this Perforce command.</TD> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> <CODE>protected boolean</CODE></FONT></TD> <TD><CODE><B><A HREF="../../../../../com/perforce/p4java/ant/tasks/Diff2Task.html#ignoreLineEndings">ignoreLineEndings</A></B></CODE> <BR> If true, ignore line endings; corresponds to -dl.</TD> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> <CODE>protected boolean</CODE></FONT></TD> <TD><CODE><B><A HREF="../../../../../com/perforce/p4java/ant/tasks/Diff2Task.html#ignoreWhitespace">ignoreWhitespace</A></B></CODE> <BR> If true, ignore whitespace; corresponds to -dw.</TD> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> <CODE>protected boolean</CODE></FONT></TD> <TD><CODE><B><A HREF="../../../../../com/perforce/p4java/ant/tasks/Diff2Task.html#ignoreWhitespaceChanges">ignoreWhitespaceChanges</A></B></CODE> <BR> If true, ignore whitespace changes; corresponds to -db.</TD> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> <CODE>protected boolean</CODE></FONT></TD> <TD><CODE><B><A HREF="../../../../../com/perforce/p4java/ant/tasks/Diff2Task.html#includeNonTextDiffs">includeNonTextDiffs</A></B></CODE> <BR> If true, diff even files with non-text (binary) types.</TD> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> <CODE>protected boolean</CODE></FONT></TD> <TD><CODE><B><A HREF="../../../../../com/perforce/p4java/ant/tasks/Diff2Task.html#quiet">quiet</A></B></CODE> <BR> 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.</TD> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> <CODE>protected boolean</CODE></FONT></TD> <TD><CODE><B><A HREF="../../../../../com/perforce/p4java/ant/tasks/Diff2Task.html#rcsDiffs">rcsDiffs</A></B></CODE> <BR> If true, use RCS diff; corresponds to -dn.</TD> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> <CODE>protected java.util.List<IFileDiff></CODE></FONT></TD> <TD><CODE><B><A HREF="../../../../../com/perforce/p4java/ant/tasks/Diff2Task.html#retFileDiffs">retFileDiffs</A></B></CODE> <BR> Collection of file diffs returned from the Perforce command.</TD> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> <CODE>protected boolean</CODE></FONT></TD> <TD><CODE><B><A HREF="../../../../../com/perforce/p4java/ant/tasks/Diff2Task.html#summaryDiff">summaryDiff</A></B></CODE> <BR> If true, perform summary diff; corresponds to -ds.</TD> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> <CODE>protected int</CODE></FONT></TD> <TD><CODE><B><A HREF="../../../../../com/perforce/p4java/ant/tasks/Diff2Task.html#unifiedDiff">unifiedDiff</A></B></CODE> <BR> If true, do a unified diff; corresponds to -du[n] with -du generated for unifiedDiff == 0, -dun for unifiedDiff > 0, where "n" is of course the value of unifiedDiff.</TD> </TR> </TABLE> <A NAME="fields_inherited_from_class_com.perforce.p4java.ant.tasks.ClientTask"><!-- --></A> <TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY=""> <TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor"> <TH ALIGN="left"><B>Fields inherited from class com.perforce.p4java.ant.tasks.<A HREF="../../../../../com/perforce/p4java/ant/tasks/ClientTask.html" title="class in com.perforce.p4java.ant.tasks">ClientTask</A></B></TH> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD><CODE><A HREF="../../../../../com/perforce/p4java/ant/tasks/ClientTask.html#p4Client">p4Client</A></CODE></TD> </TR> </TABLE> <A NAME="fields_inherited_from_class_com.perforce.p4java.ant.tasks.ServerTask"><!-- --></A> <TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY=""> <TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor"> <TH ALIGN="left"><B>Fields inherited from class com.perforce.p4java.ant.tasks.<A HREF="../../../../../com/perforce/p4java/ant/tasks/ServerTask.html" title="class in com.perforce.p4java.ant.tasks">ServerTask</A></B></TH> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD><CODE><A HREF="../../../../../com/perforce/p4java/ant/tasks/ServerTask.html#allHosts">allHosts</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/ServerTask.html#commandOptions">commandOptions</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/ServerTask.html#globaloptions">globaloptions</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/ServerTask.html#hostName">hostName</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/ServerTask.html#P4_SERVER_PROTOCOL_PROPERTIES_FILE">P4_SERVER_PROTOCOL_PROPERTIES_FILE</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/ServerTask.html#P4_SERVER_USAGE_PROPERTIES_FILE">P4_SERVER_USAGE_PROPERTIES_FILE</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/ServerTask.html#p4Server">p4Server</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/ServerTask.html#programName">programName</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/ServerTask.html#programVersion">programVersion</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/ServerTask.html#protocolPropertiesFile">protocolPropertiesFile</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/ServerTask.html#protocolProps">protocolProps</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/ServerTask.html#textLanguage">textLanguage</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/ServerTask.html#unsetClientName">unsetClientName</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/ServerTask.html#unsetUserName">unsetUserName</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/ServerTask.html#usagePropertiesFile">usagePropertiesFile</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/ServerTask.html#usageProps">usageProps</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/ServerTask.html#workingDirectory">workingDirectory</A></CODE></TD> </TR> </TABLE> <A NAME="fields_inherited_from_class_com.perforce.p4java.ant.tasks.PerforceTask"><!-- --></A> <TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY=""> <TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor"> <TH ALIGN="left"><B>Fields inherited from class com.perforce.p4java.ant.tasks.<A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html" title="class in com.perforce.p4java.ant.tasks">PerforceTask</A></B></TH> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD><CODE><A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#charset">charset</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#client">client</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#failOnError">failOnError</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#fields">fields</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#FILE_TOKEN_REGEX_PATTERN">FILE_TOKEN_REGEX_PATTERN</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#fileList">fileList</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#files">files</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#fileSpecs">fileSpecs</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#LINE_PADDING">LINE_PADDING</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#LINE_SEPARATOR">LINE_SEPARATOR</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#p4Messages">p4Messages</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#passwd">passwd</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#port">port</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#protocol">protocol</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#retFileSpecs">retFileSpecs</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#retStatusMessage">retStatusMessage</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#user">user</A></CODE></TD> </TR> </TABLE> <A NAME="fields_inherited_from_class_org.apache.tools.ant.Task"><!-- --></A> <TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY=""> <TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor"> <TH ALIGN="left"><B>Fields inherited from class org.apache.tools.ant.Task</B></TH> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD><CODE>target, taskName, taskType, wrapper</CODE></TD> </TR> </TABLE> <A NAME="fields_inherited_from_class_org.apache.tools.ant.ProjectComponent"><!-- --></A> <TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY=""> <TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor"> <TH ALIGN="left"><B>Fields inherited from class org.apache.tools.ant.ProjectComponent</B></TH> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD><CODE>description, location, project</CODE></TD> </TR> </TABLE> <!-- ======== CONSTRUCTOR SUMMARY ======== --> <A NAME="constructor_summary"><!-- --></A> <TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY=""> <TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor"> <TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2"> <B>Constructor Summary</B></FONT></TH> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD><CODE><B><A HREF="../../../../../com/perforce/p4java/ant/tasks/Diff2Task.html#Diff2Task()">Diff2Task</A></B>()</CODE> <BR> Default constructor.</TD> </TR> </TABLE> <!-- ========== METHOD SUMMARY =========== --> <A NAME="method_summary"><!-- --></A> <TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY=""> <TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor"> <TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2"> <B>Method Summary</B></FONT></TH> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> <CODE>protected void</CODE></FONT></TD> <TD><CODE><B><A HREF="../../../../../com/perforce/p4java/ant/tasks/Diff2Task.html#execP4Command()">execP4Command</A></B>()</CODE> <BR> Execute the Perforce diff2 command with file spec 1, file spec 2, branch and options.</TD> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> <CODE> IFileSpec</CODE></FONT></TD> <TD><CODE><B><A HREF="../../../../../com/perforce/p4java/ant/tasks/Diff2Task.html#getFile1FileSpec()">getFile1FileSpec</A></B>()</CODE> <BR> Gets the file1 file spec.</TD> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> <CODE> IFileSpec</CODE></FONT></TD> <TD><CODE><B><A HREF="../../../../../com/perforce/p4java/ant/tasks/Diff2Task.html#getFile2FileSpec()">getFile2FileSpec</A></B>()</CODE> <BR> Gets the file2 file spec.</TD> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> <CODE> java.util.List<IFileDiff></CODE></FONT></TD> <TD><CODE><B><A HREF="../../../../../com/perforce/p4java/ant/tasks/Diff2Task.html#getRetFileDiffs()">getRetFileDiffs</A></B>()</CODE> <BR> Gets the ret file diffs.</TD> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> <CODE> void</CODE></FONT></TD> <TD><CODE><B><A HREF="../../../../../com/perforce/p4java/ant/tasks/Diff2Task.html#setBranch(java.lang.String)">setBranch</A></B>(java.lang.String branch)</CODE> <BR> Sets the branch.</TD> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> <CODE> void</CODE></FONT></TD> <TD><CODE><B><A HREF="../../../../../com/perforce/p4java/ant/tasks/Diff2Task.html#setDiffContext(int)">setDiffContext</A></B>(int diffContext)</CODE> <BR> Sets the diff context.</TD> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> <CODE> void</CODE></FONT></TD> <TD><CODE><B><A HREF="../../../../../com/perforce/p4java/ant/tasks/Diff2Task.html#setFile1(java.lang.String)">setFile1</A></B>(java.lang.String file1)</CODE> <BR> Sets the file1.</TD> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> <CODE> void</CODE></FONT></TD> <TD><CODE><B><A HREF="../../../../../com/perforce/p4java/ant/tasks/Diff2Task.html#setFile2(java.lang.String)">setFile2</A></B>(java.lang.String file2)</CODE> <BR> Sets the file2.</TD> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> <CODE> void</CODE></FONT></TD> <TD><CODE><B><A HREF="../../../../../com/perforce/p4java/ant/tasks/Diff2Task.html#setGnuDiffs(boolean)">setGnuDiffs</A></B>(boolean gnuDiffs)</CODE> <BR> Sets the gnu diffs.</TD> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> <CODE> void</CODE></FONT></TD> <TD><CODE><B><A HREF="../../../../../com/perforce/p4java/ant/tasks/Diff2Task.html#setIgnoreLineEndings(boolean)">setIgnoreLineEndings</A></B>(boolean ignoreLineEndings)</CODE> <BR> Sets the ignore line endings.</TD> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> <CODE> void</CODE></FONT></TD> <TD><CODE><B><A HREF="../../../../../com/perforce/p4java/ant/tasks/Diff2Task.html#setIgnoreWhitespace(boolean)">setIgnoreWhitespace</A></B>(boolean ignoreWhitespace)</CODE> <BR> Sets the ignore whitespace.</TD> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> <CODE> void</CODE></FONT></TD> <TD><CODE><B><A HREF="../../../../../com/perforce/p4java/ant/tasks/Diff2Task.html#setIgnoreWhitespaceChanges(boolean)">setIgnoreWhitespaceChanges</A></B>(boolean ignoreWhitespaceChanges)</CODE> <BR> Sets the ignore whitespace changes.</TD> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> <CODE> void</CODE></FONT></TD> <TD><CODE><B><A HREF="../../../../../com/perforce/p4java/ant/tasks/Diff2Task.html#setIncludeNonTextDiffs(boolean)">setIncludeNonTextDiffs</A></B>(boolean includeNonTextDiffs)</CODE> <BR> Sets the include non text diffs.</TD> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> <CODE> void</CODE></FONT></TD> <TD><CODE><B><A HREF="../../../../../com/perforce/p4java/ant/tasks/Diff2Task.html#setQuiet(boolean)">setQuiet</A></B>(boolean quiet)</CODE> <BR> Sets the quiet.</TD> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> <CODE> void</CODE></FONT></TD> <TD><CODE><B><A HREF="../../../../../com/perforce/p4java/ant/tasks/Diff2Task.html#setRcsDiffs(boolean)">setRcsDiffs</A></B>(boolean rcsDiffs)</CODE> <BR> Sets the rcs diffs.</TD> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> <CODE> void</CODE></FONT></TD> <TD><CODE><B><A HREF="../../../../../com/perforce/p4java/ant/tasks/Diff2Task.html#setSummaryDiff(boolean)">setSummaryDiff</A></B>(boolean summaryDiff)</CODE> <BR> Sets the summary diff.</TD> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> <CODE> void</CODE></FONT></TD> <TD><CODE><B><A HREF="../../../../../com/perforce/p4java/ant/tasks/Diff2Task.html#setUnifiedDiff(int)">setUnifiedDiff</A></B>(int unifiedDiff)</CODE> <BR> Sets the unified diff.</TD> </TR> </TABLE> <A NAME="methods_inherited_from_class_com.perforce.p4java.ant.tasks.ClientTask"><!-- --></A> <TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY=""> <TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor"> <TH ALIGN="left"><B>Methods inherited from class com.perforce.p4java.ant.tasks.<A HREF="../../../../../com/perforce/p4java/ant/tasks/ClientTask.html" title="class in com.perforce.p4java.ant.tasks">ClientTask</A></B></TH> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD><CODE><A HREF="../../../../../com/perforce/p4java/ant/tasks/ClientTask.html#cleanupP4()">cleanupP4</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/ClientTask.html#getP4Client()">getP4Client</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/ClientTask.html#initP4()">initP4</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/ClientTask.html#setP4Client(IClient)">setP4Client</A></CODE></TD> </TR> </TABLE> <A NAME="methods_inherited_from_class_com.perforce.p4java.ant.tasks.ServerTask"><!-- --></A> <TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY=""> <TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor"> <TH ALIGN="left"><B>Methods inherited from class com.perforce.p4java.ant.tasks.<A HREF="../../../../../com/perforce/p4java/ant/tasks/ServerTask.html" title="class in com.perforce.p4java.ant.tasks">ServerTask</A></B></TH> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD><CODE><A HREF="../../../../../com/perforce/p4java/ant/tasks/ServerTask.html#cleanupP4Server()">cleanupP4Server</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/ServerTask.html#createGlobalOption()">createGlobalOption</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/ServerTask.html#getGlobalOptions()">getGlobalOptions</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/ServerTask.html#getP4Server()">getP4Server</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/ServerTask.html#initP4Server()">initP4Server</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/ServerTask.html#initP4ServerOptions()">initP4ServerOptions</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/ServerTask.html#setAllHosts(boolean)">setAllHosts</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/ServerTask.html#setHostName(java.lang.String)">setHostName</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/ServerTask.html#setP4Server(IOptionsServer)">setP4Server</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/ServerTask.html#setProgramName(java.lang.String)">setProgramName</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/ServerTask.html#setProgramVersion(java.lang.String)">setProgramVersion</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/ServerTask.html#setProtocolPropertiesFile(java.lang.String)">setProtocolPropertiesFile</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/ServerTask.html#setProtocolProps(java.util.Properties)">setProtocolProps</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/ServerTask.html#setTextLanguage(java.lang.String)">setTextLanguage</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/ServerTask.html#setUnsetClientName(java.lang.String)">setUnsetClientName</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/ServerTask.html#setUnsetUserName(java.lang.String)">setUnsetUserName</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/ServerTask.html#setUsagePropertiesFile(java.lang.String)">setUsagePropertiesFile</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/ServerTask.html#setUsageProps(java.util.Properties)">setUsageProps</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/ServerTask.html#setWorkingDirectory(java.lang.String)">setWorkingDirectory</A></CODE></TD> </TR> </TABLE> <A NAME="methods_inherited_from_class_com.perforce.p4java.ant.tasks.PerforceTask"><!-- --></A> <TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY=""> <TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor"> <TH ALIGN="left"><B>Methods inherited from class com.perforce.p4java.ant.tasks.<A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html" title="class in com.perforce.p4java.ant.tasks">PerforceTask</A></B></TH> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD><CODE><A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#addFileset(org.apache.tools.ant.types.FileSet)">addFileset</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#createField()">createField</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#createFile()">createFile</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#execute()">execute</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#getFields()">getFields</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#getFiles()">getFiles</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#getFileSpecs()">getFileSpecs</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#getRetFileSpecs()">getRetFileSpecs</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#getRetStatusMessage()">getRetStatusMessage</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#init()">init</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#isEmpty(java.lang.String)">isEmpty</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#logChangelistSummaries(java.util.List)">logChangelistSummaries</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#logChangelistSummary(IChangelistSummary)">logChangelistSummary</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#logExtendedFileSpec(IExtendedFileSpec)">logExtendedFileSpec</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#logExtendedFileSpecs(java.util.List)">logExtendedFileSpecs</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#logFileDiff(IFileDiff)">logFileDiff</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#logFileDiffs(java.util.List)">logFileDiffs</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#logFileLineMatch(IFileLineMatch)">logFileLineMatch</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#logFileLineMatches(java.util.List)">logFileLineMatches</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#logFileSpec(IFileSpec)">logFileSpec</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#logFileSpecs(java.util.List)">logFileSpecs</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#logFix(IFix)">logFix</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#logFixes(java.util.List)">logFixes</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#logJob(IJob)">logJob</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#logJobs(java.util.List)">logJobs</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#parseChangelist(java.lang.String)">parseChangelist</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#setCharset(java.lang.String)">setCharset</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#setClient(java.lang.String)">setClient</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#setFailOnError(boolean)">setFailOnError</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#setFiles(java.lang.String)">setFiles</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#setPasswd(java.lang.String)">setPasswd</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#setPort(java.lang.String)">setPort</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#setProtocol(java.lang.String)">setProtocol</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#setUser(java.lang.String)">setUser</A></CODE></TD> </TR> </TABLE> <A NAME="methods_inherited_from_class_org.apache.tools.ant.Task"><!-- --></A> <TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY=""> <TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor"> <TH ALIGN="left"><B>Methods inherited from class org.apache.tools.ant.Task</B></TH> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD><CODE>bindToOwner, getOwningTarget, getRuntimeConfigurableWrapper, getTaskName, getTaskType, getWrapper, handleErrorFlush, handleErrorOutput, handleFlush, handleInput, handleOutput, isInvalid, log, log, log, log, maybeConfigure, perform, reconfigure, setOwningTarget, setRuntimeConfigurableWrapper, setTaskName, setTaskType</CODE></TD> </TR> </TABLE> <A NAME="methods_inherited_from_class_org.apache.tools.ant.ProjectComponent"><!-- --></A> <TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY=""> <TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor"> <TH ALIGN="left"><B>Methods inherited from class org.apache.tools.ant.ProjectComponent</B></TH> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD><CODE>clone, getDescription, getLocation, getProject, setDescription, setLocation, setProject</CODE></TD> </TR> </TABLE> <A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A> <TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY=""> <TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor"> <TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD><CODE>equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD> </TR> </TABLE> <P> <!-- ============ FIELD DETAIL =========== --> <A NAME="field_detail"><!-- --></A> <TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY=""> <TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor"> <TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2"> <B>Field Detail</B></FONT></TH> </TR> </TABLE> <A NAME="file1"><!-- --></A><H3> file1</H3> <PRE> protected java.lang.String <B>file1</B></PRE> <DL> <DD>The first depot file and revision specifier for diff2. <P> <DL> </DL> </DL> <HR> <A NAME="file2"><!-- --></A><H3> file2</H3> <PRE> protected java.lang.String <B>file2</B></PRE> <DL> <DD>The second depot file and revision specifier for diff2. <P> <DL> </DL> </DL> <HR> <A NAME="branch"><!-- --></A><H3> branch</H3> <PRE> protected java.lang.String <B>branch</B></PRE> <DL> <DD>If not null, it causes diff2 to use the branch view to specify the pairs of files to compare. If file arguments are also present, they can further limit the files and specify the revisions for comparison. Note that if only one file is given, it restricts the right-hand side of the branch view. <P> <DL> </DL> </DL> <HR> <A NAME="quiet"><!-- --></A><H3> quiet</H3> <PRE> protected boolean <B>quiet</B></PRE> <DL> <DD>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. Corresponds to the -q flag. <P> <DL> </DL> </DL> <HR> <A NAME="includeNonTextDiffs"><!-- --></A><H3> includeNonTextDiffs</H3> <PRE> protected boolean <B>includeNonTextDiffs</B></PRE> <DL> <DD>If true, diff even files with non-text (binary) types. Corresponds to the -t flag. <P> <DL> </DL> </DL> <HR> <A NAME="rcsDiffs"><!-- --></A><H3> rcsDiffs</H3> <PRE> protected boolean <B>rcsDiffs</B></PRE> <DL> <DD>If true, use RCS diff; corresponds to -dn. <P> <DL> </DL> </DL> <HR> <A NAME="diffContext"><!-- --></A><H3> diffContext</H3> <PRE> protected int <B>diffContext</B></PRE> <DL> <DD>If positive, specifies the number of context diff lines; if zero, lets server pick context number; if negative, no options are generated. Corresponds to -dc[n], with -dc generated for diffContext == 0, -dcn for diffContext > 0, where "n" is of course the value of diffContext. <P> <DL> </DL> </DL> <HR> <A NAME="summaryDiff"><!-- --></A><H3> summaryDiff</H3> <PRE> protected boolean <B>summaryDiff</B></PRE> <DL> <DD>If true, perform summary diff; corresponds to -ds. <P> <DL> </DL> </DL> <HR> <A NAME="unifiedDiff"><!-- --></A><H3> unifiedDiff</H3> <PRE> protected int <B>unifiedDiff</B></PRE> <DL> <DD>If true, do a unified diff; corresponds to -du[n] with -du generated for unifiedDiff == 0, -dun for unifiedDiff > 0, where "n" is of course the value of unifiedDiff. <P> <DL> </DL> </DL> <HR> <A NAME="ignoreWhitespaceChanges"><!-- --></A><H3> ignoreWhitespaceChanges</H3> <PRE> protected boolean <B>ignoreWhitespaceChanges</B></PRE> <DL> <DD>If true, ignore whitespace changes; corresponds to -db. <P> <DL> </DL> </DL> <HR> <A NAME="ignoreWhitespace"><!-- --></A><H3> ignoreWhitespace</H3> <PRE> protected boolean <B>ignoreWhitespace</B></PRE> <DL> <DD>If true, ignore whitespace; corresponds to -dw. <P> <DL> </DL> </DL> <HR> <A NAME="ignoreLineEndings"><!-- --></A><H3> ignoreLineEndings</H3> <PRE> protected boolean <B>ignoreLineEndings</B></PRE> <DL> <DD>If true, ignore line endings; corresponds to -dl. <P> <DL> </DL> </DL> <HR> <A NAME="file1FileSpec"><!-- --></A><H3> file1FileSpec</H3> <PRE> protected IFileSpec <B>file1FileSpec</B></PRE> <DL> <DD>Left depot file and revision specifier used as input for this Perforce command. <P> <DL> </DL> </DL> <HR> <A NAME="file2FileSpec"><!-- --></A><H3> file2FileSpec</H3> <PRE> protected IFileSpec <B>file2FileSpec</B></PRE> <DL> <DD>Right depot file and revision specifier used as input for this Perforce command. <P> <DL> </DL> </DL> <HR> <A NAME="retFileDiffs"><!-- --></A><H3> retFileDiffs</H3> <PRE> protected java.util.List<IFileDiff> <B>retFileDiffs</B></PRE> <DL> <DD>Collection of file diffs returned from the Perforce command. <P> <DL> </DL> </DL> <!-- ========= CONSTRUCTOR DETAIL ======== --> <A NAME="constructor_detail"><!-- --></A> <TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY=""> <TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor"> <TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2"> <B>Constructor Detail</B></FONT></TH> </TR> </TABLE> <A NAME="Diff2Task()"><!-- --></A><H3> Diff2Task</H3> <PRE> public <B>Diff2Task</B>()</PRE> <DL> <DD>Default constructor. <P> </DL> <!-- ============ METHOD DETAIL ========== --> <A NAME="method_detail"><!-- --></A> <TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY=""> <TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor"> <TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2"> <B>Method Detail</B></FONT></TH> </TR> </TABLE> <A NAME="setFile1(java.lang.String)"><!-- --></A><H3> setFile1</H3> <PRE> public void <B>setFile1</B>(java.lang.String file1)</PRE> <DL> <DD>Sets the file1. <P> <DD><DL> <DT><B>Parameters:</B><DD><CODE>file1</CODE> - the new file1</DL> </DD> </DL> <HR> <A NAME="setFile2(java.lang.String)"><!-- --></A><H3> setFile2</H3> <PRE> public void <B>setFile2</B>(java.lang.String file2)</PRE> <DL> <DD>Sets the file2. <P> <DD><DL> <DT><B>Parameters:</B><DD><CODE>file2</CODE> - the new file2</DL> </DD> </DL> <HR> <A NAME="setBranch(java.lang.String)"><!-- --></A><H3> setBranch</H3> <PRE> public void <B>setBranch</B>(java.lang.String branch)</PRE> <DL> <DD>Sets the branch. <P> <DD><DL> <DT><B>Parameters:</B><DD><CODE>branch</CODE> - the new branch</DL> </DD> </DL> <HR> <A NAME="setQuiet(boolean)"><!-- --></A><H3> setQuiet</H3> <PRE> public void <B>setQuiet</B>(boolean quiet)</PRE> <DL> <DD>Sets the quiet. <P> <DD><DL> <DT><B>Parameters:</B><DD><CODE>quiet</CODE> - the new quiet</DL> </DD> </DL> <HR> <A NAME="setIncludeNonTextDiffs(boolean)"><!-- --></A><H3> setIncludeNonTextDiffs</H3> <PRE> public void <B>setIncludeNonTextDiffs</B>(boolean includeNonTextDiffs)</PRE> <DL> <DD>Sets the include non text diffs. <P> <DD><DL> <DT><B>Parameters:</B><DD><CODE>includeNonTextDiffs</CODE> - the new include non text diffs</DL> </DD> </DL> <HR> <A NAME="setGnuDiffs(boolean)"><!-- --></A><H3> setGnuDiffs</H3> <PRE> public void <B>setGnuDiffs</B>(boolean gnuDiffs)</PRE> <DL> <DD>Sets the gnu diffs. <P> <DD><DL> <DT><B>Parameters:</B><DD><CODE>gnuDiffs</CODE> - the new gnu diffs</DL> </DD> </DL> <HR> <A NAME="setRcsDiffs(boolean)"><!-- --></A><H3> setRcsDiffs</H3> <PRE> public void <B>setRcsDiffs</B>(boolean rcsDiffs)</PRE> <DL> <DD>Sets the rcs diffs. <P> <DD><DL> <DT><B>Parameters:</B><DD><CODE>rcsDiffs</CODE> - the new rcs diffs</DL> </DD> </DL> <HR> <A NAME="setDiffContext(int)"><!-- --></A><H3> setDiffContext</H3> <PRE> public void <B>setDiffContext</B>(int diffContext)</PRE> <DL> <DD>Sets the diff context. <P> <DD><DL> <DT><B>Parameters:</B><DD><CODE>diffContext</CODE> - the new diff context</DL> </DD> </DL> <HR> <A NAME="setSummaryDiff(boolean)"><!-- --></A><H3> setSummaryDiff</H3> <PRE> public void <B>setSummaryDiff</B>(boolean summaryDiff)</PRE> <DL> <DD>Sets the summary diff. <P> <DD><DL> <DT><B>Parameters:</B><DD><CODE>summaryDiff</CODE> - the new summary diff</DL> </DD> </DL> <HR> <A NAME="setUnifiedDiff(int)"><!-- --></A><H3> setUnifiedDiff</H3> <PRE> public void <B>setUnifiedDiff</B>(int unifiedDiff)</PRE> <DL> <DD>Sets the unified diff. <P> <DD><DL> <DT><B>Parameters:</B><DD><CODE>unifiedDiff</CODE> - the new unified diff</DL> </DD> </DL> <HR> <A NAME="setIgnoreWhitespaceChanges(boolean)"><!-- --></A><H3> setIgnoreWhitespaceChanges</H3> <PRE> public void <B>setIgnoreWhitespaceChanges</B>(boolean ignoreWhitespaceChanges)</PRE> <DL> <DD>Sets the ignore whitespace changes. <P> <DD><DL> <DT><B>Parameters:</B><DD><CODE>ignoreWhitespaceChanges</CODE> - the new ignore whitespace changes</DL> </DD> </DL> <HR> <A NAME="setIgnoreWhitespace(boolean)"><!-- --></A><H3> setIgnoreWhitespace</H3> <PRE> public void <B>setIgnoreWhitespace</B>(boolean ignoreWhitespace)</PRE> <DL> <DD>Sets the ignore whitespace. <P> <DD><DL> <DT><B>Parameters:</B><DD><CODE>ignoreWhitespace</CODE> - the new ignore whitespace</DL> </DD> </DL> <HR> <A NAME="setIgnoreLineEndings(boolean)"><!-- --></A><H3> setIgnoreLineEndings</H3> <PRE> public void <B>setIgnoreLineEndings</B>(boolean ignoreLineEndings)</PRE> <DL> <DD>Sets the ignore line endings. <P> <DD><DL> <DT><B>Parameters:</B><DD><CODE>ignoreLineEndings</CODE> - the new ignore line endings</DL> </DD> </DL> <HR> <A NAME="getFile1FileSpec()"><!-- --></A><H3> getFile1FileSpec</H3> <PRE> public IFileSpec <B>getFile1FileSpec</B>()</PRE> <DL> <DD>Gets the file1 file spec. <P> <DD><DL> <DT><B>Returns:</B><DD>the file1 file spec</DL> </DD> </DL> <HR> <A NAME="getFile2FileSpec()"><!-- --></A><H3> getFile2FileSpec</H3> <PRE> public IFileSpec <B>getFile2FileSpec</B>()</PRE> <DL> <DD>Gets the file2 file spec. <P> <DD><DL> <DT><B>Returns:</B><DD>the file2 file spec</DL> </DD> </DL> <HR> <A NAME="getRetFileDiffs()"><!-- --></A><H3> getRetFileDiffs</H3> <PRE> public java.util.List<IFileDiff> <B>getRetFileDiffs</B>()</PRE> <DL> <DD>Gets the ret file diffs. <P> <DD><DL> <DT><B>Returns:</B><DD>the ret file diffs</DL> </DD> </DL> <HR> <A NAME="execP4Command()"><!-- --></A><H3> execP4Command</H3> <PRE> protected void <B>execP4Command</B>() throws org.apache.tools.ant.BuildException</PRE> <DL> <DD>Execute the Perforce diff2 command with file spec 1, file spec 2, branch and options. Log the returned file diffs. This command is perform on the server side. <p> Run diff on the Perforce server of two files in the depot. <p> This method corresponds closely to the standard diff2 command, and that command's documentation should be consulted for the overall and detailed semantics <P> <DD><DL> <DT><B>Specified by:</B><DD><CODE><A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#execP4Command()">execP4Command</A></CODE> in class <CODE><A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html" title="class in com.perforce.p4java.ant.tasks">PerforceTask</A></CODE></DL> </DD> <DD><DL> <DT><B>Throws:</B> <DD><CODE>org.apache.tools.ant.BuildException</CODE> - the build exception<DT><B>See Also:</B><DD><A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#execP4Command()"><CODE>PerforceTask.execP4Command()</CODE></A></DL> </DD> </DL> <!-- ========= END OF CLASS DATA ========= --> <HR> <!-- ======= START OF BOTTOM NAVBAR ====== --> <A NAME="navbar_bottom"><!-- --></A> <A HREF="#skip-navbar_bottom" title="Skip navigation links"></A> <TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY=""> <TR> <TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A NAME="navbar_bottom_firstrow"><!-- --></A> <TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY=""> <TR ALIGN="center" VALIGN="top"> <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD> <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD> <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT> </TD> <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="class-use/Diff2Task.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A> </TD> <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A> </TD> <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD> <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A> </TD> <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD> </TR> </TABLE> </TD> <TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM> </EM> </TD> </TR> <TR> <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2"> <A HREF="../../../../../com/perforce/p4java/ant/tasks/DeleteTask.html" title="class in com.perforce.p4java.ant.tasks"><B>PREV CLASS</B></A> <A HREF="../../../../../com/perforce/p4java/ant/tasks/EditTask.html" title="class in com.perforce.p4java.ant.tasks"><B>NEXT CLASS</B></A></FONT></TD> <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2"> <A HREF="../../../../../index.html?com/perforce/p4java/ant/tasks/Diff2Task.html" target="_top"><B>FRAMES</B></A> <A HREF="Diff2Task.html" target="_top"><B>NO FRAMES</B></A> <SCRIPT type="text/javascript"> <!-- if(window==top) { document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>'); } //--> </SCRIPT> <NOSCRIPT> <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A> </NOSCRIPT> </FONT></TD> </TR> <TR> <TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2"> SUMMARY: <A HREF="#nested_classes_inherited_from_class_com.perforce.p4java.ant.tasks.ServerTask">NESTED</A> | <A HREF="#field_summary">FIELD</A> | <A HREF="#constructor_summary">CONSTR</A> | <A HREF="#method_summary">METHOD</A></FONT></TD> <TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2"> DETAIL: <A HREF="#field_detail">FIELD</A> | <A HREF="#constructor_detail">CONSTR</A> | <A HREF="#method_detail">METHOD</A></FONT></TD> </TR> </TABLE> <A NAME="skip-navbar_bottom"></A> <!-- ======== END OF BOTTOM NAVBAR ======= --> <HR> <i>Copyright (c) 2010 Perforce Software. All rights reserved.</i> </BODY> </HTML>