Don't run deps2git if the repo doesn't have a .DEPS.git.

scripts/slave/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 11 matching lines @@
 import time
 import urllib2
 import urlparse
 import uuid
 
 import os.path as path
 
 # How many bytes at a time to read from pipes.
 BUF_SIZE = 256
 
-# Set this to true on flag day.
-FLAG_DAY = False
-
 # Define a bunch of directory paths.
 # Relative to the current working directory.
 CURRENT_DIR = path.abspath(os.getcwd())
 BUILDER_DIR = path.dirname(CURRENT_DIR)
 SLAVE_DIR = path.dirname(BUILDER_DIR)
 
 # Relative to this script's filesystem path.
 THIS_DIR = path.dirname(path.abspath(__file__))
 SCRIPTS_DIR = path.dirname(THIS_DIR)
 BUILD_DIR = path.dirname(SCRIPTS_DIR)
@@ skipping 231 matching lines @@
 DISABLED_BUILDERS = {}
 DISABLED_BUILDERS.update(internal_data.get('DISABLED_BUILDERS', {}))
 
 DISABLED_SLAVES = {}
 DISABLED_SLAVES.update(internal_data.get('DISABLED_SLAVES', {}))
 
 HEAD_BUILDERS = {}
 HEAD_BUILDERS.update(internal_data.get('HEAD_BUILDERS', {}))
 
 # These masters work only in Git, meaning for got_revision, always output
-# a git hash rather than a SVN rev. This goes away if flag_day is True.
+# a git hash rather than a SVN rev.
 GIT_MASTERS = []
 GIT_MASTERS += internal_data.get('GIT_MASTERS', [])

[zty, 2014/10/10 18:11:28]

Delete this ?

 
 
 # How many times to retry failed subprocess calls.
 RETRIES = 3
 
 # Find deps2git
 DEPS2GIT_DIR_PATH = path.join(SCRIPTS_DIR, 'tools', 'deps2git')
 DEPS2GIT_PATH = path.join(DEPS2GIT_DIR_PATH, 'deps2git.py')
 S2G_INTERNAL_PATH = path.join(SCRIPTS_DIR, 'tools', 'deps2git_internal',
                               'svn_to_git_internal.py')
@@ skipping 243 matching lines @@
       solution['deps_file'] = path.join(buildspec.container, buildspec.version,
                                         '.DEPS.git')
     elif parsed_path in RECOGNIZED_PATHS:
       solution['url'] = RECOGNIZED_PATHS[parsed_path]
     elif parsed_url.scheme == 'https' and 'googlesource' in parsed_url.netloc:
       pass
     else:
       print 'Warning: %s' % ('path %r not recognized' % parsed_path,)
 
     # Point .DEPS.git is the git version of the DEPS file.
-    if not FLAG_DAY and not buildspec:
+    if not buildspec:

[zty, 2014/10/10 18:11:28]

this if block should be deleted if FLAG_DAY is True

[szager1, 2014/10/10 18:18:10]

No, it's still needed.  We still sometimes do builds from buildspecs instead of
DEPS.

       solution['deps_file'] = '.DEPS.git'
 
     # Strip out deps containing $$V8_REV$$, etc.
     if 'custom_deps' in solution:
       new_custom_deps = {}
       for deps_name, deps_value in solution['custom_deps'].iteritems():
         if deps_value and '$$' in deps_value:
           print 'Dropping %s:%s from custom deps' % (deps_name, deps_value)
         else:
           new_custom_deps[deps_name] = deps_value
@@ skipping 145 matching lines @@
   cmd = ['log', '--format=%H', '--max-count=1', '--', filename]
   return git(*cmd, cwd=repo_base).strip()
 
 
 def need_to_run_deps2git(repo_base, deps_file, deps_git_file):
   """Checks to see if we need to run deps2git.
 
   Returns True if there was a DEPS change after the last .DEPS.git update
   or if DEPS has local modifications.
   """
-  print 'Checking if %s exists' % deps_git_file
-  if not path.isfile(deps_git_file):
-    # .DEPS.git doesn't exist but DEPS does?  Generate one (unless we're past
-    # migration day, in which case we don't need .DEPS.git.
-    print 'it doesn\'t exist!'
-    return not FLAG_DAY
-
   # See if DEPS is dirty
   deps_file_status = git(
       'status', '--porcelain', deps_file, cwd=repo_base).strip()
   if deps_file_status and deps_file_status.startswith('M '):
     return True
 
   last_known_deps_ref = _last_commit_for_file(deps_file, repo_base)
   last_known_deps_git_ref = _last_commit_for_file(deps_git_file, repo_base)
   merge_base_ref = git('merge-base', last_known_deps_ref,
                        last_known_deps_git_ref, cwd=repo_base).strip()
@@ skipping 77 matching lines @@
 
   git_buildspec = get_git_buildspec(buildspec_path, buildspec_version)
   with open(deps_git_file, 'wb') as f:
     f.write(git_buildspec)
 
 
 def ensure_deps2git(solution, shallow):
   repo_base = path.join(os.getcwd(), solution['name'])
   deps_file = path.join(repo_base, 'DEPS')
   deps_git_file = path.join(repo_base, '.DEPS.git')
-  if not git('ls-files', 'DEPS', cwd=repo_base).strip():
+  if (not git('ls-files', 'DEPS', cwd=repo_base).strip() or
+      not git('ls-files', '.DEPS.git', cwd=repo_base).strip()):
     return
 
   print 'Checking if %s is newer than %s' % (deps_file, deps_git_file)
   if not need_to_run_deps2git(repo_base, deps_file, deps_git_file):
     return
 
   print '===DEPS file modified, need to run deps2git==='
   cmd = [sys.executable, DEPS2GIT_PATH,
          '--workspace', os.getcwd(),
          '--cache_dir', CACHE_DIR,
@@ skipping 581 matching lines @@
   parse.add_option('--shallow', action='store_true',
                    help='Use shallow clones for cache repositories.')
   parse.add_option('--gyp_env', action='append', default=[],
                    help='Environment variables to pass into gclient runhooks.')
   parse.add_option('--clobber', action='store_true',
                    help='Delete checkout first, always')
   parse.add_option('--bot_update_clobber', action='store_true', dest='clobber',
                    help='(synonym for --clobber)')
   parse.add_option('-o', '--output_json',
                    help='Output JSON information into a specified file')
-  parse.add_option('--post-flag-day', action='store_true',
-                   help='Behave as if the chromium git migration has already '
-                   'happened')
   parse.add_option('--no_shallow', action='store_true',
                    help='Bypass disk detection and never shallow clone. '
                         'Does not override the --shallow flag')
   parse.add_option('--no_runhooks', action='store_true',
                    help='Do not run hooks on official builder.')
   parse.add_option('--refs', action='append',
                    help='Also fetch this refspec for the main solution(s). '
                         'Eg. +refs/branch-heads/*')
   parse.add_option('--with_branch_heads', action='store_true',
                     help='Always pass --with_branch_heads to gclient.  This '
                           'does the same thing as --refs +refs/branch-heads/*')
 
 
   options, args = parse.parse_args()
 
-  if options.post_flag_day:
-    global FLAG_DAY
-    FLAG_DAY = True
-
   if not options.refs:
     options.refs = []
 
   if options.with_branch_heads:
     options.refs.append(BRANCH_HEADS_REFSPEC)
     del options.with_branch_heads
 
   try:
     if options.revision_mapping_file:
       if options.revision_mapping:
@@ skipping 105 matching lines @@
                 log_lines=[('patch error', e.output),],
                 patch_root=options.patch_root,
                 patch_failure=True,
                 step_text='%s PATCH FAILED' % step_text)
     else:
       # If we're not on recipes, tell annotator about our got_revisions.
       emit_log_lines('patch error', e.output)
       print '@@@STEP_TEXT@%s PATCH FAILED@@@' % step_text
     raise
 
-  # Revision is an svn revision, unless its a git master or past flag day.
-  use_svn_rev = master not in GIT_MASTERS and not FLAG_DAY
+  # Revision is an svn revision, unless it's a git master.
+  use_svn_rev = master not in GIT_MASTERS

[zty, 2014/10/10 18:11:28]

This should be deleted if FLAG_DAY is True. use_svn_rev should always be False.

[szager1, 2014/10/10 18:18:10]

Hmm, I have to think about that.  There may still be non-chromium cases that
need this.  hinoka would know better than I.

   # Take care of got_revisions outputs.
   revision_mapping = dict(GOT_REVISION_MAPPINGS.get(svn_root, {}))
   if options.revision_mapping:
     revision_mapping.update(options.revision_mapping)
 
   got_revisions = parse_got_revision(gclient_output, revision_mapping,
                                      use_svn_rev)
 
   if not got_revisions and options.revision:
     # If we have no revision_mapping, then just pass through the first revision
@@ skipping 77 matching lines @@
   except Exception:
     # Unexpected failure.
     emit_flag(options.flag_file)
     raise
   else:
     emit_flag(options.flag_file)
 
 
 if __name__ == '__main__':
   sys.exit(main())