Allow trybot changes to run against WebKit@HEAD.

scripts/master/chromium_step.py

Index: scripts/master/chromium_step.py
===================================================================
--- scripts/master/chromium_step.py	(revision 181366)
+++ scripts/master/chromium_step.py	(working copy)
@@ -101,13 +101,18 @@
   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.
@@ -125,9 +130,13 @@
     args['revision'] = revision
     args['branch'] = branch
     if args.get('gclient_spec'):
+      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(
-          '$$WK_REV$$', str(wk_revision or ''))
-      args['gclient_spec'] = args['gclient_spec'].replace(
           '$$NACL_REV$$', str(nacl_revision or ''))
     if patch:
       args['patch'] = patch