From 53108072705caf8873f2507d660111dc625c9341 Mon Sep 17 00:00:00 2001
From: dion <dion@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 29 Jul 2004 07:51:19 +0000
Subject: [PATCH] MPSCM-20. Add scm:cvs-create-patch goal

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@115896 13f79535-47bb-0310-9956-ffa450edef68
---
 scm/plugin.jelly         | 15 +++++++++++++++
 scm/plugin.properties    |  5 ++++-
 scm/xdocs/changes.xml    |  1 +
 scm/xdocs/goals.xml      |  7 +++++++
 scm/xdocs/properties.xml | 19 +++++++++++++++++++
 5 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/scm/plugin.jelly b/scm/plugin.jelly
index 2d63f744..144c369f 100644
--- a/scm/plugin.jelly
+++ b/scm/plugin.jelly
@@ -348,5 +348,20 @@
       failonerror="true"
     />
   </goal>
+
+  <!--==================================================================-->
+  <!-- Patch - CVS                                                      -->
+  <!--==================================================================-->
+  <goal name="scm:cvs-create-patch">
+    <ant:delete dir="${maven.scm.cvs.patch.dir}"/>
+    <ant:mkdir  dir="${maven.scm.cvs.patch.dir}"/>
+    <cvs command="diff -u -N -R" output="${maven.scm.cvs.patch.dir}/${maven.scm.cvs.patch.file}"
+      quiet="${maven.scm.cvs.quiet}"
+      cvsRsh="${maven.scm.cvs.rsh}"
+      cvsRoot="${maven.scm.cvs.root}"
+      failonerror="false"/>
+    <ant:echo>Patch created in ${maven.scm.cvs.patch.dir}/${maven.scm.cvs.patch.file}</ant:echo>
+  </goal>
+
 </project>
 
diff --git a/scm/plugin.properties b/scm/plugin.properties
index a168adf2..f2cb1a6b 100644
--- a/scm/plugin.properties
+++ b/scm/plugin.properties
@@ -49,4 +49,7 @@ maven.scm.cvs.checkout.flags=-P
 maven.scm.cvs.sticky.tag=
 # Whether to use quiet mode
 maven.scm.cvs.quiet=true
-
+# The file name for the patch
+maven.scm.cvs.patch.file=patch.txt
+# The working directory for patching
+maven.scm.cvs.patch.dir=${maven.build.dir}/scm/patch
diff --git a/scm/xdocs/changes.xml b/scm/xdocs/changes.xml
index f395c30a..7e200f68 100644
--- a/scm/xdocs/changes.xml
+++ b/scm/xdocs/changes.xml
@@ -25,6 +25,7 @@
   </properties>
   <body>
     <release version="1.4.1-SNAPSHOT" date="in CVS">
+      <action dev="dion" type="add" issue="MPSCM-20">Add scm:cvs-create-patch goal to help in creating patches</action>
       <action dev="carlos" type="fix" issue="MPSCM-13">Set default <code>maven.scm.method</code> to cvs</action>
     </release>
     <release version="1.4" date="2004-06-18">
diff --git a/scm/xdocs/goals.xml b/scm/xdocs/goals.xml
index fb18a260..1d94e088 100644
--- a/scm/xdocs/goals.xml
+++ b/scm/xdocs/goals.xml
@@ -55,6 +55,13 @@
           that are not provided you will be prompted for them.
         </description>
       </goal>
+      <goal>
+        <name>scm:cvs-create-patch</name>
+        <description>
+          Creates a patch in ${maven.scm.cvs.patch.dir}/${maven.scm.cvs.patch.file}
+          of the changes made to the current project
+        </description>
+      </goal>
     </goals>
   </body>
 </document>
diff --git a/scm/xdocs/properties.xml b/scm/xdocs/properties.xml
index 911780fa..9aa324c9 100644
--- a/scm/xdocs/properties.xml
+++ b/scm/xdocs/properties.xml
@@ -145,6 +145,25 @@
             <p>Used as the tag for the <code>cvs-tag-project</code> goal.</p>
           </td>
         </tr>
+        <tr>
+          <td>maven.scm.cvs.patch.dir</td>
+          <td>Yes</td>
+          <td>
+            <p>Working directory for creating a patch file. Used by the <code>cvs-create-patch</code> goal.</p>
+            <p>Defaults to <code>${maven.build.dir}/scm/patch</code></p>
+          </td>
+        </tr>
+        <tr>
+          <td>maven.scm.cvs.patch.file</td>
+          <td>Yes</td>
+          <td>
+            <p>
+              The name of the patch file created y the <code>cvs-create-patch</code> goal.
+              in the <code>${maven.scm.cvs.patch.dir}</code> directory
+            </p>
+            <p>Defaults to <code>patch.txt</code></p>
+          </td>
+        </tr>
       </table>
       </subsection>
     </section>