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

[M-A Ruel, 2013/02/08 19:36:40]

Why are you ditching revision? Won't this break canary slave?

[tony, 2013/02/08 19:50:33]

No, this value was never used.  The code in the try block (line 108) would
always set the wk_revision based on the property.  Also, it doesn't make sense
to set the webkit revision to the chromium revision.

$$WK_REV$$ is currently only used by the testers in the builder/tester
configuration on the webkit.chromium canary bots.

+    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:
+      match = re.search(r'third_party/WebKit@(\w+)', patch[1])
+      if match:
+        wk_revision = match.group(1)
+
     nacl_revision = revision

[M-A Ruel, 2013/02/08 19:36:40]

In particular, this doesn't get changed.

[tony, 2013/02/08 19:50:33]

I suspect this is only used by some builder/tester case as well.

     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$$"', '')

[M-A Ruel, 2013/02/08 19:36:40]

I'd remove the initial comma, since this assumes a specific ordering of the
keys.

[tony, 2013/02/08 19:50:33]

If we don't remove the comma, the python dictionary will have ,, which won't
parse.  I guess I could make a separate pass to collapse duplicate commas?

[M-A Ruel, 2013/02/11 18:26:57]

Don't bother

       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)