bodewig 2003/09/02 07:38:19
Modified: docs/manual/CoreTasks cvs.html
src/main/org/apache/tools/ant/taskdefs AbstractCvsTask.java
Log:
Add a reallyquiet attribute to <cvs>.
PR: 22774
Submitted by: Larry Shatzer <larry dot shatzer at spirent dot com>
Revision Changes Path
1.18 +29 -23 ant/docs/manual/CoreTasks/cvs.html
Index: cvs.html
===================================================================
RCS file: /home/cvs/ant/docs/manual/CoreTasks/cvs.html,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- cvs.html 22 Apr 2003 15:31:03 -0000 1.17
+++ cvs.html 2 Sep 2003 14:38:19 -0000 1.18
@@ -13,8 +13,8 @@
<a href="http://www.cvshome.org/"; target="_top">CVS</a> repository.</p>
<p>When doing automated builds, the <a href="get.html">get task</a> should be
preferred over the <i>checkout</i> command, because of speed.</p>
-<p><b>Important:</b> This task needs "cvs" on the path. If it isn't, you
will get
-an error (such as error 2 on windows). If <cvs> doesn't work, try to
execute cvs.exe
+<p><b>Important:</b> This task needs "<code>cvs</code>" on the
path. If it isn't, you will get
+an error (such as error <code>2</code> on windows). If
<code><cvs></code> doesn't work, try to execute <code>cvs.exe</code>
from the command line in the target directory in which you are working.
<h3>Parameters</h3>
<table border="1" cellpadding="2" cellspacing="0">
@@ -31,25 +31,25 @@
<tr>
<td valign="top">compression</td>
<td valign="top"><code>true</code> or <code>false</code> - if set
- to true, this is the same as compressionlevel="3"</td>
+ to true, this is the same as
<code>compressionlevel="3"</code></td>
<td align="center" valign="top">No. Defaults to false.</td>
</tr>
<tr>
<td valign="top">compressionlevel</td>
<td valign="top">A number between 1 and 9 (corresponding to
- possible values for CVS' <code>-z#</code> argument). Any
- other value is treated as compression="false"</td>
+ possible values for CVS' <code>-z#</code> argument). Any
+ other value is treated as <code>compression="false"</code></td>
<td align="center" valign="top">No. Defaults to no compression.</td>
</tr>
<tr>
<td valign="top">cvsRoot</td>
- <td valign="top">the CVSROOT variable.</td>
+ <td valign="top">the <code>CVSROOT</code> variable.</td>
<td align="center" valign="top">No</td>
</tr>
<tr>
<td valign="top">cvsRsh</td>
- <td valign="top">the CVS_RSH variable.</td>
+ <td valign="top">the <code>CVS_RSH</code> variable.</td>
<td align="center" valign="top">No</td>
</tr>
<tr>
@@ -74,7 +74,13 @@
</tr>
<tr>
<td valign="top">quiet</td>
- <td valign="top">suppress informational messages.</td>
+ <td valign="top">suppress informational messages. This is the same as
<code>-q</code> on the command line.</td>
+ <td align="center" valign="top">No, default "false"</td>
+ </tr>
+ <tr>
+ <td valign="top">reallyquiet</td>
+ <td valign="top">suppress all messages. This is the same as
+ <code>-Q</code> on the command line. <em>since Ant 1.6</em>.</td>
<td align="center" valign="top">No, default "false"</td>
</tr>
<tr>
@@ -110,7 +116,7 @@
<tr>
<td valign="top">failonerror</td>
<td valign="top">Stop the build process if the command exits with a
- return code other than 0. Defaults to false</td>
+ return code other than <code>0</code>. Defaults to false</td>
<td align="center" valign="top">No</td>
</tr>
</table>
@@ -120,31 +126,31 @@
dest="${ws.dir}"
/></pre>
<p>checks out the package/module "ant" from the CVS
-repository pointed to by the cvsRoot attribute, and stores the files in
"${ws.dir}".</p>
+repository pointed to by the <code>cvsRoot</code> attribute, and stores the
files in "<code>${ws.dir}</code>".</p>
<pre> <cvs dest="${ws.dir}"
command="update"/></pre>
<p>updates the package/module that has previously been checked out into
-"${ws.dir}".</p>
+"<code>${ws.dir}</code>".</p>
<pre> <cvs command="-q diff -u -N"
output="patch.txt"/></pre>
-<p>silently (-q) creates a file called patch.txt which contains a unified
(-u) diff which includes new files added via "cvs add" (-N) and can
be used as input to patch.
-The equivalent, using <commandline> elements, is:
+<p>silently (<code>-q</code>) creates a file called <code>patch.txt</code>
which contains a unified (<code>-u</code>) diff which includes new files added
via "cvs add" (<code>-N</code>) and can be used as input to patch.
+The equivalent, using <code><commandline></code> elements, is:
</p>
<pre>
-<cvs output="patch">
+<cvs output="patch">
<commandline>
- <argument value="-q"/>
- <argument value="diff"/>
- <argument value="-u"/>
- <argument value="-N"/>
+ <argument value="-q"/>
+ <argument value="diff"/>
+ <argument value="-u"/>
+ <argument value="-N"/>
</commandline>
</cvs>
</pre>
or:
<pre>
-<cvs output="patch">
+<cvs output="patch">
<commandline>
- <argument line="-q diff -u -N"/>
+ <argument line="-q diff -u -N"/>
</commandline>
</cvs>
</pre>
@@ -156,11 +162,11 @@
<pre> <cvs command="update -A -d"/></pre>
-<p>Updates from the head of repository ignoring sticky bits (-A) and
creating any new directories as necessary (-d).</p>
+<p>Updates from the head of repository ignoring sticky bits
(<code>-A</code>) and creating any new directories as necessary
(<code>-d</code>).</p>
<p>Note: the text of the command is passed to cvs "as-is" so any
cvs options should appear
before the command, and any command options should appear after the command
as in the diff example
-above. See <a href="http://www.cvshome.org/docs/manual/index.html";
target="_top">the cvs manual</a> for details,
-specifically the <a href="http://www.cvshome.org/docs/manual/cvs_16.html";
target="_top">Guide to CVS commands</a></p>
+above. See <a href="http://www.cvshome.org/docs/manual/cvs-1.11.6/cvs.html";
target="_top">the cvs manual</a> for details,
+specifically the <a
href="http://www.cvshome.org/docs/manual/cvs-1.11.6/cvs_16.html";
target="_top">Guide to CVS commands</a></p>
<hr>
<p align="center">Copyright © 2000-2003 Apache Software
Foundation. All rights Reserved.</p>
1.25 +20 -2
ant/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java
Index: AbstractCvsTask.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- AbstractCvsTask.java 25 Jul 2003 12:14:42 -0000 1.24
+++ AbstractCvsTask.java 2 Sep 2003 14:38:19 -0000 1.25
@@ -127,6 +127,11 @@
private boolean quiet = false;
/**
+ * suppress all messages.
+ */
+ private boolean reallyquiet = false;
+
+ /**
* compression level to use.
*/
private int compression = 0;
@@ -681,6 +686,16 @@
}
/**
+ * If true, suppress all messages.
+ * @param q if true, suppress all messages
+ * @since Ant 1.6
+ */
+ public void setReallyquiet(boolean q) {
+ reallyquiet = q;
+ }
+
+
+ /**
* If true, report only and don't change any files.
*
* @param ne if true, report only and do not change any files.
@@ -738,7 +753,7 @@
* compression
* </li>
* <li>
- * quiet
+ * quiet or reallyquiet
* </li>
* <li>cvsroot</li>
* <li>noexec</li>
@@ -755,8 +770,11 @@
if (this.compression > 0 && this.compression <=
MAXIMUM_COMRESSION_LEVEL) {
c.createArgument(true).setValue("-z" + this.compression);
}
- if (quiet) {
+ if (quiet && !reallyquiet) {
c.createArgument(true).setValue("-q");
+ }
+ if (reallyquiet) {
+ c.createArgument(true).setValue("-Q");
}
if (noexec) {
c.createArgument(true).setValue("-n");
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
