Return-Path: Delivered-To: apmail-ant-dev-archive@www.apache.org Received: (qmail 57254 invoked from network); 2 Sep 2003 14:47:13 -0000 Received: from daedalus.apache.org (HELO apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 2 Sep 2003 14:47:13 -0000 Received: (qmail 83678 invoked by uid 500); 2 Sep 2003 14:46:01 -0000 Delivered-To: apmail-ant-dev-archive@ant.apache.org Received: (qmail 83611 invoked by uid 500); 2 Sep 2003 14:46:00 -0000 Mailing-List: contact dev-help@ant.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Ant Developers List" Reply-To: "Ant Developers List" Delivered-To: mailing list dev@ant.apache.org Received: (qmail 83550 invoked by uid 500); 2 Sep 2003 14:46:00 -0000 Received: (qmail 83528 invoked from network); 2 Sep 2003 14:46:00 -0000 Received: from unknown (HELO minotaur.apache.org) (209.237.227.194) by daedalus.apache.org with SMTP; 2 Sep 2003 14:46:00 -0000 Received: (qmail 53579 invoked by uid 1146); 2 Sep 2003 14:38:19 -0000 Date: 2 Sep 2003 14:38:19 -0000 Message-ID: <20030902143819.53578.qmail@minotaur.apache.org> From: bodewig@apache.org To: ant-cvs@apache.org Subject: cvs commit: ant/src/main/org/apache/tools/ant/taskdefs AbstractCvsTask.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N 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 . PR: 22774 Submitted by: Larry Shatzer 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 @@ CVS repository.

When doing automated builds, the get task should be preferred over the checkout command, because of speed.

Important: 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 +

Important: 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 from the command line in the target directory in which you are working.

Parameters

@@ -31,25 +31,25 @@ + to true, this is the same as compressionlevel="3" + possible values for CVS' -z# argument). Any + other value is treated as compression="false" - + - + @@ -74,7 +74,13 @@ - + + + + + + @@ -110,7 +116,7 @@ + return code other than 0. Defaults to false

compression	`true` or `false` - if set - to true, this is the same as compressionlevel="3"	No. Defaults to false.
compressionlevel	A number between 1 and 9 (corresponding to - possible values for CVS' `-z#` argument). Any - other value is treated as compression="false"	No. Defaults to no compression.
cvsRoot	the CVSROOT variable.	the `CVSROOT` variable.	No
cvsRsh	the CVS_RSH variable.	the `CVS_RSH` variable.	No
quiet	suppress informational messages.	suppress informational messages. This is the same as `-q` on the command line.	No, default "false"
reallyquiet	suppress all messages. This is the same as + `-Q` on the command line. since Ant 1.6.	No, default "false"
failonerror	Stop the build process if the command exits with a - return code other than 0. Defaults to false	No

@@ -120,31 +126,31 @@ dest="${ws.dir}" />

checks out the package/module "ant" from the CVS -repository pointed to by the cvsRoot attribute, and stores the files in "${ws.dir}".

+repository pointed to by the cvsRoot attribute, and stores the files in "${ws.dir}".

  <cvs dest="${ws.dir}" command="update"/>

updates the package/module that has previously been checked out into -"${ws.dir}".

+"${ws.dir}".

  <cvs command="-q diff -u -N" output="patch.txt"/>

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: +

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:

  -<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>

or:

  -<cvs output="patch">
  +<cvs output="patch">
       <commandline>
  -        <argument line="-q diff -u -N"/>
  +        <argument line="-q diff -u -N"/>
       </commandline>
   </cvs>

@@ -156,11 +162,11 @@

  <cvs command="update -A -d"/>

Updates from the head of repository ignoring sticky bits (-A) and creating any new directories as necessary (-d).

Updates from the head of repository ignoring sticky bits (-A) and creating any new directories as necessary (-d).

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 the cvs manual for details, -specifically the Guide to CVS commands

+above. See the cvs manual for details, +specifically the Guide to CVS commands

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 * *

- * quiet + * quiet or reallyquiet *

cvsroot

noexec

@@ -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: dev-unsubscribe@ant.apache.org For additional commands, e-mail: dev-help@ant.apache.org