merged from default

changeset:   3513:64e7028ae9f6
tag:         tip
parent:      3511:74d7bc137c85
user:        Massimo Gervasini <mgervasini@mozilla.com>
date:        Mon May 06 16:29:28 2013 +0200
summary:     Bug 851270 - Don't clobber the source checkout. r=catlee

--HG--
branch : production-0.8

process/factory.py

@@ -684,7 +684,7 @@ def addFilePropertiesSteps(self, filename, directory, fileType,
     def makeHgtoolStep(self, name='hg_update', repo_url=None, wc=None,
                        mirrors=None, bundles=None, env=None,
                        clone_by_revision=False, rev=None, workdir='build',
-                       use_properties=True, locks=None):
+                       use_properties=True, locks=None, autoPurge=False):
 
         if not env:
             env = self.env
@@ -729,6 +729,9 @@ def makeHgtoolStep(self, name='hg_update', repo_url=None, wc=None,
         if locks is None:
             locks = []
 
+        if autoPurge:
+            cmd.append('--purge')
+
         return RetryingShellCommand(
             name=name,
             command=cmd,
@@ -2106,12 +2109,6 @@ def addSourceSteps(self):
         if self.useSharedCheckouts:
             # We normally rely on the Mercurial step to clobber for us, but
             # since we're managing the checkout ourselves...
-            self.addStep(ShellCommand(
-                name='clobber_build',
-                command=['rm', '-rf', 'build'],
-                workdir='.',
-                timeout=60 * 60,
-            ))
             self.addStep(JSONPropertiesDownload(
                 name="download_props",
                 slavedest="buildprops.json",
@@ -2122,6 +2119,7 @@ def addSourceSteps(self):
                 clone_by_revision=True,
                 wc='build',
                 workdir='.',
+                autoPurge=True,
                 locks=[hg_try_lock.access('counting')],
             )
             self.addStep(step)