bot_update: don't forget to apply Gerrit patches for DEPS-ed in projects.

recipe_modules/bot_update/resources/bot_update.py

 #!/usr/bin/env python
 # 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.
 
 # TODO(hinoka): Use logging.
 
 import cStringIO
 import codecs
 import collections
@@ skipping 1062 matching lines @@
   # Only try once, since subsequent failures hide the real failure.
   try:
     call(*cmd, tries=1)
   except SubprocessFailed as e:
     raise PatchFailed(e.message, e.code, e.output)
 
 def apply_gerrit_ref(gerrit_repo, gerrit_ref, root, gerrit_reset,
                      gerrit_rebase_patch_ref):
   gerrit_repo = gerrit_repo or 'origin'
   assert gerrit_ref
+  base_rev = git('rev-parse', 'HEAD', cwd=root).strip()
+
   print '===Applying gerrit ref==='
-  print 'Repo is %r, ref is %r, root is %r' % (gerrit_repo, gerrit_ref, root)
+  print 'Repo is %r @ %r, ref is %r, root is %r' % (
+      gerrit_repo, base_rev, gerrit_ref, root)
   try:
-    base_rev = git('rev-parse', 'HEAD', cwd=root).strip()
     git('retry', 'fetch', gerrit_repo, gerrit_ref, cwd=root, tries=1)
     git('checkout', 'FETCH_HEAD', cwd=root)
 
     if gerrit_rebase_patch_ref:
       print '===Rebasing==='
       # git rebase requires a branch to operate on.
       temp_branch_name = 'tmp/' + uuid.uuid4().hex
       try:
         ok = False
         git('checkout', '-b', temp_branch_name, cwd=root)
@@ skipping 178 matching lines @@
 
   git_ref = git_checkout(solutions, revisions, shallow, refs, git_cache_dir)
 
   patches = None
   if patch_url:
     patches = get_svn_patch(patch_url)
 
   print '===Processing patch solutions==='
   already_patched = []
   patch_root = patch_root or ''
+  applied_gerrit_patch = False
   print 'Patch root is %r' % patch_root
   for solution in solutions:
     print 'Processing solution %r' % solution['name']
     if (patch_root == solution['name'] or
         solution['name'].startswith(patch_root + '/')):
       relative_root = solution['name'][len(patch_root) + 1:]
       target = '/'.join([relative_root, 'DEPS']).lstrip('/')
       print '  relative root is %r, target is %r' % (relative_root, target)
       if patches:
         apply_svn_patch(patch_root, patches, whitelist=[target])
         already_patched.append(target)
       elif issue:
         apply_rietveld_issue(issue, patchset, patch_root, rietveld_server,
                              revision_mapping, git_ref, apply_issue_email_file,
                              apply_issue_key_file, whitelist=[target])
         already_patched.append(target)
-      elif gerrit_ref and gerrit_rebase_patch_ref:
+      elif gerrit_ref:
         apply_gerrit_ref(gerrit_repo, gerrit_ref, patch_root, gerrit_reset,
-                         True)
+                         gerrit_rebase_patch_ref)
+        applied_gerrit_patch = True
 
   # Ensure our build/ directory is set up with the correct .gclient file.
   gclient_configure(solutions, target_os, target_os_only, git_cache_dir)
 
   # Let gclient do the DEPS syncing.
   # The branch-head refspec is a special case because its possible Chrome
   # src, which contains the branch-head refspecs, is DEPSed in.
   gclient_output = gclient_sync(buildspec or BRANCH_HEADS_REFSPEC in refs,
                                 shallow)
 
@@ skipping 13 matching lines @@
   dir_names = [sln['name'] for sln in solutions]
   ensure_deps_revisions(gclient_output.get('solutions', {}),
                         dir_names, revisions)
   # Apply the rest of the patch here (sans DEPS)
   if patches:
     apply_svn_patch(patch_root, patches, blacklist=already_patched)
   elif issue:
     apply_rietveld_issue(issue, patchset, patch_root, rietveld_server,
                          revision_mapping, git_ref, apply_issue_email_file,
                          apply_issue_key_file, blacklist=already_patched)
-  elif gerrit_ref and not gerrit_rebase_patch_ref:
-    apply_gerrit_ref(gerrit_repo, gerrit_ref, patch_root, gerrit_reset, False)
+  elif gerrit_ref and not applied_gerrit_patch:
+    # If gerrit_ref was for solution's main repository, it has already been
+    # applied above. This chunk is executed only for patches to DEPS-ed in
+    # git repositories.
+    apply_gerrit_ref(gerrit_repo, gerrit_ref, patch_root, gerrit_reset,
+                     gerrit_rebase_patch_ref)
 
   # Reset the deps_file point in the solutions so that hooks get run properly.
   for sln in solutions:
     sln['deps_file'] = sln.get('deps_file', 'DEPS').replace('.DEPS.git', 'DEPS')
   gclient_configure(solutions, target_os, target_os_only, git_cache_dir)
 
   return gclient_output
 
 
 def parse_revisions(revisions, root):
@@ skipping 386 matching lines @@
   except Exception:
     # Unexpected failure.
     emit_flag(options.flag_file)
     raise
   else:
     emit_flag(options.flag_file)
 
 
 if __name__ == '__main__':
   sys.exit(main())