bot_update: understand new Gerrit patch properties.

recipe_modules/bot_update/api.py

 # Copyright 2014 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.
 
 
 """Recipe module to ensure a checkout is consistant on a bot."""
 
 from recipe_engine import recipe_api
 
 
 class BotUpdateApi(recipe_api.RecipeApi):
 
-  def __init__(self, issue, patchset, repository, gerrit_ref, rietveld,
-               revision, parent_got_revision, deps_revision_overrides,
-               fail_patch, *args, **kwargs):
-    self._issue = issue
-    self._patchset = patchset
-    self._repository = repository
-    self._gerrit_ref = gerrit_ref
+  def __init__(self, issue, patch_issue, patchset, patch_set, patch_project,

[Michael Achenbach, 2016/10/24 08:18:13]

Sure this isn't called anywhere with args? Maybe to be safe, put new keywords in
the end with defaults? And land a new sorting as secondary refactoring CL?
(unless you're sure)

[tandrii(chromium), 2016/10/24 11:43:37]

I wasn't just like you, but I am now after reading the recipe_engine source.

+               repository, patch_repository_url, gerrit_ref, patch_ref,
+               patch_gerrit_url, rietveld, revision, parent_got_revision,
+               deps_revision_overrides, fail_patch, *args, **kwargs):
+    self._issue = issue or patch_issue
+    self._patchset = patchset or patch_set

[Michael Achenbach, 2016/10/24 08:18:13]

Are these strings or integers? I assume 0 can't ever be a valid number, right?

[tandrii(chromium), 2016/10/24 11:43:37]

strings for now.

+    self._repository = repository or patch_repository_url
+    self._gerrit_ref = gerrit_ref or patch_ref
+    self._gerrit = patch_gerrit_url
     self._rietveld = rietveld
     self._revision = revision
     self._parent_got_revision = parent_got_revision
     self._deps_revision_overrides = deps_revision_overrides
     self._fail_patch = fail_patch
 
     self._last_returned_properties = {}
     super(BotUpdateApi, self).__init__(*args, **kwargs)
 
   def __call__(self, name, cmd, **kwargs):
@@ skipping 67 matching lines @@
 
     # Construct our bot_update command.  This basically be inclusive of
     # everything required for bot_update to know:
     root = patch_root
     if root is None:
       root = self.m.gclient.calculate_patch_root(
           self.m.properties.get('patch_project'), cfg)
 
     if patch:
       issue = issue or self._issue
       patchset = patchset or self._patchset

[tandrii(chromium), 2016/10/24 11:43:37]

same here - strings.

       gerrit_repo = self._repository
       gerrit_ref = self._gerrit_ref
     else:
       # The trybot recipe sometimes wants to de-apply the patch. In which case
       # we pretend the issue/patchset never existed.
       issue = patchset = email_file = key_file = None
       gerrit_repo = gerrit_ref = None
 
     # Issue and patchset must come together.
     if issue:
       assert patchset
     if patchset:
       assert issue
 
     # The gerrit_ref and gerrit_repo must be together or not at all.  If one is
     # missing, clear both of them.
     if not gerrit_ref or not gerrit_repo:
       gerrit_repo = gerrit_ref = None
     assert (gerrit_ref != None) == (gerrit_repo != None)
+    if gerrit_ref:
+      # Gerrit patches have historically not specified issue and patchset.
+      # resourece/bot_update has as a result implicit assumption that set issue
+      # implies Rietveld patch.
+      # TODO(tandrii): fix this madness.
+      issue = patchset = None
 
     # Point to the oauth2 auth files if specified.
     # These paths are where the bots put their credential files.
     oauth2_json_file = email_file = key_file = None
     if oauth2_json:
       if self.m.platform.is_win:
         oauth2_json_file = 'C:\\creds\\refresh_tokens\\internal-try'
       else:
         oauth2_json_file = '/creds/refresh_tokens/internal-try'
     elif patch_oauth2:
@@ skipping 155 matching lines @@
 
         # bot_update actually just sets root to be the folder name of the
         # first solution.
         if step_result.json.output['did_run']:
           co_root = step_result.json.output['root']
           cwd = kwargs.get('cwd', self.m.path['slave_build'])
           if 'checkout' not in self.m.path:
             self.m.path['checkout'] = cwd.join(*co_root.split(self.m.path.sep))
 
     return step_result