Added option to delete workspace before building so we get a fresh clone - hacky, since this breaks other stuff, but I need it for tests right now

Author: Andrew Bayer

src/main/java/hudson/plugins/git/GitSCM.java

@@ -14,6 +14,7 @@
 import hudson.scm.SCM;
 import hudson.scm.SCMDescriptor;
 import hudson.util.FormValidation;
+import hudson.Util;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -74,6 +75,8 @@ public class GitSCM extends SCM implements Serializable {
 
     private boolean clean;
 
+    private boolean wipeOutWorkspace;
+    
     private String choosingStrategy = DEFAULT;
     public static final String DEFAULT = "Default";
     public static final String GERRIT = "Gerrit";
@@ -103,6 +106,7 @@ public GitSCM(
                   boolean doGenerateSubmoduleConfigurations,
                   Collection<SubmoduleConfig> submoduleCfg,
                   boolean clean,
+                  boolean wipeOutWorkspace,
                   String choosingStrategy, GitWeb browser,
                   String gitTool) {
 
@@ -119,6 +123,7 @@ public GitSCM(
         this.submoduleCfg = submoduleCfg;
 
         this.clean = clean;
+        this.wipeOutWorkspace = wipeOutWorkspace;
         this.choosingStrategy = choosingStrategy;
         this.configVersion = 1L;
         this.gitTool = gitTool;
@@ -172,6 +177,10 @@ public GitWeb getBrowser() {
         return browser;
     }
 
+    public boolean getWipeOutWorkspace() {
+        return this.wipeOutWorkspace;
+    }
+    
     public boolean getClean() {
         return this.clean;
     }
@@ -489,6 +498,16 @@ public Revision invoke(File localWorkspace, VirtualChannel channel)
                     listener.getLogger().println("Checkout:" + ws.getName() + " / " + ws.getRemote() + " - " + ws.getChannel());
                     IGitAPI git = new GitAPI(gitExe, ws, listener, environment);
 
+                    if (wipeOutWorkspace) {
+                        listener.getLogger().println("Wiping out workspace first");
+                        try {
+                            ws.deleteContents();
+                        } catch (InterruptedException e) {
+                            // I don't really care if this fails.
+                        } 
+                        
+                    }
+
                     if (git.hasGitRepo()) {
                         // It's an update
 
@@ -499,6 +518,7 @@ public Revision invoke(File localWorkspace, VirtualChannel channel)
                         }
 
                     } else {
+                        
                         listener.getLogger().println("Cloning the remote Git repository");
 
                         // Go through the repositories, trying to clone from one
@@ -852,6 +872,7 @@ public SCM newInstance(StaplerRequest req, JSONObject formData) throws FormExcep
                               req.getParameter("git.generate") != null,
                               submoduleCfg,
                               req.getParameter("git.clean") != null,
+                              req.getParameter("git.wipeOutWorkspace") != null,
                               req.getParameter("git.choosing_strategy"),
                               gitWeb,
                               gitTool);

src/main/resources/hudson/plugins/git/GitSCM/config.jelly

@@ -119,6 +119,10 @@
     <f:entry title="Clean after checkout" help="/plugin/git/clean.html">
       <f:checkbox name="git.clean" checked="${scm.clean}" />
     </f:entry>
+    <f:entry title="Wipe out workspace" help="/plugin/git/wipeOutWorkspace.html">
+      <f:checkbox name="git.wipeOutWorkspace" checked="${scm.wipeOutWorkspace}" />
+    </f:entry>
+    
     <f:entry title="Choosing strategy" help="/plugin/git/choosingStrategy.html" field="git.choosing_strategy">
         <select name="git.choosing_strategy">
             <j:choose>

src/main/webapp/wipeOutWorkspace.html

@@ -0,0 +1,3 @@
+<div>
+  Delete the contents of the workspace before building, ensuring a fully fresh workspace.
+</div>