Allow trybot changes to run against WebKit@HEAD.

scripts/master/chromium_step.py

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Subclasses of various slave command classes."""
 
 import copy
 import errno
 import json
 import logging
@@ skipping 83 matching lines @@
     if not changes:
       return None
     # Change revision numbers can be invalid, for a try job for instance.
     # TODO(maruel): Make this work for git hash.
     lastChange = max([change_to_revision(c) for c in changes])
     return lastChange
 
   def startVC(self, branch, revision, patch):
     warnings = []
     args = copy.copy(self.args)
-    wk_revision = revision
+    wk_revision = None
     try:
       # parent_wk_revision might be set, but empty.
       if self.getProperty('parent_wk_revision'):
         wk_revision = self.getProperty('parent_wk_revision')
     except KeyError:
       pass
+    if patch and patch[1].startswith('third_party/WebKit@HEAD'):
+      wk_revision = 'HEAD'

[Dirk Pranke, 2013/02/07 03:42:33]

are you sure "HEAD" works here? don't the try servers still need svn revisions?
In the gclient spec I use, I usually have to set 'webkit_rev' = '' to get the
equivalent of HEAD.

[M-A Ruel, 2013/02/07 14:01:53]

I kind of agree I'd prefer a regexp to allow numbers and eventually git hash.
HEAD in this context is very svn-specific.

[tony, 2013/02/07 22:13:49]

HEAD does work, but I've switched it to a regex to make it more flexible going
forward.

+
     nacl_revision = revision
     try:
       # parent_nacl_revision might be set, but empty.
       if self.getProperty('parent_got_nacl_revision'):
         nacl_revision = self.getProperty('parent_got_nacl_revision')
     except KeyError:
       pass
     try:
       # parent_cr_revision might be set, but empty.
       if self.getProperty('parent_cr_revision'):
         revision = 'src@' + self.getProperty('parent_cr_revision')
     except KeyError:
       pass
     self.setProperty('primary_repo', args['primary_repo'], 'Source')
     args['revision'] = revision
     args['branch'] = branch
     if args.get('gclient_spec'):
-      args['gclient_spec'] = args['gclient_spec'].replace(
-          '$$WK_REV$$', str(wk_revision or ''))
+      if wk_revision:
+        args['gclient_spec'] = args['gclient_spec'].replace(
+            '$$WK_REV$$', str(wk_revision))
+      else:
+        args['gclient_spec'] = args['gclient_spec'].replace(
+            ',"webkit_revision":"$$WK_REV$$"', '')
       args['gclient_spec'] = args['gclient_spec'].replace(
           '$$NACL_REV$$', str(nacl_revision or ''))
     if patch:
       args['patch'] = patch
     elif args.get('patch') is None:
       del args['patch']
     cmd = buildstep.LoggedRemoteCommand('gclient', args)
     self.startCommand(cmd, warnings)
 
   def describe(self, done=False):
@@ skipping 925 matching lines @@
   def evaluateCommand(self, cmd):
     observer_result = self.script_observer.annotate_status
     # Check if ProcessLogShellStep detected a failure or warning also.
     log_processor_result = ProcessLogShellStep.evaluateCommand(self, cmd)
     return BuilderStatus.combine(observer_result, log_processor_result)
 
   def commandComplete(self, cmd):
     self.script_observer.handleReturnCode(cmd.rc)
     self._removePreamble()
     return ProcessLogShellStep.commandComplete(self, cmd)