libv8 5.1.281.59.1 → 5.2.361.43.0

data/vendor/depot_tools/git_cl.py

@@ -7,11 +7,12 @@
 
 """A git-command for integrating reviews on Rietveld and Gerrit."""
 
+from __future__ import print_function
+
 from distutils.version import LooseVersion
 from multiprocessing.pool import ThreadPool
 import base64
 import collections
-import glob
 import httplib
 import json
 import logging
@@ -60,8 +61,9 @@ import subcommand
 import subprocess2
 import watchlists
 
-__version__ = '1.0'
+__version__ = '2.0'
 
+COMMIT_BOT_EMAIL = 'commit-bot@chromium.org'
 DEFAULT_SERVER = 'https://codereview.appspot.com'
 POSTUPSTREAM_HOOK_PATTERN = '.git/hooks/post-cl-%s'
 DESCRIPTION_BACKUP_FILE = '~/.git_cl_description_backup'
@@ -83,7 +85,7 @@ settings = None
 
 
 def DieWithError(message):
-  print >> sys.stderr, message
+  print(message, file=sys.stderr)
   sys.exit(1)
 
 
@@ -366,7 +368,7 @@ def trigger_try_jobs(auth_config, changelist, options, masters, category):
   )
   print_text.append('To see results here, run:        git cl try-results')
   print_text.append('To see results in browser, run:  git cl web')
-  print '\n'.join(print_text)
+  print('\n'.join(print_text))
 
 
 def fetch_try_jobs(auth_config, changelist, options):
@@ -380,9 +382,9 @@ def fetch_try_jobs(auth_config, changelist, options):
   if authenticator.has_cached_credentials():
     http = authenticator.authorize(httplib2.Http())
   else:
-    print ('Warning: Some results might be missing because %s' %
-           # Get the message on how to login.
-           auth.LoginRequiredError(rietveld_host).message)
+    print('Warning: Some results might be missing because %s' %
+          # Get the message on how to login.
+          (auth.LoginRequiredError(rietveld_host).message,))
     http = httplib2.Http()
 
   http.force_exception_to_status_code = True
@@ -411,7 +413,7 @@ def fetch_try_jobs(auth_config, changelist, options):
 def print_tryjobs(options, builds):
   """Prints nicely result of fetch_try_jobs."""
   if not builds:
-    print 'No tryjobs scheduled'
+    print('No tryjobs scheduled')
     return
 
   # Make a copy, because we'll be modifying builds dictionary.
@@ -426,8 +428,8 @@ def print_tryjobs(options, builds):
         parameters = json.loads(b['parameters_json'])
         name = parameters['builder_name']
       except (ValueError, KeyError) as error:
-        print 'WARNING: failed to get builder name for build %s: %s' % (
-              b['id'], error)
+        print('WARNING: failed to get builder name for build %s: %s' % (
+              b['id'], error))
         name = None
       builder_names_cache[b['id']] = name
       return name
@@ -467,9 +469,9 @@ def print_tryjobs(options, builds):
         builds.pop(b['id'])
         result.append(b)
     if result:
-      print colorize(title)
+      print(colorize(title))
       for b in sorted(result, key=sort_key):
-        print ' ', colorize('\t'.join(map(str, f(b))))
+        print(' ', colorize('\t'.join(map(str, f(b)))))
 
   total = len(builds)
   pop(status='COMPLETED', result='SUCCESS',
@@ -504,7 +506,7 @@ def print_tryjobs(options, builds):
   pop(title='Other:',
       f=lambda b: (get_name(b), 'id=%s' % b['id']))
   assert len(builds) == 0
-  print 'Total: %d tryjobs' % total
+  print('Total: %d tryjobs' % total)
 
 
 def MatchSvnGlob(url, base_url, glob_spec, allow_wildcards):
@@ -768,11 +770,28 @@ class Settings(object):
   def GetSquashGerritUploads(self):
     """Return true if uploads to Gerrit should be squashed by default."""
     if self.squash_gerrit_uploads is None:
-      self.squash_gerrit_uploads = (
-          RunGit(['config', '--bool', 'gerrit.squash-uploads'],
-                 error_ok=True).strip() == 'true')
+      self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
+      if self.squash_gerrit_uploads is None:
+        # Default is squash now (http://crbug.com/611892#c23).
+        self.squash_gerrit_uploads = not (
+            RunGit(['config', '--bool', 'gerrit.squash-uploads'],
+                   error_ok=True).strip() == 'false')
     return self.squash_gerrit_uploads
 
+  def GetSquashGerritUploadsOverride(self):
+    """Return True or False if codereview.settings should be overridden.
+
+    Returns None if no override has been defined.
+    """
+    # See also http://crbug.com/611892#c23
+    result = RunGit(['config', '--bool', 'gerrit.override-squash-uploads'],
+                    error_ok=True).strip()
+    if result == 'true':
+      return True
+    if result == 'false':
+      return False
+    return None
+
   def GetGerritSkipEnsureAuthenticated(self):
     """Return True if EnsureAuthenticated should not be done for Gerrit
     uploads."""
@@ -1121,20 +1140,18 @@ class Changelist(object):
 
     if upstream_git_obj is None:
       if self.GetBranch() is None:
-        print >> sys.stderr, (
-            'ERROR: unable to determine current branch (detached HEAD?)')
+        print('ERROR: unable to determine current branch (detached HEAD?)',
+              file=sys.stderr)
       else:
-        print >> sys.stderr, (
-            'ERROR: no upstream branch')
+        print('ERROR: no upstream branch', file=sys.stderr)
       return False
 
     # Verify the commit we're diffing against is in our current branch.
     upstream_sha = RunGit(['rev-parse', '--verify', upstream_git_obj]).strip()
     common_ancestor = RunGit(['merge-base', upstream_sha, 'HEAD']).strip()
     if upstream_sha != common_ancestor:
-      print >> sys.stderr, (
-          'ERROR: %s is not in the current branch.  You may need to rebase '
-          'your tracking branch' % upstream_sha)
+      print('ERROR: %s is not in the current branch.  You may need to rebase '
+            'your tracking branch' % upstream_sha, file=sys.stderr)
       return False
 
     # List the commits inside the diff, and verify they are all local.
@@ -1150,13 +1167,13 @@ class Changelist(object):
 
     common_commits = set(commits_in_diff) & set(commits_in_remote)
     if common_commits:
-      print >> sys.stderr, (
-          'ERROR: Your diff contains %d commits already in %s.\n'
-          'Run "git log --oneline %s..HEAD" to get a list of commits in '
-          'the diff.  If you are using a custom git flow, you can override'
-          ' the reference used for this check with "git config '
-          'gitcl.remotebranch <git-ref>".' % (
-              len(common_commits), remote_branch, upstream_git_obj))
+      print('ERROR: Your diff contains %d commits already in %s.\n'
+            'Run "git log --oneline %s..HEAD" to get a list of commits in '
+            'the diff.  If you are using a custom git flow, you can override'
+            ' the reference used for this check with "git config '
+            'gitcl.remotebranch <git-ref>".' % (
+                len(common_commits), remote_branch, upstream_git_obj),
+            file=sys.stderr)
       return False
     return True
 
@@ -1323,7 +1340,7 @@ class Changelist(object):
           default_presubmit=None, may_prompt=may_prompt,
           rietveld_obj=self._codereview_impl.GetRieveldObjForPresubmit(),
           gerrit_obj=self._codereview_impl.GetGerritObjForPresubmit())
-    except presubmit_support.PresubmitFailure, e:
+    except presubmit_support.PresubmitFailure as e:
       DieWithError(
           ('%s\nMaybe your depot_tools is out of date?\n'
            'If all fails, contact maruel@') % e)
@@ -1389,17 +1406,22 @@ class Changelist(object):
       local_patchset = self.GetPatchset()
       if (latest_patchset and local_patchset and
           local_patchset != latest_patchset):
-        print ('The last upload made from this repository was patchset #%d but '
-               'the most recent patchset on the server is #%d.'
-               % (local_patchset, latest_patchset))
-        print ('Uploading will still work, but if you\'ve uploaded to this '
-               'issue from another machine or branch the patch you\'re '
-               'uploading now might not include those changes.')
+        print('The last upload made from this repository was patchset #%d but '
+              'the most recent patchset on the server is #%d.'
+              % (local_patchset, latest_patchset))
+        print('Uploading will still work, but if you\'ve uploaded to this '
+              'issue from another machine or branch the patch you\'re '
+              'uploading now might not include those changes.')
         ask_for_data('About to upload; enter to confirm.')
 
     print_stats(options.similarity, options.find_copies, git_diff_args)
     ret = self.CMDUploadChange(options, git_diff_args, change)
     if not ret:
+      if options.use_commit_queue:
+        self.SetCQState(_CQState.COMMIT)
+      elif options.cq_dry_run:
+        self.SetCQState(_CQState.DRY_RUN)
+
       git_set_branch_value('last-upload-hash',
                            RunGit(['rev-parse', 'HEAD']).strip())
       # Run post upload hooks, if specified.
@@ -1413,10 +1435,10 @@ class Changelist(object):
 
       # Upload all dependencies if specified.
       if options.dependencies:
-        print
-        print '--dependencies has been specified.'
-        print 'All dependent local branches will be re-uploaded.'
-        print
+        print()
+        print('--dependencies has been specified.')
+        print('All dependent local branches will be re-uploaded.')
+        print()
         # Remove the dependencies flag from args so that we do not end up in a
         # loop.
         orig_args.remove('--dependencies')
@@ -1577,7 +1599,8 @@ class _RietveldChangelistImpl(_ChangelistCodereviewBase):
   def __init__(self, changelist, auth_config=None, rietveld_server=None):
     super(_RietveldChangelistImpl, self).__init__(changelist)
     assert settings, 'must be initialized in _ChangelistCodereviewBase'
-    settings.GetDefaultServerUrl()
+    if not rietveld_server:
+      settings.GetDefaultServerUrl()
 
     self._rietveld_server = rietveld_server
     self._auth_config = auth_config
@@ -1625,9 +1648,8 @@ class _RietveldChangelistImpl(_ChangelistCodereviewBase):
         DieWithError(
             '\nFailed to fetch issue description. HTTP error %d' % e.code)
     except urllib2.URLError as e:
-      print >> sys.stderr, (
-          'Warning: Failed to retrieve CL description due to network '
-          'failure.')
+      print('Warning: Failed to retrieve CL description due to network '
+            'failure.', file=sys.stderr)
       return ''
 
   def GetMostRecentPatchset(self):
@@ -1691,11 +1713,23 @@ class _RietveldChangelistImpl(_ChangelistCodereviewBase):
 
     messages = props.get('messages') or []
 
+    # Skip CQ messages that don't require owner's action.
+    while messages and messages[-1]['sender'] == COMMIT_BOT_EMAIL:
+      if 'Dry run:' in messages[-1]['text']:
+        messages.pop()
+      elif 'The CQ bit was unchecked' in messages[-1]['text']:
+        # This message always follows prior messages from CQ,
+        # so skip this too.
+        messages.pop()
+      else:
+        # This is probably a CQ messages warranting user attention.
+        break
+
     if not messages:
       # No message was sent.
       return 'unsent'
     if messages[-1]['sender'] != props.get('owner_email'):
-      # Non-LGTM reply from non-owner
+      # Non-LGTM reply from non-owner and not CQ bot.
       return 'reply'
     return 'waiting'
 
@@ -1707,13 +1741,19 @@ class _RietveldChangelistImpl(_ChangelistCodereviewBase):
     return self.RpcServer().close_issue(self.GetIssue())
 
   def SetFlag(self, flag, value):
-    """Patchset must match."""
+    return self.SetFlags({flag: value})
+
+  def SetFlags(self, flags):
+    """Sets flags on this CL/patchset in Rietveld.
+
+    The latest patchset in Rietveld must be the same as latest known locally.
+    """
     if not self.GetPatchset():
       DieWithError('The patchset needs to match. Send another patchset.')
     try:
-      return self.RpcServer().set_flag(
-          self.GetIssue(), self.GetPatchset(), flag, value)
-    except urllib2.HTTPError, e:
+      return self.RpcServer().set_flags(
+          self.GetIssue(), self.GetPatchset(), flags)
+    except urllib2.HTTPError as e:
       if e.code == 404:
         DieWithError('The issue %s doesn\'t exist.' % self.GetIssue())
       if e.code == 403:
@@ -1761,9 +1801,10 @@ class _RietveldChangelistImpl(_ChangelistCodereviewBase):
     if new_state == _CQState.COMMIT:
       self.SetFlag('commit', '1')
     elif new_state == _CQState.NONE:
-      self.SetFlag('commit', '0')
+      self.SetFlags({'commit': '0', 'cq_dry_run': '0'})
     else:
-      raise NotImplementedError()
+      assert new_state == _CQState.DRY_RUN
+      self.SetFlags({'commit': '1', 'cq_dry_run': '1'})
 
 
   def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
@@ -1819,7 +1860,7 @@ class _RietveldChangelistImpl(_ChangelistCodereviewBase):
       subprocess2.check_call(cmd, env=GetNoGitPagerEnv(),
                              stdin=patch_data, stdout=subprocess2.VOID)
     except subprocess2.CalledProcessError:
-      print 'Failed to apply the patch'
+      print('Failed to apply the patch')
       return 1
 
     # If we had an issue, commit the current state and register the issue.
@@ -1830,9 +1871,9 @@ class _RietveldChangelistImpl(_ChangelistCodereviewBase):
                                % {'i': self.GetIssue(), 'p': patchset})])
       self.SetIssue(self.GetIssue())
       self.SetPatchset(patchset)
-      print "Committed patch locally."
+      print('Committed patch locally.')
     else:
-      print "Patch applied to index."
+      print('Patch applied to index.')
     return 0
 
   @staticmethod
@@ -1869,15 +1910,15 @@ class _RietveldChangelistImpl(_ChangelistCodereviewBase):
       upload_args.extend(['--email', options.email])
 
     if self.GetIssue():
-      if options.title:
+      if options.title is not None:
         upload_args.extend(['--title', options.title])
       if options.message:
         upload_args.extend(['--message', options.message])
       upload_args.extend(['--issue', str(self.GetIssue())])
-      print ('This branch is associated with issue %s. '
-             'Adding patch to that issue.' % self.GetIssue())
+      print('This branch is associated with issue %s. '
+            'Adding patch to that issue.' % self.GetIssue())
     else:
-      if options.title:
+      if options.title is not None:
         upload_args.extend(['--title', options.title])
       message = (options.title or options.message or
                  CreateDescriptionFromLog(args))
@@ -1887,10 +1928,10 @@ class _RietveldChangelistImpl(_ChangelistCodereviewBase):
                                      options.tbr_owners,
                                      change)
       if not options.force:
-        change_desc.prompt()
+        change_desc.prompt(bug=options.bug)
 
       if not change_desc.description:
-        print "Description is empty; aborting."
+        print('Description is empty; aborting.')
         return 1
 
       upload_args.extend(['--message', change_desc.description])
@@ -1948,10 +1989,10 @@ class _RietveldChangelistImpl(_ChangelistCodereviewBase):
         # A local branch is being tracked.
         local_branch = upstream_branch
         if settings.GetIsSkipDependencyUpload(local_branch):
-          print
-          print ('Skipping dependency patchset upload because git config '
-                 'branch.%s.skip-deps-uploads is set to True.' % local_branch)
-          print
+          print()
+          print('Skipping dependency patchset upload because git config '
+                'branch.%s.skip-deps-uploads is set to True.' % local_branch)
+          print()
         else:
           auth_config = auth.extract_auth_config_from_options(options)
           branch_cl = Changelist(branchref='refs/heads/'+local_branch,
@@ -1975,9 +2016,6 @@ class _RietveldChangelistImpl(_ChangelistCodereviewBase):
     if project:
       upload_args.extend(['--project', project])
 
-    if options.cq_dry_run:
-      upload_args.extend(['--cq_dry_run'])
-
     try:
       upload_args = ['upload'] + upload_args + args
       logging.info('upload.RealMain(%s)', upload_args)
@@ -2001,9 +2039,6 @@ class _RietveldChangelistImpl(_ChangelistCodereviewBase):
     if not self.GetIssue():
       self.SetIssue(issue)
     self.SetPatchset(patchset)
-
-    if options.use_commit_queue:
-      self.SetCQState(_CQState.COMMIT)
     return 0
 
 
@@ -2019,6 +2054,15 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
   def _GetGerritHost(self):
     # Lazy load of configs.
     self.GetCodereviewServer()
+    if self._gerrit_host and '.' not in self._gerrit_host:
+      # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
+      # This happens for internal stuff http://crbug.com/614312.
+      parsed = urlparse.urlparse(self.GetRemoteUrl())
+      if parsed.scheme == 'sso':
+        print('WARNING: using non https URLs for remote is likely broken\n'
+              '  Your current remote is: %s'  % self.GetRemoteUrl())
+        self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
+        self._gerrit_server = 'https://%s' % self._gerrit_host
     return self._gerrit_host
 
   def _GetGitHost(self):
@@ -2225,6 +2269,14 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
   def CMDLand(self, force, bypass_hooks, verbose):
     if git_common.is_dirty_git_tree('land'):
       return 1
+    detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
+    if u'Commit-Queue' in detail.get('labels', {}):
+      if not force:
+        ask_for_data('\nIt seems this repository has a Commit Queue, '
+                     'which can test and land changes for you. '
+                     'Are you sure you wish to bypass it?\n'
+                     'Press Enter to continue, Ctrl+C to abort.')
+
     differs = True
     last_upload = RunGit(['config',
                           'branch.%s.gerritsquashhash' % self.GetBranch()],
@@ -2233,7 +2285,6 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
     if not last_upload or RunGit(['diff', last_upload]).strip():
       print('WARNING: some changes from local branch haven\'t been uploaded')
     else:
-      detail = self._GetChangeDetail(['CURRENT_REVISION'])
       if detail['current_revision'] == last_upload:
         differs = False
       else:
@@ -2339,8 +2390,13 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
     """Upload the current branch to Gerrit."""
     if options.squash and options.no_squash:
       DieWithError('Can only use one of --squash or --no-squash')
-    options.squash = ((settings.GetSquashGerritUploads() or options.squash) and
-                      not options.no_squash)
+
+    if not options.squash and not options.no_squash:
+      # Load default for user, repo, squash=true, in this order.
+      options.squash = settings.GetSquashGerritUploads()
+    elif options.no_squash:
+      options.squash = False
+
     # We assume the remote called "origin" is the one we want.
     # It is probably not worthwhile to support different workflows.
     gerrit_remote = 'origin'
@@ -2351,37 +2407,6 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
 
     if options.squash:
       self._GerritCommitMsgHookCheck(offer_removal=not options.force)
-      if not self.GetIssue():
-        # TODO(tandrii): deperecate this after 2016Q2.  Backwards compatibility
-        # with shadow branch, which used to contain change-id for a given
-        # branch, using which we can fetch actual issue number and set it as the
-        # property of the branch, which is the new way.
-        message = RunGitSilent([
-            'show', '--format=%B', '-s',
-            'refs/heads/git_cl_uploads/%s' % self.GetBranch()])
-        if message:
-          change_ids = git_footers.get_footer_change_id(message.strip())
-          if change_ids and len(change_ids) == 1:
-            details = self._GetChangeDetail(issue=change_ids[0])
-            if details:
-              print('WARNING: found old upload in branch git_cl_uploads/%s '
-                    'corresponding to issue %s' %
-                    (self.GetBranch(), details['_number']))
-              self.SetIssue(details['_number'])
-          if not self.GetIssue():
-            DieWithError(
-                '\n'  # For readability of the blob below.
-                'Found old upload in branch git_cl_uploads/%s, '
-                'but failed to find corresponding Gerrit issue.\n'
-                'If you know the issue number, set it manually first:\n'
-                '    git cl issue 123456\n'
-                'If you intended to upload this CL as new issue, '
-                'just delete or rename the old upload branch:\n'
-                '    git rename-branch git_cl_uploads/%s old_upload-%s\n'
-                'After that, please run git cl upload again.' %
-                tuple([self.GetBranch()] * 3))
-        # End of backwards compatability.
-
       if self.GetIssue():
         # Try to get the message from a previous upload.
         message = self.GetDescription()
@@ -2415,7 +2440,7 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
           ask_for_data('Press enter to edit now, Ctrl+C to abort')
           if not options.force:
             change_desc = ChangeDescription(message)
-            change_desc.prompt()
+            change_desc.prompt(bug=options.bug)
             message = change_desc.description
             if not message:
               DieWithError("Description is empty. Aborting...")
@@ -2428,7 +2453,7 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
         change_desc = ChangeDescription(
             options.message or CreateDescriptionFromLog(args))
         if not options.force:
-          change_desc.prompt()
+          change_desc.prompt(bug=options.bug)
         if not change_desc.description:
           DieWithError("Description is empty. Aborting...")
         message = change_desc.description
@@ -2457,11 +2482,10 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
         # Gerrit will create additional CLs when uploading.
         if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
                           RunGitSilent(['rev-parse', parent + ':'])):
-          # TODO(tandrii): remove "old depot_tools" part on April 12, 2016.
           DieWithError(
               'Upload upstream branch %s first.\n'
-              'Note: maybe you\'ve uploaded it with --no-squash or with an old '
-              'version of depot_tools. If so, then re-upload it with:\n'
+              'Note: maybe you\'ve uploaded it with --no-squash. '
+              'If so, then re-upload it with:\n'
               '    git cl upload --squash\n' % upstream_branch_name)
       else:
         parent = self.GetCommonAncestorWithUpstream()
@@ -2563,15 +2587,13 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
     RunGit(git_command)
     new_log_desc = CreateDescriptionFromLog(args)
     if git_footers.get_footer_change_id(new_log_desc):
-      print 'git-cl: Added Change-Id to commit message.'
+      print('git-cl: Added Change-Id to commit message.')
       return new_log_desc
     else:
       DieWithError('ERROR: Gerrit commit-msg hook not installed.')
 
   def SetCQState(self, new_state):
     """Sets the Commit-Queue label assuming canonical CQ config for Gerrit."""
-    # TODO(tandrii): maybe allow configurability in codereview.settings or by
-    # self-discovery of label config for this CL using REST API.
     vote_map = {
         _CQState.NONE:    0,
         _CQState.DRY_RUN: 1,
@@ -2610,6 +2632,41 @@ def _process_codereview_select_options(parser, options):
     options.forced_codereview = 'rietveld'
 
 
+def _get_bug_line_values(default_project, bugs):
+  """Given default_project and comma separated list of bugs, yields bug line
+  values.
+
+  Each bug can be either:
+    * a number, which is combined with default_project
+    * string, which is left as is.
+
+  This function may produce more than one line, because bugdroid expects one
+  project per line.
+
+  >>> list(_get_bug_line_values('v8', '123,chromium:789'))
+      ['v8:123', 'chromium:789']
+  """
+  default_bugs = []
+  others = []
+  for bug in bugs.split(','):
+    bug = bug.strip()
+    if bug:
+      try:
+        default_bugs.append(int(bug))
+      except ValueError:
+        others.append(bug)
+
+  if default_bugs:
+    default_bugs = ','.join(map(str, default_bugs))
+    if default_project:
+      yield '%s:%s' % (default_project, default_bugs)
+    else:
+      yield default_bugs
+  for other in sorted(others):
+    # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
+    yield other
+
+
 class ChangeDescription(object):
   """Contains a parsed form of the change description."""
   R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
@@ -2663,7 +2720,7 @@ class ChangeDescription(object):
         reviewers.append(name)
     if add_owners_tbr:
       owners_db = owners.Database(change.RepositoryRoot(),
-        fopen=file, os_path=os.path, glob=glob.glob)
+        fopen=file, os_path=os.path)
       all_reviewers = set(tbr_names + reviewers)
       missing_files = owners_db.files_not_covered_by(change.LocalPaths(),
                                                      all_reviewers)
@@ -2685,7 +2742,7 @@ class ChangeDescription(object):
       if new_tbr_line:
         self.append_footer(new_tbr_line)
 
-  def prompt(self):
+  def prompt(self, bug=None):
     """Asks the user to update the description."""
     self.set_description([
       '# Enter a description of the change.',
@@ -2697,7 +2754,12 @@ class ChangeDescription(object):
 
     regexp = re.compile(self.BUG_LINE)
     if not any((regexp.match(line) for line in self._description_lines)):
-      self.append_footer('BUG=%s' % settings.GetBugPrefix())
+      prefix = settings.GetBugPrefix()
+      values = list(_get_bug_line_values(prefix, bug or '')) or [prefix]
+      for value in values:
+        # TODO(tandrii): change this to 'Bug: xxx' to be a proper Gerrit footer.
+        self.append_footer('BUG=%s' % value)
+
     content = gclient_utils.RunEditor(self.description, True,
                                       git_editor=settings.GetGitEditor())
     if not content:
@@ -2870,10 +2932,6 @@ def DownloadGerritHook(force):
       if not force:
         return
     try:
-      print(
-          'WARNING: installing Gerrit commit-msg hook.\n'
-          '         This behavior of git cl will soon be disabled.\n'
-          '         See bug http://crbug.com/579176.')
       urlretrieve(src, dst)
       if not hasSheBang(dst):
         DieWithError('Not a script: %s\n'
@@ -2969,11 +3027,11 @@ def CMDbaseurl(parser, args):
   branch = ShortBranchName(branchref)
   _, args = parser.parse_args(args)
   if not args:
-    print("Current base-url:")
+    print('Current base-url:')
     return RunGit(['config', 'branch.%s.base-url' % branch],
                   error_ok=False).strip()
   else:
-    print("Setting base-url to %s" % args[0])
+    print('Setting base-url to %s' % args[0])
     return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
                   error_ok=False).strip()
 
@@ -3088,25 +3146,25 @@ def upload_branch_deps(cl, args):
       branch_name, tracked = tokens
       tracked_to_dependents[tracked].append(branch_name)
 
-  print
-  print 'The dependent local branches of %s are:' % root_branch
+  print()
+  print('The dependent local branches of %s are:' % root_branch)
   dependents = []
   def traverse_dependents_preorder(branch, padding=''):
     dependents_to_process = tracked_to_dependents.get(branch, [])
     padding += '  '
     for dependent in dependents_to_process:
-      print '%s%s' % (padding, dependent)
+      print('%s%s' % (padding, dependent))
       dependents.append(dependent)
       traverse_dependents_preorder(dependent, padding)
   traverse_dependents_preorder(root_branch)
-  print
+  print()
 
   if not dependents:
-    print 'There are no dependent local branches for %s' % root_branch
+    print('There are no dependent local branches for %s' % root_branch)
     return 0
 
-  print ('This command will checkout all dependent branches and run '
-         '"git cl upload".')
+  print('This command will checkout all dependent branches and run '
+        '"git cl upload".')
   ask_for_data('[Press enter to continue or ctrl-C to quit]')
 
   # Add a default patchset title to all upload calls in Rietveld.
@@ -3118,28 +3176,28 @@ def upload_branch_deps(cl, args):
   # Go through all dependents, checkout the branch and upload.
   try:
     for dependent_branch in dependents:
-      print
-      print '--------------------------------------'
-      print 'Running "git cl upload" from %s:' % dependent_branch
+      print()
+      print('--------------------------------------')
+      print('Running "git cl upload" from %s:' % dependent_branch)
       RunGit(['checkout', '-q', dependent_branch])
-      print
+      print()
       try:
         if CMDupload(OptionParser(), args) != 0:
-          print 'Upload failed for %s!' % dependent_branch
+          print('Upload failed for %s!' % dependent_branch)
           failures[dependent_branch] = 1
       except:  # pylint: disable=W0702
         failures[dependent_branch] = 1
-      print
+      print()
   finally:
     # Swap back to the original root branch.
     RunGit(['checkout', '-q', root_branch])
 
-  print
-  print 'Upload complete for dependent branches!'
+  print()
+  print('Upload complete for dependent branches!')
   for dependent_branch in dependents:
     upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
-    print '  %s : %s' % (dependent_branch, upload_status)
-  print
+    print('  %s : %s' % (dependent_branch, upload_status))
+  print()
 
   return 0
 
@@ -3163,7 +3221,7 @@ def CMDarchive(parser, args):
   if not branches:
     return 0
 
-  print 'Finding all branches associated with closed issues...'
+  print('Finding all branches associated with closed issues...')
   changes = [Changelist(branchref=b, auth_config=auth_config)
               for b in branches.splitlines()]
   alignment = max(5, max(len(c.GetBranch()) for c in changes))
@@ -3177,15 +3235,15 @@ def CMDarchive(parser, args):
   proposal.sort()
 
   if not proposal:
-    print 'No branches with closed codereview issues found.'
+    print('No branches with closed codereview issues found.')
     return 0
 
   current_branch = GetCurrentBranch()
 
-  print '\nBranches with closed issues that will be archived:\n'
-  print '%*s | %s' % (alignment, 'Branch name', 'Archival tag name')
+  print('\nBranches with closed issues that will be archived:\n')
+  print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
   for next_item in proposal:
-    print '%*s   %s' % (alignment, next_item[0], next_item[1])
+    print('%*s   %s' % (alignment, next_item[0], next_item[1]))
 
   if any(branch == current_branch for branch, _ in proposal):
     print('You are currently on a branch \'%s\' which is associated with a '
@@ -3195,14 +3253,15 @@ def CMDarchive(parser, args):
     return 1
 
   if not options.force:
-    if ask_for_data('\nProceed with deletion (Y/N)? ').lower() != 'y':
-      print 'Aborted.'
+    answer = ask_for_data('\nProceed with deletion (Y/n)? ').lower()
+    if answer not in ('y', ''):
+      print('Aborted.')
       return 1
 
   for branch, tagname in proposal:
     RunGit(['tag', tagname, branch])
     RunGit(['branch', '-D', branch])
-  print '\nJob\'s done!'
+  print('\nJob\'s done!')
 
   return 0
 
@@ -3237,19 +3296,19 @@ def CMDstatus(parser, args):
   if options.field:
     cl = Changelist(auth_config=auth_config)
     if options.field.startswith('desc'):
-      print cl.GetDescription()
+      print(cl.GetDescription())
     elif options.field == 'id':
       issueid = cl.GetIssue()
       if issueid:
-        print issueid
+        print(issueid)
     elif options.field == 'patch':
       patchset = cl.GetPatchset()
       if patchset:
-        print patchset
+        print(patchset)
     elif options.field == 'url':
       url = cl.GetIssueURL()
       if url:
-        print url
+        print(url)
     return 0
 
   branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
@@ -3260,7 +3319,7 @@ def CMDstatus(parser, args):
   changes = [
       Changelist(branchref=b, auth_config=auth_config)
       for b in branches.splitlines()]
-  print 'Branches associated with reviews:'
+  print('Branches associated with reviews:')
   output = get_cl_statuses(changes,
                            fine_grained=not options.fast,
                            max_processes=options.maxjobs)
@@ -3284,21 +3343,21 @@ def CMDstatus(parser, args):
       color = ''
       reset = ''
     status_str = '(%s)' % status if status else ''
-    print '  %*s : %s%s %s%s' % (
+    print('  %*s : %s%s %s%s' % (
           alignment, ShortBranchName(branch), color, url,
-          status_str, reset)
+          status_str, reset))
 
   cl = Changelist(auth_config=auth_config)
-  print
-  print 'Current branch:',
-  print cl.GetBranch()
+  print()
+  print('Current branch:',)
+  print(cl.GetBranch())
   if not cl.GetIssue():
-    print 'No issue assigned.'
+    print('No issue assigned.')
     return 0
-  print 'Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL())
+  print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
   if not options.fast:
-    print 'Issue description:'
-    print cl.GetDescription(pretty=True)
+    print('Issue description:')
+    print(cl.GetDescription(pretty=True))
   return 0
 
 
@@ -3346,8 +3405,8 @@ def CMDissue(parser, args):
     for issue in args:
       if not issue:
         continue
-      print 'Branch for issue number %s: %s' % (
-          issue, ', '.join(issue_branch_map.get(int(issue)) or ('None',)))
+      print('Branch for issue number %s: %s' % (
+          issue, ', '.join(issue_branch_map.get(int(issue)) or ('None',))))
   else:
     cl = Changelist(codereview=options.forced_codereview)
     if len(args) > 0:
@@ -3357,7 +3416,7 @@ def CMDissue(parser, args):
         DieWithError('Pass a number to set the issue or none to list it.\n'
                      'Maybe you want to run git cl status?')
       cl.SetIssue(issue)
-    print 'Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL())
+    print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
   return 0
 
 
@@ -3406,11 +3465,11 @@ def CMDcomments(parser, args):
       color = Fore.MAGENTA
     else:
       color = Fore.BLUE
-    print '\n%s%s  %s%s' % (
+    print('\n%s%s  %s%s' % (
         color, message['date'].split('.', 1)[0], message['sender'],
-        Fore.RESET)
+        Fore.RESET))
     if message['text'].strip():
-      print '\n'.join('  ' + l for l in message['text'].splitlines())
+      print('\n'.join('  ' + l for l in message['text'].splitlines()))
   if options.json_file:
     with open(options.json_file, 'wb') as f:
       json.dump(summary, f)
@@ -3432,24 +3491,30 @@ def CMDdescription(parser, args):
 
   target_issue = None
   if len(args) > 0:
-    issue_arg = ParseIssueNumberArgument(args[0])
-    if not issue_arg.valid:
+    target_issue = ParseIssueNumberArgument(args[0])
+    if not target_issue.valid:
       parser.print_help()
       return 1
-    target_issue = issue_arg.issue
 
   auth_config = auth.extract_auth_config_from_options(options)
 
-  cl = Changelist(
-      auth_config=auth_config, issue=target_issue,
-      codereview=options.forced_codereview)
+  kwargs = {
+      'auth_config': auth_config,
+      'codereview': options.forced_codereview,
+  }
+  if target_issue:
+    kwargs['issue'] = target_issue.issue
+    if options.forced_codereview == 'rietveld':
+      kwargs['rietveld_server'] = target_issue.hostname
+
+  cl = Changelist(**kwargs)
 
   if not cl.GetIssue():
     DieWithError('This branch has no associated changelist.')
   description = ChangeDescription(cl.GetDescription())
 
   if options.display:
-    print description.description
+    print(description.description)
     return 0
 
   if options.new_description:
@@ -3494,7 +3559,7 @@ def CMDlint(parser, args):
     import cpplint
     import cpplint_chromium
   except ImportError:
-    print "Your depot_tools is missing cpplint.py and/or cpplint_chromium.py."
+    print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
     return 1
 
   # Change the current working directory before calling lint so that it
@@ -3506,7 +3571,7 @@ def CMDlint(parser, args):
     change = cl.GetChange(cl.GetCommonAncestorWithUpstream(), None)
     files = [f.LocalPath() for f in change.AffectedFiles()]
     if not files:
-      print "Cannot lint an empty CL"
+      print('Cannot lint an empty CL')
       return 1
 
     # Process cpplints arguments if any.
@@ -3521,15 +3586,15 @@ def CMDlint(parser, args):
     for filename in filenames:
       if white_regex.match(filename):
         if black_regex.match(filename):
-          print "Ignoring file %s" % filename
+          print('Ignoring file %s' % filename)
         else:
           cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
                               extra_check_functions)
       else:
-        print "Skipping file %s" % filename
+        print('Skipping file %s' % filename)
   finally:
     os.chdir(previous_cwd)
-  print "Total errors found: %d\n" % cpplint._cpplint_state.error_count
+  print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
   if cpplint._cpplint_state.error_count != 0:
     return 1
   return 0
@@ -3546,7 +3611,7 @@ def CMDpresubmit(parser, args):
   auth_config = auth.extract_auth_config_from_options(options)
 
   if not options.force and git_common.is_dirty_git_tree('presubmit'):
-    print 'use --force to check even if tree is dirty.'
+    print('use --force to check even if tree is dirty.')
     return 1
 
   cl = Changelist(auth_config=auth_config)
@@ -3678,6 +3743,11 @@ def CMDupload(parser, args):
   parser.add_option('-f', action='store_true', dest='force',
                     help="force yes to questions (don't prompt)")
   parser.add_option('-m', dest='message', help='message for patchset')
+  parser.add_option('-b', '--bug',
+                    help='pre-populate the bug number(s) for this issue. '
+                         'If several, separate with commas')
+  parser.add_option('--message-file', dest='message_file',
+                    help='file which contains message for patchset')
   parser.add_option('-t', dest='title',
                     help='title for patchset (Rietveld only)')
   parser.add_option('-r', '--reviewers',
@@ -3733,6 +3803,15 @@ def CMDupload(parser, args):
   options.reviewers = cleanup_list(options.reviewers)
   options.cc = cleanup_list(options.cc)
 
+  if options.message_file:
+    if options.message:
+      parser.error('only one of --message and --message-file allowed.')
+    options.message = gclient_utils.FileRead(options.message_file)
+    options.message_file = None
+
+  if options.cq_dry_run and options.use_commit_queue:
+    parser.error('only one of --use-commit-queue and --cq-dry-run allowed.')
+
   # For sanity of test expectations, do this otherwise lazy-loading *now*.
   settings.GetIsGerrit()
 
@@ -3798,16 +3877,16 @@ def SendUpstream(parser, args, cmd):
   current = cl.GetBranch()
   remote, upstream_branch = cl.FetchUpstreamTuple(cl.GetBranch())
   if not settings.GetIsGitSvn() and remote == '.':
-    print
-    print 'Attempting to push branch %r into another local branch!' % current
-    print
-    print 'Either reparent this branch on top of origin/master:'
-    print '  git reparent-branch --root'
-    print
-    print 'OR run `git rebase-update` if you think the parent branch is already'
-    print 'committed.'
-    print
-    print '  Current parent: %r' % upstream_branch
+    print()
+    print('Attempting to push branch %r into another local branch!' % current)
+    print()
+    print('Either reparent this branch on top of origin/master:')
+    print('  git reparent-branch --root')
+    print()
+    print('OR run `git rebase-update` if you think the parent branch is ')
+    print('already committed.')
+    print()
+    print('  Current parent: %r' % upstream_branch)
     return 1
 
   if not args or cmd == 'land':
@@ -3816,7 +3895,7 @@ def SendUpstream(parser, args, cmd):
 
   if options.contributor:
     if not re.match('^.*\s<\S+@\S+>$', options.contributor):
-      print "Please provide contibutor as 'First Last <email@example.com>'"
+      print("Please provide contibutor as 'First Last <email@example.com>'")
       return 1
 
   base_branch = args[0]
@@ -3830,9 +3909,9 @@ def SendUpstream(parser, args, cmd):
   upstream_commits = RunGit(['rev-list', '^' + cl.GetBranchRef(),
                              base_branch]).splitlines()
   if upstream_commits:
-    print ('Base branch "%s" has %d commits '
-           'not in this branch.' % (base_branch, len(upstream_commits)))
-    print 'Run "git merge %s" before attempting to %s.' % (base_branch, cmd)
+    print('Base branch "%s" has %d commits '
+          'not in this branch.' % (base_branch, len(upstream_commits)))
+    print('Run "git merge %s" before attempting to %s.' % (base_branch, cmd))
     return 1
 
   # This is the revision `svn dcommit` will commit on top of.
@@ -3850,10 +3929,10 @@ def SendUpstream(parser, args, cmd):
 
     extra_commits = RunGit(['rev-list', '^' + svn_head, base_svn_head])
     if extra_commits:
-      print ('This branch has %d additional commits not upstreamed yet.'
-             % len(extra_commits.splitlines()))
-      print ('Upstream "%s" or rebase this branch on top of the upstream trunk '
-             'before attempting to %s.' % (base_branch, cmd))
+      print('This branch has %d additional commits not upstreamed yet.'
+            % len(extra_commits.splitlines()))
+      print('Upstream "%s" or rebase this branch on top of the upstream trunk '
+            'before attempting to %s.' % (base_branch, cmd))
       return 1
 
   merge_base = RunGit(['merge-base', base_branch, 'HEAD']).strip()
@@ -3888,8 +3967,8 @@ def SendUpstream(parser, args, cmd):
     if not cl.GetIssue() and options.bypass_hooks:
       change_desc = ChangeDescription(CreateDescriptionFromLog([merge_base]))
     else:
-      print 'No description set.'
-      print 'Visit %s/edit to set it.' % (cl.GetIssueURL())
+      print('No description set.')
+      print('Visit %s/edit to set it.' % (cl.GetIssueURL()))
       return 1
 
   # Keep a separate copy for the commit message, because the commit message
@@ -4007,7 +4086,7 @@ def SendUpstream(parser, args, cmd):
       RunGit(['branch', '-D', CHERRY_PICK_BRANCH])
 
   if not revision:
-    print 'Failed to push. If this persists, please file a bug.'
+    print('Failed to push. If this persists, please file a bug.')
     return 1
 
   killed = False
@@ -4029,8 +4108,8 @@ def SendUpstream(parser, args, cmd):
             'Committed: %s%s' % (viewvc_url, revision))
       elif revision:
         change_desc.append_footer('Committed: %s' % (revision,))
-    print ('Closing issue '
-           '(you may be prompted for your codereview password)...')
+    print('Closing issue '
+          '(you may be prompted for your codereview password)...')
     cl.UpdateDescription(change_desc.description)
     cl.CloseIssue()
     props = cl.GetIssueProperties()
@@ -4042,14 +4121,12 @@ def SendUpstream(parser, args, cmd):
     else:
       comment += ' (presubmit successful).'
     cl.RpcServer().add_comment(cl.GetIssue(), comment)
-    cl.SetIssue(None)
 
   if pushed_to_pending:
     _, branch = cl.FetchUpstreamTuple(cl.GetBranch())
-    print 'The commit is in the pending queue (%s).' % pending_ref
-    print (
-        'It will show up on %s in ~1 min, once it gets a Cr-Commit-Position '
-        'footer.' % branch)
+    print('The commit is in the pending queue (%s).' % pending_ref)
+    print('It will show up on %s in ~1 min, once it gets a Cr-Commit-Position '
+          'footer.' % branch)
 
   hook = POSTUPSTREAM_HOOK_PATTERN % cmd
   if os.path.isfile(hook):
@@ -4059,9 +4136,9 @@ def SendUpstream(parser, args, cmd):
 
 
 def WaitForRealCommit(remote, pushed_commit, local_base_ref, real_ref):
-  print
-  print 'Waiting for commit to be landed on %s...' % real_ref
-  print '(If you are impatient, you may Ctrl-C once without harm)'
+  print()
+  print('Waiting for commit to be landed on %s...' % real_ref)
+  print('(If you are impatient, you may Ctrl-C once without harm)')
   target_tree = RunGit(['rev-parse', '%s:' % pushed_commit]).strip()
   current_rev = RunGit(['rev-parse', local_base_ref]).strip()
   mirror = settings.GetGitMirror(remote)
@@ -4079,7 +4156,7 @@ def WaitForRealCommit(remote, pushed_commit, local_base_ref, real_ref):
     commits = RunGit(['rev-list', '%s..%s' % (current_rev, to_rev)])
     for commit in commits.splitlines():
       if RunGit(['rev-parse', '%s:' % commit]).strip() == target_tree:
-        print 'Found commit on %s' % real_ref
+        print('Found commit on %s' % real_ref)
         return commit
 
     current_rev = to_rev
@@ -4100,51 +4177,49 @@ def PushToGitPending(remote, pending_ref, upstream_ref):
   attempts_left = max_attempts
   while attempts_left:
     if attempts_left != max_attempts:
-      print 'Retrying, %d attempts left...' % (attempts_left - 1,)
+      print('Retrying, %d attempts left...' % (attempts_left - 1,))
     attempts_left -= 1
 
     # Fetch. Retry fetch errors.
-    print 'Fetching pending ref %s...' % pending_ref
+    print('Fetching pending ref %s...' % pending_ref)
     code, out = RunGitWithCode(
         ['retry', 'fetch', remote, '+%s:%s' % (pending_ref, local_pending_ref)])
     if code:
-      print 'Fetch failed with exit code %d.' % code
+      print('Fetch failed with exit code %d.' % code)
       if out.strip():
-        print out.strip()
+        print(out.strip())
       continue
 
     # Try to cherry pick. Abort on merge conflicts.
-    print 'Cherry-picking commit on top of pending ref...'
+    print('Cherry-picking commit on top of pending ref...')
     RunGitWithCode(['checkout', local_pending_ref], suppress_stderr=True)
     code, out = RunGitWithCode(['cherry-pick', cherry])
     if code:
-      print (
-          'Your patch doesn\'t apply cleanly to ref \'%s\', '
-          'the following files have merge conflicts:' % pending_ref)
-      print RunGit(['diff', '--name-status', '--diff-filter=U']).strip()
-      print 'Please rebase your patch and try again.'
+      print('Your patch doesn\'t apply cleanly to ref \'%s\', '
+            'the following files have merge conflicts:' % pending_ref)
+      print(RunGit(['diff', '--name-status', '--diff-filter=U']).strip())
+      print('Please rebase your patch and try again.')
       RunGitWithCode(['cherry-pick', '--abort'])
       return code, out
 
     # Applied cleanly, try to push now. Retry on error (flake or non-ff push).
-    print 'Pushing commit to %s... It can take a while.' % pending_ref
+    print('Pushing commit to %s... It can take a while.' % pending_ref)
     code, out = RunGitWithCode(
         ['retry', 'push', '--porcelain', remote, 'HEAD:%s' % pending_ref])
     if code == 0:
       # Success.
-      print 'Commit pushed to pending ref successfully!'
+      print('Commit pushed to pending ref successfully!')
       return code, out
 
-    print 'Push failed with exit code %d.' % code
+    print('Push failed with exit code %d.' % code)
     if out.strip():
-      print out.strip()
+      print(out.strip())
     if IsFatalPushFailure(out):
-      print (
-          'Fatal push error. Make sure your .netrc credentials and git '
-          'user.email are correct and you have push access to the repo.')
+      print('Fatal push error. Make sure your .netrc credentials and git '
+            'user.email are correct and you have push access to the repo.')
       return code, out
 
-  print 'All attempts to push to pending ref failed.'
+  print('All attempts to push to pending ref failed.')
   return code, out
 
 
@@ -4173,6 +4248,11 @@ review to be closed, without actually landing upstream. If you choose to
 proceed, please verify that the commit lands upstream as expected."""
     print(message)
     ask_for_data('[Press enter to dcommit or ctrl-C to quit]')
+  # TODO(tandrii): kill this post SVN migration with
+  # https://codereview.chromium.org/2076683002
+  print('WARNING: chrome infrastructure is migrating SVN repos to Git.\n'
+        'Please let us know of this project you are committing to:'
+        '    http://crbug.com/600451')
   return SendUpstream(parser, args, 'dcommit')
 
 
@@ -4346,12 +4426,12 @@ def CMDtree(parser, args):
   _, args = parser.parse_args(args)
   status = GetTreeStatus()
   if 'unset' == status:
-    print 'You must configure your tree status URL by running "git cl config".'
+    print('You must configure your tree status URL by running "git cl config".')
     return 2
 
-  print "The tree is %s" % status
-  print
-  print GetTreeStatusReason()
+  print('The tree is %s' % status)
+  print()
+  print(GetTreeStatusReason())
   if status != 'open':
     return 1
   return 0
@@ -4469,28 +4549,8 @@ def CMDtry(parser, args):
           options.verbose,
           sys.stdout)
 
-      if not options.bot:
-        # Get try masters from cq.cfg if any.
-        # TODO(tandrii): some (but very few) projects store cq.cfg in different
-        # location.
-        cq_cfg = os.path.join(change.RepositoryRoot(),
-                              'infra', 'config', 'cq.cfg')
-        if os.path.exists(cq_cfg):
-          masters = {}
-          cq_masters = commit_queue.get_master_builder_map(
-              cq_cfg, include_experimental=False, include_triggered=False)
-          for master, builders in cq_masters.iteritems():
-            for builder in builders:
-              # Skip presubmit builders, because these will fail without LGTM.
-              masters.setdefault(master, {})[builder] = ['defaulttests']
-          if masters:
-            print('Loaded default bots from CQ config (%s)' % cq_cfg)
-            return masters
-          else:
-            print('CQ config exists (%s) but has no try bots listed' % cq_cfg)
-
     if not options.bot:
-      parser.error('No default try builder to try, use --bot')
+      return {}
 
     builders_and_tests = {}
     # TODO(machenbach): The old style command-line options don't support
@@ -4515,14 +4575,35 @@ def CMDtry(parser, args):
     return {options.master: builders_and_tests}
 
   masters = GetMasterMap()
+  if not masters:
+    # Default to triggering Dry Run (see http://crbug.com/625697).
+    if options.verbose:
+      print('git cl try with no bots now defaults to CQ Dry Run.')
+    try:
+      cl.SetCQState(_CQState.DRY_RUN)
+      print('scheduled CQ Dry Run on %s' % cl.GetIssueURL())
+      return 0
+    except KeyboardInterrupt:
+      raise
+    except:
+      print('WARNING: failed to trigger CQ Dry Run.\n'
+            'Either:\n'
+            ' * your project has no CQ\n'
+            ' * you don\'t have permission to trigger Dry Run\n'
+            ' * bug in this code (see stack trace below).\n'
+            'Consider specifying which bots to trigger manually '
+            'or asking your project owners for permissions '
+            'or contacting Chrome Infrastructure team at '
+            'https://www.chromium.org/infra\n\n')
+      # Still raise exception so that stack trace is printed.
+      raise
 
   for builders in masters.itervalues():
     if any('triggered' in b for b in builders):
-      print >> sys.stderr, (
-          'ERROR You are trying to send a job to a triggered bot. This type of'
-          ' bot requires an\ninitial job from a parent (usually a builder).  '
-          'Instead send your job to the parent.\n'
-          'Bot list: %s' % builders)
+      print('ERROR You are trying to send a job to a triggered bot. This type '
+            'of bot requires an\ninitial job from a parent (usually a builder).'
+            '  Instead send your job to the parent.\n'
+            'Bot list: %s' % builders, file=sys.stderr)
       return 1
 
   patchset = cl.GetMostRecentPatchset()
@@ -4537,12 +4618,12 @@ def CMDtry(parser, args):
     try:
       trigger_try_jobs(auth_config, cl, options, masters, 'git_cl_try')
     except BuildbucketResponseException as ex:
-      print 'ERROR: %s' % ex
+      print('ERROR: %s' % ex)
       return 1
     except Exception as e:
       stacktrace = (''.join(traceback.format_stack()) + traceback.format_exc())
-      print 'ERROR: Exception when trying to trigger tryjobs: %s\n%s' % (
-          e, stacktrace)
+      print('ERROR: Exception when trying to trigger tryjobs: %s\n%s' %
+            (e, stacktrace))
       return 1
   else:
     try:
@@ -4558,10 +4639,10 @@ def CMDtry(parser, args):
 
     for (master, builders) in sorted(masters.iteritems()):
       if master:
-        print 'Master: %s' % master
+        print('Master: %s' % master)
       length = max(len(builder) for builder in builders)
       for builder in sorted(builders):
-        print '  %*s: %s' % (length, builder, ','.join(builders[builder]))
+        print('  %*s: %s' % (length, builder, ','.join(builders[builder])))
   return 0
 
 
@@ -4598,12 +4679,12 @@ def CMDtry_results(parser, args):
   try:
     jobs = fetch_try_jobs(auth_config, cl, options)
   except BuildbucketResponseException as ex:
-    print 'Buildbucket error: %s' % ex
+    print('Buildbucket error: %s' % ex)
     return 1
   except Exception as e:
     stacktrace = (''.join(traceback.format_stack()) + traceback.format_exc())
-    print 'ERROR: Exception when trying to fetch tryjobs: %s\n%s' % (
-        e, stacktrace)
+    print('ERROR: Exception when trying to fetch tryjobs: %s\n%s' %
+          (e, stacktrace))
     return 1
   print_tryjobs(options, jobs)
   return 0
@@ -4622,12 +4703,12 @@ def CMDupstream(parser, args):
     branch = cl.GetBranch()
     RunGit(['branch', '--set-upstream', branch, args[0]])
     cl = Changelist()
-    print "Upstream branch set to " + cl.GetUpstreamBranch()
+    print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
 
     # Clear configured merge-base, if there is one.
     git_common.remove_merge_base(branch)
   else:
-    print cl.GetUpstreamBranch()
+    print(cl.GetUpstreamBranch())
   return 0
 
 
@@ -4639,7 +4720,7 @@ def CMDweb(parser, args):
 
   issue_url = Changelist().GetIssueURL()
   if not issue_url:
-    print >> sys.stderr, 'ERROR No issue to open'
+    print('ERROR No issue to open', file=sys.stderr)
     return 1
 
   webbrowser.open(issue_url)
@@ -4662,7 +4743,7 @@ def CMDset_commit(parser, args):
 
   cl = Changelist(auth_config=auth_config)
   if options.clear:
-    state = _CQState.CLEAR
+    state = _CQState.NONE
   elif options.dry_run:
     state = _CQState.DRY_RUN
   else:
@@ -4759,7 +4840,7 @@ def CMDowners(parser, args):
       [f.LocalPath() for f in
           cl.GetChange(base_branch, None).AffectedFiles()],
       change.RepositoryRoot(), author,
-      fopen=file, os_path=os.path, glob=glob.glob,
+      fopen=file, os_path=os.path,
       disable_color=options.no_color).run()
 
 
@@ -4785,8 +4866,8 @@ def MatchingFileType(file_name, extensions):
 @subcommand.usage('[files or directories to diff]')
 def CMDformat(parser, args):
   """Runs auto-formatting tools (clang-format etc.) on the diff."""
-  CLANG_EXTS = ['.cc', '.cpp', '.h', '.mm', '.proto', '.java']
-  GN_EXTS = ['.gn', '.gni']
+  CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
+  GN_EXTS = ['.gn', '.gni', '.typemap']
   parser.add_option('--full', action='store_true',
                     help='Reformat the full content of all touched files')
   parser.add_option('--dry-run', action='store_true',
@@ -4840,7 +4921,7 @@ def CMDformat(parser, args):
     # Locate the clang-format binary in the checkout
     try:
       clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
-    except clang_format.NotFoundError, e:
+    except clang_format.NotFoundError as e:
       DieWithError(e)
 
     if opts.full:
@@ -4856,7 +4937,7 @@ def CMDformat(parser, args):
       try:
         script = clang_format.FindClangFormatScriptInChromiumTree(
             'clang-format-diff.py')
-      except clang_format.NotFoundError, e:
+      except clang_format.NotFoundError as e:
         DieWithError(e)
 
       cmd = [sys.executable, script, '-p0']
@@ -4905,9 +4986,9 @@ def CMDformat(parser, args):
       if opts.dry_run and stdout:
         return_value = 2
     except dart_format.NotFoundError as e:
-      print ('Warning: Unable to check Dart code formatting. Dart SDK not ' +
-             'found in this checkout. Files in other languages are still ' +
-             'formatted.')
+      print('Warning: Unable to check Dart code formatting. Dart SDK not '
+            'found in this checkout. Files in other languages are still '
+            'formatted.')
 
   # Format GN build files. Always run on full build files for canonical form.
   if gn_diff_files:
@@ -4951,19 +5032,19 @@ def CMDcheckout(parser, args):
   for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
     branches.extend(find_issues(cls.IssueSettingSuffix()))
   if len(branches) == 0:
-    print 'No branch found for issue %s.' % target_issue
+    print('No branch found for issue %s.' % target_issue)
     return 1
   if len(branches) == 1:
     RunGit(['checkout', branches[0]])
   else:
-    print 'Multiple branches match issue %s:' % target_issue
+    print('Multiple branches match issue %s:' % target_issue)
     for i in range(len(branches)):
-      print '%d: %s' % (i, branches[i])
+      print('%d: %s' % (i, branches[i]))
     which = raw_input('Choose by index: ')
     try:
       RunGit(['checkout', branches[int(which)]])
     except (IndexError, ValueError):
-      print 'Invalid selection, not checking out any branch.'
+      print('Invalid selection, not checking out any branch.')
       return 1
 
   return 0
@@ -4971,11 +5052,11 @@ def CMDcheckout(parser, args):
 
 def CMDlol(parser, args):
   # This command is intentionally undocumented.
-  print zlib.decompress(base64.b64decode(
+  print(zlib.decompress(base64.b64decode(
       'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
       'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
       'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
-      'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY'))
+      'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')))
   return 0
 
 
@@ -4997,9 +5078,8 @@ class OptionParser(optparse.OptionParser):
 
 def main(argv):
   if sys.hexversion < 0x02060000:
-    print >> sys.stderr, (
-        '\nYour python version %s is unsupported, please upgrade.\n' %
-        sys.version.split(' ', 1)[0])
+    print('\nYour python version %s is unsupported, please upgrade.\n' %
+          (sys.version.split(' ', 1)[0],), file=sys.stderr)
     return 2
 
   # Reload settings.
@@ -5012,7 +5092,7 @@ def main(argv):
     return dispatcher.execute(OptionParser(), argv)
   except auth.AuthenticationError as e:
     DieWithError(str(e))
-  except urllib2.HTTPError, e:
+  except urllib2.HTTPError as e:
     if e.code != 500:
       raise
     DieWithError(