[JENKINS-13073] use build parameters when flushing the workspace duri…

…ng checkout
jenkinsci · Mar 14, 2012 · 9ea05ba · 9ea05ba
1 parent 23284b9
commit 9ea05ba
Showing 1 changed file with 24 additions and 29 deletions.
diff --git a/src/main/java/hudson/plugins/perforce/PerforceSCM.java b/src/main/java/hudson/plugins/perforce/PerforceSCM.java
@@ -671,33 +671,6 @@ public boolean checkout(AbstractBuild build, Launcher launcher,
         boolean disableSyncOnly = overrideWithBooleanParameter(
                 "P4DISABLESYNCONLY", build, this.disableSyncOnly);
 
-
-        if(wipeBeforeBuild){
-        	if(wipeRepoBeforeBuild){
-            log.println("Clearing workspace...");
-            log.println("Clear workspace includes .repository ...");
-            	if(processWorkspaceBeforeDeletion(build.getProject(), workspace, build.getBuiltOn())){
-            		workspace.deleteContents();
-            		log.println("Cleared workspace.");
-            	} else {
-            		log.println("Could not clear workspace. See hudson.perforce.PerforceSCM logger for details.");
-            	}
-				forceSync = true;
-        	} else {
-	        	if(processWorkspaceBeforeDeletion(build.getProject(), workspace, build.getBuiltOn())){
-	            	List<FilePath> workspaceDirs = workspace.list(new WipeWorkspaceFilter());
-	                for(FilePath dir : workspaceDirs){
-	                    dir.deleteRecursive();
-	                }
-	                log.println("Cleared workspace.");
-	                log.println("Note: .repository directory in workspace (if exists) is skipped ...");
-	            } else {
-	                log.println("Could not clear workspace. See hudson.perforce.PerforceSCM logger for details.");
-	            }
-					forceSync = true;
-	        	}
-        }
-
 
         //Use local variables so that substitutions are not saved
         String p4Label = substituteParameters(this.p4Label, build);
@@ -728,6 +701,24 @@ public boolean checkout(AbstractBuild build, Launcher launcher,
             boolean dirtyWorkspace = p4workspace.isDirty();
             saveWorkspaceIfDirty(depot, p4workspace, log);
 
+            if(wipeBeforeBuild){
+                log.println("Clearing workspace...");
+        	if(wipeRepoBeforeBuild){
+                    log.println("Clear workspace includes .repository ...");
+                    flushWorkspaceTo0(depot, p4workspace, log);
+                    workspace.deleteContents();
+                } else {
+                    log.println("Note: .repository directory in workspace (if exists) is skipped.");
+                    flushWorkspaceTo0(depot, p4workspace, log);
+                    List<FilePath> workspaceDirs = workspace.list(new WipeWorkspaceFilter());
+                    for(FilePath dir : workspaceDirs){
+                        dir.deleteRecursive();
+                    }
+                }
+                log.println("Cleared workspace.");
+                forceSync = true;
+            }
+
             //In case of a stream depot, we want Perforce to handle the client views. So let's re-initialize
             //the p4workspace object if it was changed since the last build. Also, populate projectPath with
             //the current view from Perforce. We need it for labeling.
@@ -1242,6 +1233,11 @@ public static boolean doesFilenameMatchP4Pattern(String filename, String pattern
         }
     }
 
+    private void flushWorkspaceTo0(Depot depot, Workspace p4workspace, PrintStream log) throws PerforceException {
+        saveWorkspaceIfDirty(depot, p4workspace, log);
+        depot.getWorkspaces().flushTo("//" + p4workspace.getName() + "/...#0");
+    }
+
     // TODO Handle the case where p4Label is set.
     private boolean wouldSyncChangeWorkspace(AbstractProject project, Depot depot,
             PrintStream logger) throws IOException, InterruptedException, PerforceException {
@@ -2652,8 +2648,7 @@ public boolean processWorkspaceBeforeDeletion(AbstractProject<?,?> project, File
                 workspace,
                 listener,
                 dontRenameClient);
-            saveWorkspaceIfDirty(depot, p4workspace, log);
-            depot.getWorkspaces().flushTo("//" + p4workspace.getName() + "/...#0");
+            flushWorkspaceTo0(depot, p4workspace, log);
         } catch (Exception ex) {
             Logger.getLogger(PerforceSCM.class.getName()).log(Level.SEVERE, null, ex);
             return false;