libv8 6.7.288.46.1 → 7.3.492.27.0beta1

data/vendor/depot_tools/git_cl.py

@@ -5,7 +5,7 @@
 
 # Copyright (C) 2008 Evan Martin <martine@danga.com>
 
-"""A git-command for integrating reviews on Rietveld and Gerrit."""
+"""A git-command for integrating reviews on Gerrit."""
 
 from __future__ import print_function
 
@@ -29,6 +29,7 @@ import stat
 import sys
 import tempfile
 import textwrap
+import time
 import urllib
 import urllib2
 import urlparse
@@ -43,7 +44,6 @@ except ImportError:
 
 from third_party import colorama
 from third_party import httplib2
-from third_party import upload
 import auth
 import checkout
 import clang_format
@@ -55,10 +55,11 @@ import gerrit_util
 import git_cache
 import git_common
 import git_footers
+import metrics
+import metrics_utils
 import owners
 import owners_finder
 import presubmit_support
-import rietveld
 import scm
 import split_cl
 import subcommand
@@ -68,7 +69,6 @@ import watchlists
 __version__ = '2.0'
 
 COMMIT_BOT_EMAIL = 'commit-bot@chromium.org'
-DEFAULT_SERVER = 'https://codereview.chromium.org'
 POSTUPSTREAM_HOOK = '.git/hooks/post-cl-land'
 DESCRIPTION_BACKUP_FILE = '~/.git_cl_description_backup'
 REFS_THAT_ALIAS_TO_OTHER_REFS = {
@@ -80,6 +80,9 @@ REFS_THAT_ALIAS_TO_OTHER_REFS = {
 DEFAULT_LINT_REGEX = r"(.*\.cpp|.*\.cc|.*\.h)"
 DEFAULT_LINT_IGNORE_REGEX = r"$^"
 
+# File name for yapf style config files.
+YAPF_CONFIG_FILENAME = '.style.yapf'
+
 # Buildbucket master name prefix.
 MASTER_PREFIX = 'master.'
 
@@ -106,8 +109,7 @@ def DieWithError(message, change_desc=None):
 
 def SaveDescriptionBackup(change_desc):
   backup_path = os.path.expanduser(DESCRIPTION_BACKUP_FILE)
-  print('\nError after CL description prompt -- saving description to %s\n' %
-        backup_path)
+  print('\nsaving CL description to %s\n' % backup_path)
   backup_file = open(backup_path, 'w')
   backup_file.write(change_desc.description)
   backup_file.close()
@@ -176,10 +178,15 @@ def BranchExists(branch):
 def time_sleep(seconds):
   # Use this so that it can be mocked in tests without interfering with python
   # system machinery.
-  import time  # Local import to discourage others from importing time globally.
   return time.sleep(seconds)
 
 
+def time_time():
+  # Use this so that it can be mocked in tests without interfering with python
+  # system machinery.
+  return time.time()
+
+
 def ask_for_data(prompt):
   try:
     return raw_input(prompt)
@@ -452,8 +459,7 @@ def _trigger_try_jobs(auth_config, changelist, buckets, options, patchset):
   buildbucket_put_url = (
       'https://{hostname}/_ah/api/buildbucket/v1/builds/batch'.format(
           hostname=options.buildbucket_host))
-  buildset = 'patch/{codereview}/{hostname}/{issue}/{patch}'.format(
-      codereview='gerrit' if changelist.IsGerrit() else 'rietveld',
+  buildset = 'patch/gerrit/{hostname}/{issue}/{patch}'.format(
       hostname=codereview_host,
       issue=changelist.GetIssue(),
       patch=patchset)
@@ -545,8 +551,7 @@ def fetch_try_jobs(auth_config, changelist, buildbucket_host,
 
   http.force_exception_to_status_code = True
 
-  buildset = 'patch/{codereview}/{hostname}/{issue}/{patch}'.format(
-      codereview='gerrit' if changelist.IsGerrit() else 'rietveld',
+  buildset = 'patch/gerrit/{hostname}/{issue}/{patch}'.format(
       hostname=codereview_host,
       issue=changelist.GetIssue(),
       patch=patchset)
@@ -666,6 +671,88 @@ def print_try_jobs(options, builds):
   print('Total: %d try jobs' % total)
 
 
+def _ComputeDiffLineRanges(files, upstream_commit):
+  """Gets the changed line ranges for each file since upstream_commit.
+
+  Parses a git diff on provided files and returns a dict that maps a file name
+  to an ordered list of range tuples in the form (start_line, count).
+  Ranges are in the same format as a git diff.
+  """
+  # If files is empty then diff_output will be a full diff.
+  if len(files) == 0:
+    return {}
+
+  # Take the git diff and find the line ranges where there are changes.
+  diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, files, allow_prefix=True)
+  diff_output = RunGit(diff_cmd)
+
+  pattern = r'(?:^diff --git a/(?:.*) b/(.*))|(?:^@@.*\+(.*) @@)'
+  # 2 capture groups
+  # 0 == fname of diff file
+  # 1 == 'diff_start,diff_count' or 'diff_start'
+  # will match each of
+  # diff --git a/foo.foo b/foo.py
+  # @@ -12,2 +14,3 @@
+  # @@ -12,2 +17 @@
+  # running re.findall on the above string with pattern will give
+  # [('foo.py', ''), ('', '14,3'), ('', '17')]
+
+  curr_file = None
+  line_diffs = {}
+  for match in re.findall(pattern, diff_output, flags=re.MULTILINE):
+    if match[0] != '':
+      # Will match the second filename in diff --git a/a.py b/b.py.
+      curr_file = match[0]
+      line_diffs[curr_file] = []
+    else:
+      # Matches +14,3
+      if ',' in match[1]:
+        diff_start, diff_count = match[1].split(',')
+      else:
+        # Single line changes are of the form +12 instead of +12,1.
+        diff_start = match[1]
+        diff_count = 1
+
+      diff_start = int(diff_start)
+      diff_count = int(diff_count)
+
+      # If diff_count == 0 this is a removal we can ignore.
+      line_diffs[curr_file].append((diff_start, diff_count))
+
+  return line_diffs
+
+
+def _FindYapfConfigFile(fpath, yapf_config_cache, top_dir=None):
+  """Checks if a yapf file is in any parent directory of fpath until top_dir.
+
+  Recursively checks parent directories to find yapf file and if no yapf file
+  is found returns None. Uses yapf_config_cache as a cache for
+  previously found configs.
+  """
+  fpath = os.path.abspath(fpath)
+  # Return result if we've already computed it.
+  if fpath in yapf_config_cache:
+    return yapf_config_cache[fpath]
+
+  parent_dir = os.path.dirname(fpath)
+  if os.path.isfile(fpath):
+    ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
+  else:
+    # Otherwise fpath is a directory
+    yapf_file = os.path.join(fpath, YAPF_CONFIG_FILENAME)
+    if os.path.isfile(yapf_file):
+      ret = yapf_file
+    elif fpath == top_dir or parent_dir == fpath:
+      # If we're at the top level directory, or if we're at root
+      # there is no provided style.
+      ret = None
+    else:
+      # Otherwise recurse on the current directory.
+      ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
+  yapf_config_cache[fpath] = ret
+  return ret
+
+
 def write_try_results_json(output_file, builds):
   """Writes a subset of the data from fetch_try_jobs to a file as JSON.
 
@@ -691,7 +778,7 @@ def write_try_results_json(output_file, builds):
 
   converted = []
   for _, build in sorted(builds.items()):
-      converted.append(convert_build_dict(build))
+    converted.append(convert_build_dict(build))
   write_json(output_file, converted)
 
 
@@ -719,7 +806,6 @@ class BuildbucketResponseException(Exception):
 
 class Settings(object):
   def __init__(self):
-    self.default_server = None
     self.cc = None
     self.root = None
     self.tree_status_url = None
@@ -729,8 +815,6 @@ class Settings(object):
     self.squash_gerrit_uploads = None
     self.gerrit_skip_ensure_authenticated = None
     self.git_editor = None
-    self.project = None
-    self.force_https_commit_url = None
 
   def LazyUpdateIfNeeded(self):
     """Updates the settings from a codereview.settings file, if available."""
@@ -746,20 +830,6 @@ class Settings(object):
         LoadCodereviewSettingsFromFile(cr_settings_file)
       self.updated = True
 
-  def GetDefaultServerUrl(self, error_ok=False):
-    if not self.default_server:
-      self.LazyUpdateIfNeeded()
-      self.default_server = gclient_utils.UpgradeToHttps(
-          self._GetRietveldConfig('server', error_ok=True))
-      if error_ok:
-        return self.default_server
-      if not self.default_server:
-        error_message = ('Could not find settings file. You must configure '
-                         'your review setup by running "git cl config".')
-        self.default_server = gclient_utils.UpgradeToHttps(
-            self._GetRietveldConfig('server', error_message=error_message))
-    return self.default_server
-
   @staticmethod
   def GetRelativeRoot():
     return RunGit(['rev-parse', '--show-cdup']).strip()
@@ -769,50 +839,30 @@ class Settings(object):
       self.root = os.path.abspath(self.GetRelativeRoot())
     return self.root
 
-  def GetGitMirror(self, remote='origin'):
-    """If this checkout is from a local git mirror, return a Mirror object."""
-    local_url = RunGit(['config', '--get', 'remote.%s.url' % remote]).strip()
-    if not os.path.isdir(local_url):
-      return None
-    git_cache.Mirror.SetCachePath(os.path.dirname(local_url))
-    remote_url = git_cache.Mirror.CacheDirToUrl(local_url)
-    # Use the /dev/null print_func to avoid terminal spew.
-    mirror = git_cache.Mirror(remote_url, print_func=lambda *args: None)
-    if mirror.exists():
-      return mirror
-    return None
-
   def GetTreeStatusUrl(self, error_ok=False):
     if not self.tree_status_url:
       error_message = ('You must configure your tree status URL by running '
                        '"git cl config".')
-      self.tree_status_url = self._GetRietveldConfig(
-          'tree-status-url', error_ok=error_ok, error_message=error_message)
+      self.tree_status_url = self._GetConfig(
+          'rietveld.tree-status-url', error_ok=error_ok,
+          error_message=error_message)
     return self.tree_status_url
 
   def GetViewVCUrl(self):
     if not self.viewvc_url:
-      self.viewvc_url = self._GetRietveldConfig('viewvc-url', error_ok=True)
+      self.viewvc_url = self._GetConfig('rietveld.viewvc-url', error_ok=True)
     return self.viewvc_url
 
   def GetBugPrefix(self):
-    return self._GetRietveldConfig('bug-prefix', error_ok=True)
-
-  def GetIsSkipDependencyUpload(self, branch_name):
-    """Returns true if specified branch should skip dep uploads."""
-    return self._GetBranchConfig(branch_name, 'skip-deps-uploads',
-                                 error_ok=True)
+    return self._GetConfig('rietveld.bug-prefix', error_ok=True)
 
   def GetRunPostUploadHook(self):
-    run_post_upload_hook = self._GetRietveldConfig(
-        'run-post-upload-hook', error_ok=True)
+    run_post_upload_hook = self._GetConfig(
+        'rietveld.run-post-upload-hook', error_ok=True)
     return run_post_upload_hook == "True"
 
   def GetDefaultCCList(self):
-    return self._GetRietveldConfig('cc', error_ok=True)
-
-  def GetDefaultPrivateFlag(self):
-    return self._GetRietveldConfig('private', error_ok=True)
+    return self._GetConfig('rietveld.cc', error_ok=True)
 
   def GetIsGerrit(self):
     """Return true if this repo is associated with gerrit code review system."""
@@ -858,28 +908,21 @@ class Settings(object):
   def GetGitEditor(self):
     """Return the editor specified in the git config, or None if none is."""
     if self.git_editor is None:
-      self.git_editor = self._GetConfig('core.editor', error_ok=True)
+      # Git requires single quotes for paths with spaces. We need to replace
+      # them with double quotes for Windows to treat such paths as a single
+      # path.
+      self.git_editor = self._GetConfig(
+          'core.editor', error_ok=True).replace('\'', '"')
     return self.git_editor or None
 
   def GetLintRegex(self):
-    return (self._GetRietveldConfig('cpplint-regex', error_ok=True) or
+    return (self._GetConfig('rietveld.cpplint-regex', error_ok=True) or
             DEFAULT_LINT_REGEX)
 
   def GetLintIgnoreRegex(self):
-    return (self._GetRietveldConfig('cpplint-ignore-regex', error_ok=True) or
+    return (self._GetConfig('rietveld.cpplint-ignore-regex', error_ok=True) or
             DEFAULT_LINT_IGNORE_REGEX)
 
-  def GetProject(self):
-    if not self.project:
-      self.project = self._GetRietveldConfig('project', error_ok=True)
-    return self.project
-
-  def _GetRietveldConfig(self, param, **kwargs):
-    return self._GetConfig('rietveld.' + param, **kwargs)
-
-  def _GetBranchConfig(self, branch_name, param, **kwargs):
-    return self._GetConfig('branch.' + branch_name + '.' + param, **kwargs)
-
   def _GetConfig(self, param, **kwargs):
     self.LazyUpdateIfNeeded()
     return RunGit(['config', param], **kwargs).strip()
@@ -915,57 +958,6 @@ def _get_gerrit_project_config_file(remote_url):
     yield project_config_file
 
 
-def _is_git_numberer_enabled(remote_url, remote_ref):
-  """Returns True if Git Numberer is enabled on this ref."""
-  # TODO(tandrii): this should be deleted once repos below are 100% on Gerrit.
-  KNOWN_PROJECTS_WHITELIST = [
-      'chromium/src',
-      'external/webrtc',
-      'v8/v8',
-      'infra/experimental',
-      # For webrtc.googlesource.com/src.
-      'src',
-  ]
-
-  assert remote_ref and remote_ref.startswith('refs/'), remote_ref
-  url_parts = urlparse.urlparse(remote_url)
-  project_name = url_parts.path.lstrip('/').rstrip('git./')
-  for known in KNOWN_PROJECTS_WHITELIST:
-    if project_name.endswith(known):
-      break
-  else:
-    # Early exit to avoid extra fetches for repos that aren't using Git
-    # Numberer.
-    return False
-
-  with _get_gerrit_project_config_file(remote_url) as project_config_file:
-    if project_config_file is None:
-      # Failed to fetch project.config, which shouldn't happen on open source
-      # repos KNOWN_PROJECTS_WHITELIST.
-      return False
-    def get_opts(x):
-      code, out = RunGitWithCode(
-          ['config', '-f', project_config_file, '--get-all',
-           'plugin.git-numberer.validate-%s-refglob' % x])
-      if code == 0:
-        return out.strip().splitlines()
-      return []
-    enabled, disabled = map(get_opts, ['enabled', 'disabled'])
-
-  logging.info('validator config enabled %s disabled %s refglobs for '
-               '(this ref: %s)', enabled, disabled, remote_ref)
-
-  def match_refglobs(refglobs):
-    for refglob in refglobs:
-      if remote_ref == refglob or fnmatch.fnmatch(remote_ref, refglob):
-        return True
-    return False
-
-  if match_refglobs(disabled):
-    return False
-  return match_refglobs(enabled)
-
-
 def ShortBranchName(branch):
   """Convert a name like 'refs/heads/foo' to just 'foo'."""
   return branch.replace('refs/heads/', '', 1)
@@ -1002,7 +994,7 @@ class _ParsedIssueNumberArgument(object):
     self.issue = issue
     self.patchset = patchset
     self.hostname = hostname
-    assert codereview in (None, 'rietveld', 'gerrit')
+    assert codereview in (None, 'gerrit', 'rietveld')
     self.codereview = codereview
 
   @property
@@ -1029,22 +1021,21 @@ def ParseIssueNumberArgument(arg, codereview=None):
     parsed = _CODEREVIEW_IMPLEMENTATIONS[codereview].ParseIssueURL(parsed_url)
     return parsed or fail_result
 
-  results = {}
-  for name, cls in _CODEREVIEW_IMPLEMENTATIONS.iteritems():
-    parsed = cls.ParseIssueURL(parsed_url)
-    if parsed is not None:
-      results[name] = parsed
+  return _GerritChangelistImpl.ParseIssueURL(parsed_url) or fail_result
 
-  if not results:
-    return fail_result
-  if len(results) == 1:
-    return results.values()[0]
 
-  if parsed_url.netloc and parsed_url.netloc.split('.')[0].endswith('-review'):
-    # This is likely Gerrit.
-    return results['gerrit']
-  # Choose Rietveld as before if URL can parsed by either.
-  return results['rietveld']
+def _create_description_from_log(args):
+  """Pulls out the commit log to use as a base for the CL description."""
+  log_args = []
+  if len(args) == 1 and not args[0].endswith('.'):
+    log_args = [args[0] + '..']
+  elif len(args) == 1 and args[0].endswith('...'):
+    log_args = [args[0][:-1]]
+  elif len(args) == 2:
+    log_args = [args[0] + '..' + args[1]]
+  else:
+    log_args = args[:]  # Hope for the best!
+  return RunGit(['log', '--pretty=format:%s\n\n%b'] + log_args)
 
 
 class GerritChangeNotExists(Exception):
@@ -1059,7 +1050,7 @@ class GerritChangeNotExists(Exception):
 
 
 _CommentSummary = collections.namedtuple(
-    '_CommentSummary', ['date', 'message', 'sender',
+    '_CommentSummary', ['date', 'message', 'sender', 'autogenerated',
                         # TODO(tandrii): these two aren't known in Gerrit.
                         'approval', 'disapproval'])
 
@@ -1113,6 +1104,7 @@ class Changelist(object):
     self.cc = None
     self.more_cc = []
     self._remote = None
+    self._cached_remote_url = (False, None)  # (is_cached, value)
 
     self._codereview_impl = None
     self._codereview = None
@@ -1122,7 +1114,9 @@ class Changelist(object):
 
   def _load_codereview_impl(self, codereview=None, **kwargs):
     if codereview:
-      assert codereview in _CODEREVIEW_IMPLEMENTATIONS
+      assert codereview in _CODEREVIEW_IMPLEMENTATIONS, (
+          'codereview {} not in {}'.format(codereview,
+                                           _CODEREVIEW_IMPLEMENTATIONS))
       cls = _CODEREVIEW_IMPLEMENTATIONS[codereview]
       self._codereview = codereview
       self._codereview_impl = cls(self, **kwargs)
@@ -1143,9 +1137,9 @@ class Changelist(object):
           self.issue = int(issue)
           return
 
-    # No issue is set for this branch, so decide based on repo-wide settings.
+    # No issue is set for this branch, so default to gerrit.
     return self._load_codereview_impl(
-        codereview='gerrit' if settings.GetIsGerrit() else 'rietveld',
+        codereview='gerrit',
         **kwargs)
 
   def IsGerrit(self):
@@ -1342,14 +1336,47 @@ class Changelist(object):
 
     Returns None if there is no remote.
     """
+    is_cached, value = self._cached_remote_url
+    if is_cached:
+      return value
+
     remote, _ = self.GetRemoteBranch()
     url = RunGit(['config', 'remote.%s.url' % remote], error_ok=True).strip()
 
-    # If URL is pointing to a local directory, it is probably a git cache.
-    if os.path.isdir(url):
-      url = RunGit(['config', 'remote.%s.url' % remote],
-                   error_ok=True,
-                   cwd=url).strip()
+    # Check if the remote url can be parsed as an URL.
+    host = urlparse.urlparse(url).netloc
+    if host:
+      self._cached_remote_url = (True, url)
+      return url
+
+    # If it cannot be parsed as an url, assume it is a local directory, probably
+    # a git cache.
+    logging.warning('"%s" doesn\'t appear to point to a git host. '
+                    'Interpreting it as a local directory.', url)
+    if not os.path.isdir(url):
+      logging.error(
+          'Remote "%s" for branch "%s" points to "%s", but it doesn\'t exist.',
+          remote, url, self.GetBranch())
+      return None
+
+    cache_path = url
+    url = RunGit(['config', 'remote.%s.url' % remote],
+                 error_ok=True,
+                 cwd=url).strip()
+
+    host = urlparse.urlparse(url).netloc
+    if not host:
+      logging.error(
+          'Remote "%(remote)s" for branch "%(branch)s" points to '
+          '"%(cache_path)s", but it is misconfigured.\n'
+          '"%(cache_path)s" must be a git repo and must have a remote named '
+          '"%(remote)s" pointing to the git host.', {
+              'remote': remote,
+              'cache_path': cache_path,
+              'branch': self.GetBranch()})
+      return None
+
+    self._cached_remote_url = (True, url)
     return url
 
   def GetIssue(self):
@@ -1547,6 +1574,7 @@ class Changelist(object):
 
   def CMDUpload(self, options, git_diff_args, orig_args):
     """Uploads a change to codereview."""
+    assert self.IsGerrit()
     custom_cl_base = None
     if git_diff_args:
       custom_cl_base = base_branch = git_diff_args[0]
@@ -1558,15 +1586,6 @@ class Changelist(object):
       base_branch = self.GetCommonAncestorWithUpstream()
       git_diff_args = [base_branch, 'HEAD']
 
-    # Warn about Rietveld deprecation for initial uploads to Rietveld.
-    if not self.IsGerrit() and not self.GetIssue():
-      print('=====================================')
-      print('NOTICE: Rietveld is being deprecated. '
-            'You can upload changes to Gerrit with')
-      print('  git cl upload --gerrit')
-      print('or set Gerrit to be your default code review tool with')
-      print('  git config gerrit.host true')
-      print('=====================================')
 
     # Fast best-effort checks to abort before running potentially
     # expensive hooks if uploading is likely to fail anyway. Passing these
@@ -1600,33 +1619,9 @@ class Changelist(object):
         options.reviewers = hook_results.reviewers.split(',')
       self.ExtendCC(hook_results.more_cc)
 
-    # TODO(tandrii): Checking local patchset against remote patchset is only
-    # supported for Rietveld. Extend it to Gerrit or remove it completely.
-    if self.GetIssue() and not self.IsGerrit():
-      latest_patchset = self.GetMostRecentPatchset()
-      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.')
-        confirm_or_exit(action='upload')
-
     print_stats(git_diff_args)
     ret = self.CMDUploadChange(options, git_diff_args, custom_cl_base, change)
     if not ret:
-      if self.IsGerrit():
-        self.SetLabels(options.enable_auto_submit, options.use_commit_queue,
-                       options.cq_dry_run);
-      else:
-        if options.use_commit_queue:
-          self.SetCQState(_CQState.COMMIT)
-        elif options.cq_dry_run:
-          self.SetCQState(_CQState.DRY_RUN)
-
       _git_set_branch_config_value('last-upload-hash',
                                    RunGit(['rev-parse', 'HEAD']).strip())
       # Run post upload hooks, if specified.
@@ -1650,41 +1645,6 @@ class Changelist(object):
         ret = upload_branch_deps(self, orig_args)
     return ret
 
-  def SetLabels(self, enable_auto_submit, use_commit_queue, cq_dry_run):
-    """Sets labels on the change based on the provided flags.
-
-    Sets labels if issue is already uploaded and known, else returns without
-    doing anything.
-
-    Args:
-      enable_auto_submit: Sets Auto-Submit+1 on the change.
-      use_commit_queue: Sets Commit-Queue+2 on the change.
-      cq_dry_run: Sets Commit-Queue+1 on the change. Overrides Commit-Queue+2 if
-                  both use_commit_queue and cq_dry_run are true.
-    """
-    if not self.GetIssue():
-      return
-    try:
-      self._codereview_impl.SetLabels(enable_auto_submit, use_commit_queue,
-                                      cq_dry_run)
-      return 0
-    except KeyboardInterrupt:
-      raise
-    except:
-      labels = []
-      if enable_auto_submit:
-        labels.append('Auto-Submit')
-      if use_commit_queue or cq_dry_run:
-        labels.append('Commit-Queue')
-      print('WARNING: Failed to set label(s) on your change: %s\n'
-            'Either:\n'
-            ' * Your project does not have the above label(s),\n'
-            ' * You don\'t have permission to set the above label(s),\n'
-            ' * There\'s a bug in this code (see stack trace below).\n' %
-            (', '.join(labels)))
-      # Still raise exception so that stack trace is printed.
-      raise
-
   def SetCQState(self, new_state):
     """Updates the CQ state for the latest patchset.
 
@@ -1878,13 +1838,6 @@ class _ChangelistCodereviewBase(object):
     """Uploads a change to codereview."""
     raise NotImplementedError()
 
-  def SetLabels(self, enable_auto_submit, use_commit_queue, cq_dry_run):
-    """Sets labels on the change based on the provided flags.
-
-    Issue must have been already uploaded and known.
-    """
-    raise NotImplementedError()
-
   def SetCQState(self, new_state):
     """Updates the CQ state for the latest patchset.
 
@@ -1906,446 +1859,6 @@ class _ChangelistCodereviewBase(object):
     raise NotImplementedError()
 
 
-class _RietveldChangelistImpl(_ChangelistCodereviewBase):
-
-  def __init__(self, changelist, auth_config=None, codereview_host=None):
-    super(_RietveldChangelistImpl, self).__init__(changelist)
-    assert settings, 'must be initialized in _ChangelistCodereviewBase'
-    if not codereview_host:
-      settings.GetDefaultServerUrl()
-
-    self._rietveld_server = codereview_host
-    self._auth_config = auth_config or auth.make_auth_config()
-    self._props = None
-    self._rpc_server = None
-
-  def GetCodereviewServer(self):
-    if not self._rietveld_server:
-      # If we're on a branch then get the server potentially associated
-      # with that branch.
-      if self.GetIssue():
-        self._rietveld_server = gclient_utils.UpgradeToHttps(
-            self._GitGetBranchConfigValue(self.CodereviewServerConfigKey()))
-      if not self._rietveld_server:
-        self._rietveld_server = settings.GetDefaultServerUrl()
-    return self._rietveld_server
-
-  def EnsureAuthenticated(self, force, refresh=False):
-    """Best effort check that user is authenticated with Rietveld server."""
-    if self._auth_config.use_oauth2:
-      authenticator = auth.get_authenticator_for_host(
-          self.GetCodereviewServer(), self._auth_config)
-      if not authenticator.has_cached_credentials():
-        raise auth.LoginRequiredError(self.GetCodereviewServer())
-      if refresh:
-        authenticator.get_access_token()
-
-  def EnsureCanUploadPatchset(self, force):
-    # No checks for Rietveld because we are deprecating Rietveld.
-    pass
-
-  def FetchDescription(self, force=False):
-    issue = self.GetIssue()
-    assert issue
-    try:
-      return self.RpcServer().get_description(issue, force=force).strip()
-    except urllib2.HTTPError as e:
-      if e.code == 404:
-        DieWithError(
-            ('\nWhile fetching the description for issue %d, received a '
-             '404 (not found)\n'
-             'error. It is likely that you deleted this '
-             'issue on the server. If this is the\n'
-             'case, please run\n\n'
-             '    git cl issue 0\n\n'
-             'to clear the association with the deleted issue. Then run '
-             'this command again.') % issue)
-      else:
-        DieWithError(
-            '\nFailed to fetch issue description. HTTP error %d' % e.code)
-    except urllib2.URLError as e:
-      print('Warning: Failed to retrieve CL description due to network '
-            'failure.', file=sys.stderr)
-      return ''
-
-  def GetMostRecentPatchset(self):
-    return self.GetIssueProperties()['patchsets'][-1]
-
-  def GetIssueProperties(self):
-    if self._props is None:
-      issue = self.GetIssue()
-      if not issue:
-        self._props = {}
-      else:
-        self._props = self.RpcServer().get_issue_properties(issue, True)
-    return self._props
-
-  def CannotTriggerTryJobReason(self):
-    props = self.GetIssueProperties()
-    if not props:
-      return 'Rietveld doesn\'t know about your issue %s' % self.GetIssue()
-    if props.get('closed'):
-      return 'CL %s is closed' % self.GetIssue()
-    if props.get('private'):
-      return 'CL %s is private' % self.GetIssue()
-    return None
-
-  def GetTryJobProperties(self, patchset=None):
-    """Returns dictionary of properties to launch try job."""
-    project = (self.GetIssueProperties() or {}).get('project')
-    return {
-      'issue': self.GetIssue(),
-      'patch_project': project,
-      'patch_storage': 'rietveld',
-      'patchset': patchset or self.GetPatchset(),
-      'rietveld': self.GetCodereviewServer(),
-    }
-
-  def GetIssueOwner(self):
-    return (self.GetIssueProperties() or {}).get('owner_email')
-
-  def GetReviewers(self):
-    return (self.GetIssueProperties() or {}).get('reviewers')
-
-  def AddComment(self, message, publish=None):
-    return self.RpcServer().add_comment(self.GetIssue(), message)
-
-  def GetCommentsSummary(self, _readable=True):
-    summary = []
-    for message in self.GetIssueProperties().get('messages', []):
-      date = datetime.datetime.strptime(message['date'], '%Y-%m-%d %H:%M:%S.%f')
-      summary.append(_CommentSummary(
-        date=date,
-        disapproval=bool(message['disapproval']),
-        approval=bool(message['approval']),
-        sender=message['sender'],
-        message=message['text'],
-      ))
-    return summary
-
-  def GetStatus(self):
-    """Applies a rough heuristic to give a simple summary of an issue's review
-    or CQ status, assuming adherence to a common workflow.
-
-    Returns None if no issue for this branch, or one of the following keywords:
-      * 'error'    - error from review tool (including deleted issues)
-      * 'unsent'   - not sent for review
-      * 'waiting'  - waiting for review
-      * 'reply'    - waiting for owner to reply to review
-      * 'not lgtm' - Code-Review label has been set negatively
-      * 'lgtm'     - LGTM from at least one approved reviewer
-      * 'commit'   - in the commit queue
-      * 'closed'   - closed
-    """
-    if not self.GetIssue():
-      return None
-
-    try:
-      props = self.GetIssueProperties()
-    except urllib2.HTTPError:
-      return 'error'
-
-    if props.get('closed'):
-      # Issue is closed.
-      return 'closed'
-    if props.get('commit') and not props.get('cq_dry_run', False):
-      # Issue is in the commit queue.
-      return 'commit'
-
-    messages = props.get('messages') or []
-    if not messages:
-      # No message was sent.
-      return 'unsent'
-
-    if get_approving_reviewers(props):
-      return 'lgtm'
-    elif get_approving_reviewers(props, disapproval=True):
-      return 'not lgtm'
-
-    # 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 messages[-1]['sender'] != props.get('owner_email'):
-      # Non-LGTM reply from non-owner and not CQ bot.
-      return 'reply'
-    return 'waiting'
-
-  def UpdateDescriptionRemote(self, description, force=False):
-    self.RpcServer().update_description(self.GetIssue(), description)
-
-  def CloseIssue(self):
-    return self.RpcServer().close_issue(self.GetIssue())
-
-  def SetFlag(self, flag, value):
-    return self.SetFlags({flag: value})
-
-  def SetFlags(self, flags):
-    """Sets flags on this CL/patchset in Rietveld.
-    """
-    patchset = self.GetPatchset() or self.GetMostRecentPatchset()
-    try:
-      return self.RpcServer().set_flags(
-          self.GetIssue(), patchset, flags)
-    except urllib2.HTTPError as e:
-      if e.code == 404:
-        DieWithError('The issue %s doesn\'t exist.' % self.GetIssue())
-      if e.code == 403:
-        DieWithError(
-            ('Access denied to issue %s. Maybe the patchset %s doesn\'t '
-             'match?') % (self.GetIssue(), patchset))
-      raise
-
-  def RpcServer(self):
-    """Returns an upload.RpcServer() to access this review's rietveld instance.
-    """
-    if not self._rpc_server:
-      self._rpc_server = rietveld.CachingRietveld(
-          self.GetCodereviewServer(),
-          self._auth_config)
-    return self._rpc_server
-
-  @classmethod
-  def IssueConfigKey(cls):
-    return 'rietveldissue'
-
-  @classmethod
-  def PatchsetConfigKey(cls):
-    return 'rietveldpatchset'
-
-  @classmethod
-  def CodereviewServerConfigKey(cls):
-    return 'rietveldserver'
-
-  def SetLabels(self, enable_auto_submit, use_commit_queue, cq_dry_run):
-    raise NotImplementedError()
-
-  def SetCQState(self, new_state):
-    props = self.GetIssueProperties()
-    if props.get('private'):
-      DieWithError('Cannot set-commit on private issue')
-
-    if new_state == _CQState.COMMIT:
-      self.SetFlags({'commit': '1', 'cq_dry_run': '0'})
-    elif new_state == _CQState.NONE:
-      self.SetFlags({'commit': '0', 'cq_dry_run': '0'})
-    else:
-      assert new_state == _CQState.DRY_RUN
-      self.SetFlags({'commit': '1', 'cq_dry_run': '1'})
-
-  def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
-                              directory, force):
-    # PatchIssue should never be called with a dirty tree.  It is up to the
-    # caller to check this, but just in case we assert here since the
-    # consequences of the caller not checking this could be dire.
-    assert(not git_common.is_dirty_git_tree('apply'))
-    assert(parsed_issue_arg.valid)
-    self._changelist.issue = parsed_issue_arg.issue
-    if parsed_issue_arg.hostname:
-      self._rietveld_server = 'https://%s' % parsed_issue_arg.hostname
-
-    patchset = parsed_issue_arg.patchset or self.GetMostRecentPatchset()
-    patchset_object = self.RpcServer().get_patch(self.GetIssue(), patchset)
-    scm_obj = checkout.GitCheckout(settings.GetRoot(), None, None, None, None)
-    try:
-      scm_obj.apply_patch(patchset_object)
-    except Exception as e:
-      print(str(e))
-      return 1
-
-    # If we had an issue, commit the current state and register the issue.
-    if not nocommit:
-      self.SetIssue(self.GetIssue())
-      self.SetPatchset(patchset)
-      RunGit(['commit', '-m', (self.GetDescription() + '\n\n' +
-                               'patch from issue %(i)s at patchset '
-                               '%(p)s (http://crrev.com/%(i)s#ps%(p)s)'
-                               % {'i': self.GetIssue(), 'p': patchset})])
-      print('Committed patch locally.')
-    else:
-      print('Patch applied to index.')
-    return 0
-
-  @staticmethod
-  def ParseIssueURL(parsed_url):
-    if not parsed_url.scheme or not parsed_url.scheme.startswith('http'):
-      return None
-    # Rietveld patch: https://domain/<number>/#ps<patchset>
-    match = re.match(r'/(\d+)/$', parsed_url.path)
-    match2 = re.match(r'ps(\d+)$', parsed_url.fragment)
-    if match and match2:
-      return _ParsedIssueNumberArgument(
-          issue=int(match.group(1)),
-          patchset=int(match2.group(1)),
-          hostname=parsed_url.netloc,
-          codereview='rietveld')
-    # Typical url: https://domain/<issue_number>[/[other]]
-    match = re.match('/(\d+)(/.*)?$', parsed_url.path)
-    if match:
-      return _ParsedIssueNumberArgument(
-          issue=int(match.group(1)),
-          hostname=parsed_url.netloc,
-          codereview='rietveld')
-    # Rietveld patch: https://domain/download/issue<number>_<patchset>.diff
-    match = re.match(r'/download/issue(\d+)_(\d+).diff$', parsed_url.path)
-    if match:
-      return _ParsedIssueNumberArgument(
-          issue=int(match.group(1)),
-          patchset=int(match.group(2)),
-          hostname=parsed_url.netloc,
-          codereview='rietveld')
-    return None
-
-  def CMDUploadChange(self, options, args, custom_cl_base, change):
-    """Upload the patch to Rietveld."""
-    upload_args = ['--assume_yes']  # Don't ask about untracked files.
-    upload_args.extend(['--server', self.GetCodereviewServer()])
-    upload_args.extend(auth.auth_config_to_command_options(self._auth_config))
-    if options.emulate_svn_auto_props:
-      upload_args.append('--emulate_svn_auto_props')
-
-    change_desc = None
-
-    if options.email is not None:
-      upload_args.extend(['--email', options.email])
-
-    if self.GetIssue():
-      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())
-    else:
-      if options.title is not None:
-        upload_args.extend(['--title', options.title])
-      if options.message:
-        message = options.message
-      else:
-        message = CreateDescriptionFromLog(args)
-        if options.title:
-          message = options.title + '\n\n' + message
-      change_desc = ChangeDescription(message)
-      if options.reviewers or options.add_owners_to:
-        change_desc.update_reviewers(options.reviewers, options.tbrs,
-                                     options.add_owners_to, change)
-      if not options.force:
-        change_desc.prompt(bug=options.bug, git_footer=False)
-
-      if not change_desc.description:
-        print('Description is empty; aborting.')
-        return 1
-
-      upload_args.extend(['--message', change_desc.description])
-      if change_desc.get_reviewers():
-        upload_args.append('--reviewers=%s' % ','.join(
-            change_desc.get_reviewers()))
-      if options.send_mail:
-        if not change_desc.get_reviewers():
-          DieWithError("Must specify reviewers to send email.", change_desc)
-        upload_args.append('--send_mail')
-
-      # We check this before applying rietveld.private assuming that in
-      # rietveld.cc only addresses which we can send private CLs to are listed
-      # if rietveld.private is set, and so we should ignore rietveld.cc only
-      # when --private is specified explicitly on the command line.
-      if options.private:
-        logging.warn('rietveld.cc is ignored since private flag is specified.  '
-                     'You need to review and add them manually if necessary.')
-        cc = self.GetCCListWithoutDefault()
-      else:
-        cc = self.GetCCList()
-      cc = ','.join(filter(None, (cc, ','.join(options.cc))))
-      if change_desc.get_cced():
-        cc = ','.join(filter(None, (cc, ','.join(change_desc.get_cced()))))
-      if cc:
-        upload_args.extend(['--cc', cc])
-
-    if options.private or settings.GetDefaultPrivateFlag() == "True":
-      upload_args.append('--private')
-
-    # Include the upstream repo's URL in the change -- this is useful for
-    # projects that have their source spread across multiple repos.
-    remote_url = self.GetGitBaseUrlFromConfig()
-    if not remote_url:
-      if self.GetRemoteUrl() and '/' in self.GetUpstreamBranch():
-        remote_url = '%s@%s' % (self.GetRemoteUrl(),
-                                self.GetUpstreamBranch().split('/')[-1])
-    if remote_url:
-      remote, remote_branch = self.GetRemoteBranch()
-      target_ref = GetTargetRef(remote, remote_branch, options.target_branch)
-      if target_ref:
-        upload_args.extend(['--target_ref', target_ref])
-
-      # Look for dependent patchsets. See crbug.com/480453 for more details.
-      remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
-      upstream_branch = ShortBranchName(upstream_branch)
-      if remote is '.':
-        # 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()
-        else:
-          auth_config = auth.extract_auth_config_from_options(options)
-          branch_cl = Changelist(branchref='refs/heads/'+local_branch,
-                                 auth_config=auth_config)
-          branch_cl_issue_url = branch_cl.GetIssueURL()
-          branch_cl_issue = branch_cl.GetIssue()
-          branch_cl_patchset = branch_cl.GetPatchset()
-          if branch_cl_issue_url and branch_cl_issue and branch_cl_patchset:
-            upload_args.extend(
-                ['--depends_on_patchset', '%s:%s' % (
-                     branch_cl_issue, branch_cl_patchset)])
-            print(
-                '\n'
-                'The current branch (%s) is tracking a local branch (%s) with '
-                'an associated CL.\n'
-                'Adding %s/#ps%s as a dependency patchset.\n'
-                '\n' % (self.GetBranch(), local_branch, branch_cl_issue_url,
-                        branch_cl_patchset))
-
-    project = settings.GetProject()
-    if project:
-      upload_args.extend(['--project', project])
-    else:
-      print()
-      print('WARNING: Uploading without a project specified. Please ensure '
-            'your repo\'s codereview.settings has a "PROJECT: foo" line.')
-      print()
-
-    try:
-      upload_args = ['upload'] + upload_args + args
-      logging.info('upload.RealMain(%s)', upload_args)
-      issue, patchset = upload.RealMain(upload_args)
-      issue = int(issue)
-      patchset = int(patchset)
-    except KeyboardInterrupt:
-      sys.exit(1)
-    except:
-      # If we got an exception after the user typed a description for their
-      # change, back up the description before re-raising.
-      if change_desc:
-        SaveDescriptionBackup(change_desc)
-      raise
-
-    if not self.GetIssue():
-      self.SetIssue(issue)
-    self.SetPatchset(patchset)
-    return 0
-
-
 class _GerritChangelistImpl(_ChangelistCodereviewBase):
   def __init__(self, changelist, auth_config=None, codereview_host=None):
     # auth_config is Rietveld thing, kept here to preserve interface only.
@@ -2378,7 +1891,10 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
 
   def _GetGitHost(self):
     """Returns git host to be used when uploading change to Gerrit."""
-    return urlparse.urlparse(self.GetRemoteUrl()).netloc
+    remote_url = self.GetRemoteUrl()
+    if not remote_url:
+      return None
+    return urlparse.urlparse(remote_url).netloc
 
   def GetCodereviewServer(self):
     if not self._gerrit_server:
@@ -2398,6 +1914,37 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
         self._gerrit_server = 'https://%s' % self._gerrit_host
     return self._gerrit_server
 
+  def _GetGerritProject(self):
+    """Returns Gerrit project name based on remote git URL."""
+    remote_url = self.GetRemoteUrl()
+    if remote_url is None:
+      logging.warn('can\'t detect Gerrit project.')
+      return None
+    project = urlparse.urlparse(remote_url).path.strip('/')
+    if project.endswith('.git'):
+      project = project[:-len('.git')]
+    # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
+    # 'a/' prefix, because 'a/' prefix is used to force authentication in
+    # gitiles/git-over-https protocol. E.g.,
+    # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
+    # as
+    # https://chromium.googlesource.com/v8/v8
+    if project.startswith('a/'):
+      project = project[len('a/'):]
+    return project
+
+  def _GerritChangeIdentifier(self):
+    """Handy method for gerrit_util.ChangeIdentifier for a given CL.
+
+    Not to be confused by value of "Change-Id:" footer.
+    If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
+    """
+    project = self._GetGerritProject()
+    if project:
+      return gerrit_util.ChangeIdentifier(project, self.GetIssue())
+    # Fall back on still unique, but less efficient change number.
+    return str(self.GetIssue())
+
   @classmethod
   def IssueConfigKey(cls):
     return 'gerritissue'
@@ -2416,13 +1963,16 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
       # For projects with unusual authentication schemes.
       # See http://crbug.com/603378.
       return
-    # Lazy-loader to identify Gerrit and Git hosts.
-    if gerrit_util.GceAuthenticator.is_gce():
+
+    # Check presence of cookies only if using cookies-based auth method.
+    cookie_auth = gerrit_util.Authenticator.get()
+    if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
       return
+
+    # Lazy-loader to identify Gerrit and Git hosts.
     self.GetCodereviewServer()
     git_host = self._GetGitHost()
-    assert self._gerrit_server and self._gerrit_host
-    cookie_auth = gerrit_util.CookiesAuthenticator()
+    assert self._gerrit_server and self._gerrit_host and git_host
 
     gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
     git_auth = cookie_auth.get_auth_header(git_host)
@@ -2464,7 +2014,7 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
     # Warm change details cache now to avoid RPCs later, reducing latency for
     # developers.
     self._GetChangeDetail(
-        ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT'])
+        ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
 
     status = self._GetChangeDetail()['status']
     if status in ('MERGED', 'ABANDONED'):
@@ -2472,10 +2022,15 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
                    (self.GetIssueURL(),
                     'submitted' if status == 'MERGED' else 'abandoned'))
 
-    if gerrit_util.GceAuthenticator.is_gce():
+    # TODO(vadimsh): For some reason the chunk of code below was skipped if
+    # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
+    # Apparently this check is not very important? Otherwise get_auth_email
+    # could have been added to other implementations of Authenticator.
+    cookies_auth = gerrit_util.Authenticator.get()
+    if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
       return
-    cookies_user = gerrit_util.CookiesAuthenticator().get_auth_email(
-        self._GetGerritHost())
+
+    cookies_user = cookies_auth.get_auth_email(self._GetGerritHost())
     if self.GetIssueOwner() == cookies_user:
       return
     logging.debug('change %s owner is %s, cookies user is %s',
@@ -2492,7 +2047,6 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
             (self.GetIssue(), self.GetIssueOwner(), details['email']))
       confirm_or_exit(action='upload')
 
-
   def _PostUnsetIssueProperties(self):
     """Which branch-specific properties to erase when unsetting issue."""
     return ['gerritsquashhash']
@@ -2510,6 +2064,7 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
       * 'waiting' - waiting for review
       * 'reply'   - waiting for uploader to reply to review
       * 'lgtm'    - Code-Review label has been set
+      * 'dry-run' - dry-running in the commit queue
       * 'commit'  - in the commit queue
       * 'closed'  - successfully submitted or abandoned
     """
@@ -2525,10 +2080,14 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
     if data['status'] in ('ABANDONED', 'MERGED'):
       return 'closed'
 
-    if data['labels'].get('Commit-Queue', {}).get('approved'):
-      # The section will have an "approved" subsection if anyone has voted
-      # the maximum value on the label.
+    cq_label = data['labels'].get('Commit-Queue', {})
+    max_cq_vote = 0
+    for vote in cq_label.get('all', []):
+      max_cq_vote = max(max_cq_vote, vote.get('value', 0))
+    if max_cq_vote == 2:
       return 'commit'
+    if max_cq_vote == 1:
+      return 'dry-run'
 
     if data['labels'].get('Code-Review', {}).get('approved'):
       return 'lgtm'
@@ -2564,31 +2123,48 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
     data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'],
                                  no_cache=force)
     current_rev = data['current_revision']
-    return data['revisions'][current_rev]['commit']['message']
+    return data['revisions'][current_rev]['commit']['message'].encode(
+        'utf-8', 'ignore')
 
   def UpdateDescriptionRemote(self, description, force=False):
-    if gerrit_util.HasPendingChangeEdit(self._GetGerritHost(), self.GetIssue()):
+    if gerrit_util.HasPendingChangeEdit(
+        self._GetGerritHost(), self._GerritChangeIdentifier()):
       if not force:
         confirm_or_exit(
             'The description cannot be modified while the issue has a pending '
             'unpublished edit. Either publish the edit in the Gerrit web UI '
             'or delete it.\n\n', action='delete the unpublished edit')
 
-      gerrit_util.DeletePendingChangeEdit(self._GetGerritHost(),
-                                          self.GetIssue())
-    gerrit_util.SetCommitMessage(self._GetGerritHost(), self.GetIssue(),
-                                 description, notify='NONE')
+      gerrit_util.DeletePendingChangeEdit(
+        self._GetGerritHost(), self._GerritChangeIdentifier())
+    gerrit_util.SetCommitMessage(
+        self._GetGerritHost(), self._GerritChangeIdentifier(),
+        description, notify='NONE')
 
   def AddComment(self, message, publish=None):
-    gerrit_util.SetReview(self._GetGerritHost(), self.GetIssue(),
-                          msg=message, ready=publish)
+    gerrit_util.SetReview(
+        self._GetGerritHost(), self._GerritChangeIdentifier(),
+        msg=message, ready=publish)
 
   def GetCommentsSummary(self, readable=True):
     # DETAILED_ACCOUNTS is to get emails in accounts.
+    # CURRENT_REVISION is included to get the latest patchset so that
+    # only the robot comments from the latest patchset can be shown.
     messages = self._GetChangeDetail(
-        options=['MESSAGES', 'DETAILED_ACCOUNTS']).get('messages', [])
+        options=['MESSAGES', 'DETAILED_ACCOUNTS',
+                 'CURRENT_REVISION']).get('messages', [])
     file_comments = gerrit_util.GetChangeComments(
-        self._GetGerritHost(), self.GetIssue())
+        self._GetGerritHost(), self._GerritChangeIdentifier())
+    robot_file_comments = gerrit_util.GetChangeRobotComments(
+        self._GetGerritHost(), self._GerritChangeIdentifier())
+
+    # Add the robot comments onto the list of comments, but only
+    # keep those that are from the latest pachset.
+    latest_patch_set = self.GetMostRecentPatchset()
+    for path, robot_comments in robot_file_comments.iteritems():
+      line_comments = file_comments.setdefault(path, [])
+      line_comments.extend(
+          [c for c in robot_comments if c['patch_set'] == latest_patch_set])
 
     # Build dictionary of file comments for easy access and sorting later.
     # {author+date: {path: {patchset: {line: url+message}}}}
@@ -2596,7 +2172,8 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
         lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
     for path, line_comments in file_comments.iteritems():
       for comment in line_comments:
-        if comment.get('tag', '').startswith('autogenerated'):
+        tag = comment.get('tag', '')
+        if tag.startswith('autogenerated') and 'robot_id' not in comment:
           continue
         key = (comment['author']['email'], comment['updated'])
         if comment.get('side', 'REVISION') == 'PARENT':
@@ -2610,66 +2187,76 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
              str(line) if line else ''))
         comments[key][path][patchset][line] = (url, comment['message'])
 
-    summary = []
+    summaries = []
     for msg in messages:
-      # Don't bother showing autogenerated messages.
-      if msg.get('tag') and msg.get('tag').startswith('autogenerated'):
-        continue
-      # Gerrit spits out nanoseconds.
-      assert len(msg['date'].split('.')[-1]) == 9
-      date = datetime.datetime.strptime(msg['date'][:-3],
-                                        '%Y-%m-%d %H:%M:%S.%f')
-      message = msg['message']
-      key = (msg['author']['email'], msg['date'])
-      if key in comments:
-        message += '\n'
-      for path, patchsets in sorted(comments.get(key, {}).items()):
-        if readable:
-          message += '\n%s' % path
-        for patchset, lines in sorted(patchsets.items()):
-          for line, (url, content) in sorted(lines.items()):
-            if line:
-              line_str = 'Line %d' % line
-              path_str = '%s:%d:' % (path, line)
-            else:
-              line_str = 'File comment'
-              path_str = '%s:0:' % path
-            if readable:
-              message += '\n  %s, %s: %s' % (patchset, line_str, url)
-              message += '\n  %s\n' % content
-            else:
-              message += '\n%s ' % path_str
-              message += '\n%s\n' % content
-
-      summary.append(_CommentSummary(
-        date=date,
-        message=message,
-        sender=msg['author']['email'],
-        # These could be inferred from the text messages and correlated with
-        # Code-Review label maximum, however this is not reliable.
-        # Leaving as is until the need arises.
-        approval=False,
-        disapproval=False,
-      ))
-    return summary
+      summary = self._BuildCommentSummary(msg, comments, readable)
+      if summary:
+        summaries.append(summary)
+    return summaries
+
+  @staticmethod
+  def _BuildCommentSummary(msg, comments, readable):
+    key = (msg['author']['email'], msg['date'])
+    # Don't bother showing autogenerated messages that don't have associated
+    # file or line comments. this will filter out most autogenerated
+    # messages, but will keep robot comments like those from Tricium.
+    is_autogenerated = msg.get('tag', '').startswith('autogenerated')
+    if is_autogenerated and not comments.get(key):
+      return None
+    message = msg['message']
+    # Gerrit spits out nanoseconds.
+    assert len(msg['date'].split('.')[-1]) == 9
+    date = datetime.datetime.strptime(msg['date'][:-3],
+                                      '%Y-%m-%d %H:%M:%S.%f')
+    if key in comments:
+      message += '\n'
+    for path, patchsets in sorted(comments.get(key, {}).items()):
+      if readable:
+        message += '\n%s' % path
+      for patchset, lines in sorted(patchsets.items()):
+        for line, (url, content) in sorted(lines.items()):
+          if line:
+            line_str = 'Line %d' % line
+            path_str = '%s:%d:' % (path, line)
+          else:
+            line_str = 'File comment'
+            path_str = '%s:0:' % path
+          if readable:
+            message += '\n  %s, %s: %s' % (patchset, line_str, url)
+            message += '\n  %s\n' % content
+          else:
+            message += '\n%s ' % path_str
+            message += '\n%s\n' % content
+
+    return _CommentSummary(
+      date=date,
+      message=message,
+      sender=msg['author']['email'],
+      autogenerated=is_autogenerated,
+      # These could be inferred from the text messages and correlated with
+      # Code-Review label maximum, however this is not reliable.
+      # Leaving as is until the need arises.
+      approval=False,
+      disapproval=False,
+    )
 
   def CloseIssue(self):
-    gerrit_util.AbandonChange(self._GetGerritHost(), self.GetIssue(), msg='')
+    gerrit_util.AbandonChange(
+        self._GetGerritHost(), self._GerritChangeIdentifier(), msg='')
 
   def SubmitIssue(self, wait_for_merge=True):
-    gerrit_util.SubmitChange(self._GetGerritHost(), self.GetIssue(),
-                             wait_for_merge=wait_for_merge)
+    gerrit_util.SubmitChange(
+        self._GetGerritHost(), self._GerritChangeIdentifier(),
+        wait_for_merge=wait_for_merge)
 
-  def _GetChangeDetail(self, options=None, issue=None,
-                       no_cache=False):
-    """Returns details of the issue by querying Gerrit and caching results.
+  def _GetChangeDetail(self, options=None, no_cache=False):
+    """Returns details of associated Gerrit change and caching results.
 
     If fresh data is needed, set no_cache=True which will clear cache and
     thus new data will be fetched from Gerrit.
     """
     options = options or []
-    issue = issue or self.GetIssue()
-    assert issue, 'issue is required to query Gerrit'
+    assert self.GetIssue(), 'issue is required to query Gerrit'
 
     # Optimization to avoid multiple RPCs:
     if (('CURRENT_REVISION' in options or 'ALL_REVISIONS' in options) and
@@ -2677,15 +2264,15 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
       options.append('CURRENT_COMMIT')
 
     # Normalize issue and options for consistent keys in cache.
-    issue = str(issue)
+    cache_key = str(self.GetIssue())
     options = [o.upper() for o in options]
 
     # Check in cache first unless no_cache is True.
     if no_cache:
-      self._detail_cache.pop(issue, None)
+      self._detail_cache.pop(cache_key, None)
     else:
       options_set = frozenset(options)
-      for cached_options_set, data in self._detail_cache.get(issue, []):
+      for cached_options_set, data in self._detail_cache.get(cache_key, []):
         # Assumption: data fetched before with extra options is suitable
         # for return for a smaller set of options.
         # For example, if we cached data for
@@ -2697,37 +2284,48 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
 
     try:
       data = gerrit_util.GetChangeDetail(
-          self._GetGerritHost(), str(issue), options)
+          self._GetGerritHost(), self._GerritChangeIdentifier(), options)
     except gerrit_util.GerritError as e:
       if e.http_status == 404:
-        raise GerritChangeNotExists(issue, self.GetCodereviewServer())
+        raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
       raise
 
-    self._detail_cache.setdefault(issue, []).append((frozenset(options), data))
+    self._detail_cache.setdefault(cache_key, []).append(
+        (frozenset(options), data))
     return data
 
-  def _GetChangeCommit(self, issue=None):
-    issue = issue or self.GetIssue()
-    assert issue, 'issue is required to query Gerrit'
+  def _GetChangeCommit(self):
+    assert self.GetIssue(), 'issue must be set to query Gerrit'
     try:
-      data = gerrit_util.GetChangeCommit(self._GetGerritHost(), str(issue))
+      data = gerrit_util.GetChangeCommit(
+          self._GetGerritHost(), self._GerritChangeIdentifier())
     except gerrit_util.GerritError as e:
       if e.http_status == 404:
-        raise GerritChangeNotExists(issue, self.GetCodereviewServer())
+        raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
       raise
     return data
 
+  def _IsCqConfigured(self):
+    detail = self._GetChangeDetail(['LABELS'])
+    if not u'Commit-Queue' in detail.get('labels', {}):
+      return False
+    # TODO(crbug/753213): Remove temporary hack
+    if ('https://chromium.googlesource.com/chromium/src' ==
+        self._changelist.GetRemoteUrl() and
+        detail['branch'].startswith('refs/branch-heads/')):
+      return False
+    return True
+
   def CMDLand(self, force, bypass_hooks, verbose, parallel):
     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:
-        confirm_or_exit('\nIt seems this repository has a Commit Queue, '
+    if not force and self._IsCqConfigured():
+      confirm_or_exit('\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',
                         action='bypass CQ')
-
     differs = True
     last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
     # Note: git diff outputs nothing if there is no diff.
@@ -2797,7 +2395,10 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
     remote_url = self._changelist.GetRemoteUrl()
     if remote_url.endswith('.git'):
       remote_url = remote_url[:-len('.git')]
+    remote_url = remote_url.rstrip('/')
+
     fetch_info = revision_info['fetch']['http']
+    fetch_info['url'] = fetch_info['url'].rstrip('/')
 
     if remote_url != fetch_info['url']:
       DieWithError('Trying to patch a change from %s but this repo appears '
@@ -2890,7 +2491,6 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
 
     remote, remote_branch = self.GetRemoteBranch()
     branch = GetTargetRef(remote, remote_branch, options.target_branch)
-
     # This may be None; default fallback value is determined in logic below.
     title = options.title
 
@@ -2961,7 +2561,7 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
         if options.message:
           message = options.message
         else:
-          message = CreateDescriptionFromLog(git_diff_args)
+          message = _create_description_from_log(git_diff_args)
           if options.title:
             message = options.title + '\n\n' + message
         change_desc = ChangeDescription(message)
@@ -3001,7 +2601,7 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
         os.remove(desc_tempfile.name)
     else:
       change_desc = ChangeDescription(
-          options.message or CreateDescriptionFromLog(git_diff_args))
+          options.message or _create_description_from_log(git_diff_args))
       if not change_desc.description:
         DieWithError("Description is empty. Aborting...")
 
@@ -3020,6 +2620,7 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
       change_id = git_footers.get_footer_change_id(change_desc.description)[0]
 
     assert change_desc
+    SaveDescriptionBackup(change_desc)
     commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
                                                     ref_to_push)]).splitlines()
     if len(commits) > 1:
@@ -3034,6 +2635,27 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
       change_desc.update_reviewers(options.reviewers, options.tbrs,
                                    options.add_owners_to, change)
 
+    reviewers = sorted(change_desc.get_reviewers())
+    # Add cc's from the CC_LIST and --cc flag (if any).
+    if not options.private and not options.no_autocc:
+      cc = self.GetCCList().split(',')
+    else:
+      cc = []
+    if options.cc:
+      cc.extend(options.cc)
+    cc = filter(None, [email.strip() for email in cc])
+    if change_desc.get_cced():
+      cc.extend(change_desc.get_cced())
+    if self._GetGerritHost() == 'chromium-review.googlesource.com':
+      valid_accounts = set(reviewers + cc)
+      # TODO(crbug/877717): relax this for all hosts.
+    else:
+      valid_accounts = gerrit_util.ValidAccounts(
+          self._GetGerritHost(), reviewers + cc)
+    logging.info('accounts %s are recognized, %s invalid',
+                 sorted(valid_accounts),
+                 set(reviewers + cc).difference(set(valid_accounts)))
+
     # Extra options that can be specified at push time. Doc:
     # https://gerrit-review.googlesource.com/Documentation/user-upload.html
     refspec_opts = []
@@ -3059,11 +2681,39 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
     if options.private:
       refspec_opts.append('private')
 
+    for r in sorted(reviewers):
+      if r in valid_accounts:
+        refspec_opts.append('r=%s' % r)
+        reviewers.remove(r)
+      else:
+        # TODO(tandrii): this should probably be a hard failure.
+        print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
+              % r)
+    for c in sorted(cc):
+      # refspec option will be rejected if cc doesn't correspond to an
+      # account, even though REST call to add such arbitrary cc may succeed.
+      if c in valid_accounts:
+        refspec_opts.append('cc=%s' % c)
+        cc.remove(c)
+
     if options.topic:
       # Documentation on Gerrit topics is here:
       # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
       refspec_opts.append('topic=%s' % options.topic)
 
+    if options.enable_auto_submit:
+      refspec_opts.append('l=Auto-Submit+1')
+    if options.use_commit_queue:
+      refspec_opts.append('l=Commit-Queue+2')
+    elif options.cq_dry_run:
+      refspec_opts.append('l=Commit-Queue+1')
+
+    if change_desc.get_reviewers(tbr_only=True):
+      score = gerrit_util.GetCodeReviewTbrScore(
+          self._GetGerritHost(),
+          self._GetGerritProject())
+      refspec_opts.append('l=Code-Review+%s' % score)
+
     # Gerrit sorts hashtags, so order is not important.
     hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
     if not self.GetIssue():
@@ -3078,19 +2728,29 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
     refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
 
     try:
+      push_returncode = 0
+      before_push = time_time()
       push_stdout = gclient_utils.CheckCallAndFilter(
           ['git', 'push', self.GetRemoteUrl(), refspec],
           print_stdout=True,
           # Flush after every line: useful for seeing progress when running as
           # recipe.
           filter_fn=lambda _: sys.stdout.flush())
-    except subprocess2.CalledProcessError:
+    except subprocess2.CalledProcessError as e:
+      push_returncode = e.returncode
       DieWithError('Failed to create a change. Please examine output above '
                    'for the reason of the failure.\n'
                    'Hint: run command below to diagnose common Git/Gerrit '
                    'credential problems:\n'
                    '  git cl creds-check\n',
                    change_desc)
+    finally:
+      metrics.collector.add_repeated('sub_commands', {
+        'command': 'git push',
+        'execution_time': time_time() - before_push,
+        'exit_code': push_returncode,
+        'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
+      })
 
     if options.squash:
       regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
@@ -3104,33 +2764,14 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
       self.SetIssue(change_numbers[0])
       self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
 
-    reviewers = sorted(change_desc.get_reviewers())
-
-    # Add cc's from the CC_LIST and --cc flag (if any).
-    if not options.private:
-      cc = self.GetCCList().split(',')
-    else:
-      cc = []
-    if options.cc:
-      cc.extend(options.cc)
-    cc = filter(None, [email.strip() for email in cc])
-    if change_desc.get_cced():
-      cc.extend(change_desc.get_cced())
-
-    gerrit_util.AddReviewers(
-        self._GetGerritHost(), self.GetIssue(), reviewers, cc,
-        notify=bool(options.send_mail))
-
-    if change_desc.get_reviewers(tbr_only=True):
-      labels = self._GetChangeDetail(['LABELS']).get('labels', {})
-      score = 1
-      if 'Code-Review' in labels and 'values' in labels['Code-Review']:
-        score = max([int(x) for x in labels['Code-Review']['values'].keys()])
-      print('Adding self-LGTM (Code-Review +%d) because of TBRs.' % score)
-      gerrit_util.SetReview(
-          self._GetGerritHost(), self.GetIssue(),
-          msg='Self-approving for TBR',
-          labels={'Code-Review': score})
+    if self.GetIssue() and (reviewers or cc):
+      # GetIssue() is not set in case of non-squash uploads according to tests.
+      # TODO(agable): non-squash uploads in git cl should be removed.
+      gerrit_util.AddReviewers(
+          self._GetGerritHost(),
+          self._GerritChangeIdentifier(),
+          reviewers, cc,
+          notify=bool(options.send_mail))
 
     return 0
 
@@ -3198,31 +2839,16 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
     """Re-commits using the current message, assumes the commit hook is in
     place.
     """
-    log_desc = options.message or CreateDescriptionFromLog(args)
+    log_desc = options.message or _create_description_from_log(args)
     git_command = ['commit', '--amend', '-m', log_desc]
     RunGit(git_command)
-    new_log_desc = CreateDescriptionFromLog(args)
+    new_log_desc = _create_description_from_log(args)
     if git_footers.get_footer_change_id(new_log_desc):
       print('git-cl: Added Change-Id to commit message.')
       return new_log_desc
     else:
       DieWithError('ERROR: Gerrit commit-msg hook not installed.')
 
-  def SetLabels(self, enable_auto_submit, use_commit_queue, cq_dry_run):
-    """Sets labels on the change based on the provided flags."""
-    labels = {}
-    notify = None;
-    if enable_auto_submit:
-      labels['Auto-Submit'] = 1
-    if use_commit_queue:
-      labels['Commit-Queue'] = 2
-    elif cq_dry_run:
-      labels['Commit-Queue'] = 1
-      notify = False
-    if labels:
-      gerrit_util.SetReview(self._GetGerritHost(), self.GetIssue(),
-                            labels=labels, notify=notify)
-
   def SetCQState(self, new_state):
     """Sets the Commit-Queue label assuming canonical CQ config for Gerrit."""
     vote_map = {
@@ -3232,8 +2858,9 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
     }
     labels = {'Commit-Queue': vote_map[new_state]}
     notify = False if new_state == _CQState.DRY_RUN else None
-    gerrit_util.SetReview(self._GetGerritHost(), self.GetIssue(),
-                          labels=labels, notify=notify)
+    gerrit_util.SetReview(
+        self._GetGerritHost(), self._GerritChangeIdentifier(),
+        labels=labels, notify=notify)
 
   def CannotTriggerTryJobReason(self):
     try:
@@ -3271,11 +2898,10 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
 
   def GetReviewers(self):
     details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
-    return [reviewer['email'] for reviewer in details['reviewers']['REVIEWER']]
+    return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
 
 
 _CODEREVIEW_IMPLEMENTATIONS = {
-  'rietveld': _RietveldChangelistImpl,
   'gerrit': _GerritChangelistImpl,
 }
 
@@ -3310,13 +2936,11 @@ def _add_codereview_select_options(parser):
 
 
 def _process_codereview_select_options(parser, options):
-  if options.gerrit and options.rietveld:
-    parser.error('Options --gerrit and --rietveld are mutually exclusive')
+  if options.rietveld:
+    parser.error('--rietveld is no longer supported')
   options.forced_codereview = None
   if options.gerrit:
     options.forced_codereview = 'gerrit'
-  elif options.rietveld:
-    options.forced_codereview = 'rietveld'
 
 
 def _get_bug_line_values(default_project, bugs):
@@ -3464,8 +3088,8 @@ class ChangeDescription(object):
     ] + self._description_lines)
 
     regexp = re.compile(self.BUG_LINE)
+    prefix = settings.GetBugPrefix()
     if not any((regexp.match(line) for line in self._description_lines)):
-      prefix = settings.GetBugPrefix()
       values = list(_get_bug_line_values(prefix, bug or '')) or [prefix]
       if git_footer:
         self.append_footer('Bug: %s' % ', '.join(values))
@@ -3481,7 +3105,9 @@ class ChangeDescription(object):
 
     # Strip off comments and default inserted "Bug:" line.
     clean_lines = [line.rstrip() for line in lines if not
-                   (line.startswith('#') or line.rstrip() == "Bug:")]
+                   (line.startswith('#') or
+                    line.rstrip() == "Bug:" or
+                    line.rstrip() == "Bug: " + prefix)]
     if not clean_lines:
       DieWithError('No CL description, aborting')
     self.set_description(clean_lines)
@@ -3675,13 +3301,11 @@ def LoadCodereviewSettingsFromFile(fileobj):
   # Only server setting is required. Other settings can be absent.
   # In that case, we ignore errors raised during option deletion attempt.
   SetProperty('cc', 'CC_LIST', unset_error_ok=True)
-  SetProperty('private', 'PRIVATE', unset_error_ok=True)
   SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
   SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
   SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
   SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
   SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
-  SetProperty('project', 'PROJECT', unset_error_ok=True)
   SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
               unset_error_ok=True)
 
@@ -3753,43 +3377,6 @@ def DownloadGerritHook(force):
                    'chmod +x .git/hooks/commit-msg' % src)
 
 
-def GetRietveldCodereviewSettingsInteractively():
-  """Prompt the user for settings."""
-  server = settings.GetDefaultServerUrl(error_ok=True)
-  prompt = 'Rietveld server (host[:port])'
-  prompt += ' [%s]' % (server or DEFAULT_SERVER)
-  newserver = ask_for_data(prompt + ':')
-  if not server and not newserver:
-    newserver = DEFAULT_SERVER
-  if newserver:
-    newserver = gclient_utils.UpgradeToHttps(newserver)
-    if newserver != server:
-      RunGit(['config', 'rietveld.server', newserver])
-
-  def SetProperty(initial, caption, name, is_url):
-    prompt = caption
-    if initial:
-      prompt += ' ("x" to clear) [%s]' % initial
-    new_val = ask_for_data(prompt + ':')
-    if new_val == 'x':
-      RunGit(['config', '--unset-all', 'rietveld.' + name], error_ok=True)
-    elif new_val:
-      if is_url:
-        new_val = gclient_utils.UpgradeToHttps(new_val)
-      if new_val != initial:
-        RunGit(['config', 'rietveld.' + name, new_val])
-
-  SetProperty(settings.GetDefaultCCList(), 'CC list', 'cc', False)
-  SetProperty(settings.GetDefaultPrivateFlag(),
-              'Private flag (rietveld only)', 'private', False)
-  SetProperty(settings.GetTreeStatusUrl(error_ok=True), 'Tree status URL',
-              'tree-status-url', False)
-  SetProperty(settings.GetViewVCUrl(), 'ViewVC URL', 'viewvc-url', True)
-  SetProperty(settings.GetBugPrefix(), 'Bug Prefix', 'bug-prefix', False)
-  SetProperty(settings.GetRunPostUploadHook(), 'Run Post Upload Hook',
-              'run-post-upload-hook', False)
-
-
 class _GitCookiesChecker(object):
   """Provides facilities for validating and suggesting fixes to .gitcookies."""
 
@@ -4068,14 +3655,22 @@ class _GitCookiesChecker(object):
     return found
 
 
+@metrics.collector.collect_metrics('git cl creds-check')
 def CMDcreds_check(parser, args):
   """Checks credentials and suggests changes."""
   _, _ = parser.parse_args(args)
 
-  if gerrit_util.GceAuthenticator.is_gce():
+  # Code below checks .gitcookies. Abort if using something else.
+  authn = gerrit_util.Authenticator.get()
+  if not isinstance(authn, gerrit_util.CookiesAuthenticator):
+    if isinstance(authn, gerrit_util.GceAuthenticator):
+      DieWithError(
+          'This command is not designed for GCE, are you on a bot?\n'
+          'If you need to run this on GCE, export SKIP_GCE_AUTH_FOR_GIT=1 '
+          'in your env.')
     DieWithError(
-        'This command is not designed for GCE, are you on a bot?\n'
-        'If you need to run this, export SKIP_GCE_AUTH_FOR_GIT=1 in your env.')
+        'This command is not designed for bot environment. It checks '
+        '~/.gitcookies file not generally used on bots.')
 
   checker = _GitCookiesChecker()
   checker.ensure_configured_gitcookies()
@@ -4089,42 +3684,7 @@ def CMDcreds_check(parser, args):
   return 1
 
 
-@subcommand.usage('[repo root containing codereview.settings]')
-def CMDconfig(parser, args):
-  """Edits configuration for this tree."""
-
-  print('WARNING: git cl config works for Rietveld only.')
-  # TODO(tandrii): remove this once we switch to Gerrit.
-  # See bugs http://crbug.com/637561 and http://crbug.com/600469.
-  parser.add_option('--activate-update', action='store_true',
-                    help='activate auto-updating [rietveld] section in '
-                         '.git/config')
-  parser.add_option('--deactivate-update', action='store_true',
-                    help='deactivate auto-updating [rietveld] section in '
-                         '.git/config')
-  options, args = parser.parse_args(args)
-
-  if options.deactivate_update:
-    RunGit(['config', 'rietveld.autoupdate', 'false'])
-    return
-
-  if options.activate_update:
-    RunGit(['config', '--unset', 'rietveld.autoupdate'])
-    return
-
-  if len(args) == 0:
-    GetRietveldCodereviewSettingsInteractively()
-    return 0
-
-  url = args[0]
-  if not url.endswith('codereview.settings'):
-    url = os.path.join(url, 'codereview.settings')
-
-  # Load code review settings and download hooks (if available).
-  LoadCodereviewSettingsFromFile(urllib2.urlopen(url))
-  return 0
-
-
+@metrics.collector.collect_metrics('git cl baseurl')
 def CMDbaseurl(parser, args):
   """Gets or sets base-url for this branch."""
   branchref = RunGit(['symbolic-ref', 'HEAD']).strip()
@@ -4139,7 +3699,6 @@ def CMDbaseurl(parser, args):
     return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
                   error_ok=False).strip()
 
-
 def color_for_status(status):
   """Maps a Changelist status to color, for CMDstatus and other tools."""
   return {
@@ -4166,9 +3725,6 @@ def get_cl_statuses(changes, fine_grained, max_processes=None):
 
   See GetStatus() for a list of possible statuses.
   """
-  # Silence upload.py otherwise it becomes unwieldy.
-  upload.verbosity = 0
-
   if not changes:
     raise StopIteration()
 
@@ -4240,7 +3796,7 @@ def upload_branch_deps(cl, args):
   if root_branch is None:
     DieWithError('Can\'t find dependent branches from detached HEAD state. '
                  'Get on a branch!')
-  if not cl.GetIssue() or (not cl.IsGerrit() and not cl.GetPatchset()):
+  if not cl.GetIssue():
     DieWithError('Current branch does not have an uploaded CL. We cannot set '
                  'patchset dependencies without an uploaded CL.')
 
@@ -4280,10 +3836,6 @@ def upload_branch_deps(cl, args):
   confirm_or_exit('This command will checkout all dependent branches and run '
                   '"git cl upload".', action='continue')
 
-  # Add a default patchset title to all upload calls in Rietveld.
-  if not cl.IsGerrit():
-    args.extend(['-t', 'Updated patchset dependency'])
-
   # Record all dependents that failed to upload.
   failures = {}
   # Go through all dependents, checkout the branch and upload.
@@ -4315,6 +3867,7 @@ def upload_branch_deps(cl, args):
   return 0
 
 
+@metrics.collector.collect_metrics('git cl archive')
 def CMDarchive(parser, args):
   """Archives and deletes branches associated with closed changelists."""
   parser.add_option(
@@ -4351,7 +3904,7 @@ def CMDarchive(parser, args):
   proposal = [(cl.GetBranch(),
                'git-cl-archived-%s-%s' % (cl.GetIssue(), cl.GetBranch()))
               for cl, status in statuses
-              if status == 'closed']
+              if status in ('closed', 'rietveld-not-supported')]
   proposal.sort()
 
   if not proposal:
@@ -4396,6 +3949,7 @@ def CMDarchive(parser, args):
   return 0
 
 
+@metrics.collector.collect_metrics('git cl status')
 def CMDstatus(parser, args):
   """Show status of changelists.
 
@@ -4410,6 +3964,10 @@ def CMDstatus(parser, args):
 
   Also see 'git cl comments'.
   """
+  parser.add_option(
+      '--no-branch-color',
+      action='store_true',
+      help='Disable colorized branch names')
   parser.add_option('--field',
                     help='print only specific field (desc|id|patch|status|url)')
   parser.add_option('-f', '--fast', action='store_true',
@@ -4464,8 +4022,26 @@ def CMDstatus(parser, args):
                            fine_grained=not options.fast,
                            max_processes=options.maxjobs)
 
+  current_branch = GetCurrentBranch()
+
+  def FormatBranchName(branch, colorize=False):
+    """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
+    an asterisk when it is the current branch."""
+
+    asterisk = ""
+    color = Fore.RESET
+    if branch == current_branch:
+      asterisk = "* "
+      color = Fore.GREEN
+    branch_name = ShortBranchName(branch)
+
+    if colorize:
+      return asterisk + color + branch_name + Fore.RESET
+    return asterisk + branch_name
+
   branch_statuses = {}
-  alignment = max(5, max(len(ShortBranchName(c.GetBranch())) for c in changes))
+
+  alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
   for cl in sorted(changes, key=lambda c: c.GetBranch()):
     branch = cl.GetBranch()
     while branch not in branch_statuses:
@@ -4483,16 +4059,19 @@ def CMDstatus(parser, args):
       color = ''
       reset = ''
     status_str = '(%s)' % status if status else ''
-    print('  %*s : %s%s %s%s' % (
-          alignment, ShortBranchName(branch), color, url,
-          status_str, reset))
 
+    branch_display = FormatBranchName(branch)
+    padding = ' ' * (alignment - len(branch_display))
+    if not options.no_branch_color:
+      branch_display = FormatBranchName(branch, colorize=True)
+
+    print('  %s : %s%s %s%s' % (padding + branch_display, color, url,
+                                status_str, reset))
 
-  branch = GetCurrentBranch()
   print()
-  print('Current branch: %s' % branch)
+  print('Current branch: %s' % current_branch)
   for cl in changes:
-    if cl.GetBranch() == branch:
+    if cl.GetBranch() == current_branch:
       break
   if not cl.GetIssue():
     print('No issue assigned.')
@@ -4529,6 +4108,7 @@ def write_json(path, contents):
 
 
 @subcommand.usage('[issue_number]')
+@metrics.collector.collect_metrics('git cl issue')
 def CMDissue(parser, args):
   """Sets or displays the current code review issue number.
 
@@ -4549,18 +4129,32 @@ def CMDissue(parser, args):
                        '--format=%(refname)']).splitlines()
     # Reverse issue lookup.
     issue_branch_map = {}
+
+    git_config = {}
+    for config in RunGit(['config', '--get-regexp',
+                          r'branch\..*issue']).splitlines():
+      name, _space, val = config.partition(' ')
+      git_config[name] = val
+
     for branch in branches:
-      cl = Changelist(branchref=branch)
-      issue_branch_map.setdefault(cl.GetIssue(), []).append(branch)
+      for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
+        config_key = _git_branch_config_key(ShortBranchName(branch),
+                                            cls.IssueConfigKey())
+        issue = git_config.get(config_key)
+        if issue:
+          issue_branch_map.setdefault(int(issue), []).append(branch)
     if not args:
       args = sorted(issue_branch_map.iterkeys())
     result = {}
     for issue in args:
-      if not issue:
+      try:
+        issue_num = int(issue)
+      except ValueError:
+        print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
         continue
-      result[int(issue)] = issue_branch_map.get(int(issue))
+      result[issue_num] = issue_branch_map.get(issue_num)
       print('Branch for issue number %s: %s' % (
-          issue, ', '.join(issue_branch_map.get(int(issue)) or ('None',))))
+          issue, ', '.join(issue_branch_map.get(issue_num) or ('None',))))
     if options.json:
       write_json(options.json, result)
     return 0
@@ -4584,10 +4178,13 @@ def CMDissue(parser, args):
   return 0
 
 
+@metrics.collector.collect_metrics('git cl comments')
 def CMDcomments(parser, args):
   """Shows or posts review comments for any changelist."""
   parser.add_option('-a', '--add-comment', dest='comment',
                     help='comment to add to an issue')
+  parser.add_option('-p', '--publish', action='store_true',
+                    help='marks CL as ready and sends comment to reviewers')
   parser.add_option('-i', '--issue', dest='issue',
                     help='review issue id (defaults to current issue). '
                          'If given, requires --rietveld or --gerrit')
@@ -4609,15 +4206,14 @@ def CMDcomments(parser, args):
       issue = int(options.issue)
     except ValueError:
       DieWithError('A review issue id is expected to be a number')
-    if not options.forced_codereview:
-      parser.error('--gerrit or --rietveld is required if --issue is specified')
 
-  cl = Changelist(issue=issue,
-                  codereview=options.forced_codereview,
-                  auth_config=auth_config)
+  cl = Changelist(issue=issue, codereview='gerrit', auth_config=auth_config)
+
+  if not cl.IsGerrit():
+    parser.error('rietveld is not supported')
 
   if options.comment:
-    cl.AddComment(options.comment)
+    cl.AddComment(options.comment, options.publish)
     return 0
 
   summary = sorted(cl.GetCommentsSummary(readable=options.readable),
@@ -4629,6 +4225,8 @@ def CMDcomments(parser, args):
       color = Fore.GREEN
     elif comment.sender == cl.GetIssueOwner():
       color = Fore.MAGENTA
+    elif comment.autogenerated:
+      color = Fore.CYAN
     else:
       color = Fore.BLUE
     print('\n%s%s   %s%s\n%s' % (
@@ -4643,12 +4241,12 @@ def CMDcomments(parser, args):
       dct = c.__dict__.copy()
       dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
       return dct
-    with open(options.json_file, 'wb') as f:
-      json.dump(map(pre_serialize, summary), f)
+    write_json(options.json_file, map(pre_serialize, summary))
   return 0
 
 
 @subcommand.usage('[codereview url or issue id]')
+@metrics.collector.collect_metrics('git cl description')
 def CMDdescription(parser, args):
   """Brings up the editor for the current CL's description."""
   parser.add_option('-d', '--display', action='store_true',
@@ -4672,11 +4270,9 @@ def CMDdescription(parser, args):
     if not target_issue_arg.valid:
       parser.error('invalid codereview url or CL id')
 
-  auth_config = auth.extract_auth_config_from_options(options)
-
   kwargs = {
-      'auth_config': auth_config,
-      'codereview': options.forced_codereview,
+    'auth_config': auth.extract_auth_config_from_options(options),
+    'codereview': options.forced_codereview,
   }
   detected_codereview_from_url = False
   if target_issue_arg:
@@ -4719,20 +4315,7 @@ def CMDdescription(parser, args):
   return 0
 
 
-def CreateDescriptionFromLog(args):
-  """Pulls out the commit log to use as a base for the CL description."""
-  log_args = []
-  if len(args) == 1 and not args[0].endswith('.'):
-    log_args = [args[0] + '..']
-  elif len(args) == 1 and args[0].endswith('...'):
-    log_args = [args[0][:-1]]
-  elif len(args) == 2:
-    log_args = [args[0] + '..' + args[1]]
-  else:
-    log_args = args[:]  # Hope for the best!
-  return RunGit(['log', '--pretty=format:%s\n\n%b'] + log_args)
-
-
+@metrics.collector.collect_metrics('git cl lint')
 def CMDlint(parser, args):
   """Runs cpplint on the current changelist."""
   parser.add_option('--filter', action='append', metavar='-x,+y',
@@ -4788,6 +4371,7 @@ def CMDlint(parser, args):
   return 0
 
 
+@metrics.collector.collect_metrics('git cl presubmit')
 def CMDpresubmit(parser, args):
   """Runs presubmit tests on the current changelist."""
   parser.add_option('-u', '--upload', action='store_true',
@@ -4864,7 +4448,7 @@ def GenerateGerritChangeId(message):
   # entropy.
   lines.append(message)
   change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
-                           stdin='\n'.join(lines))
+                           stdin=('\n'.join(lines)).encode())
   return 'I%s' % change_hash.strip()
 
 
@@ -4932,6 +4516,7 @@ def cleanup_list(l):
 
 
 @subcommand.usage('[flags]')
+@metrics.collector.collect_metrics('git cl upload')
 def CMDupload(parser, args):
   """Uploads the current changelist to codereview.
 
@@ -4982,11 +4567,6 @@ def CMDupload(parser, args):
                           'can be applied multiple times'))
   parser.add_option('-s', '--send-mail', action='store_true',
                     help='send email to reviewer(s) and cc(s) immediately')
-  parser.add_option('--emulate_svn_auto_props',
-                    '--emulate-svn-auto-props',
-                    action="store_true",
-                    dest="emulate_svn_auto_props",
-                    help="Emulate Subversion's auto properties feature.")
   parser.add_option('-c', '--use-commit-queue', action='store_true',
                     help='tell the commit queue to commit this patchset; '
                           'implies --send-mail')
@@ -5020,11 +4600,10 @@ def CMDupload(parser, args):
                     help='Run all tests specified by input_api.RunTests in all '
                          'PRESUBMIT files in parallel.')
 
-  # TODO: remove Rietveld flags
+  parser.add_option('--no-autocc', action='store_true',
+                    help='Disables automatic addition of CC emails')
   parser.add_option('--private', action='store_true',
-                    help='set the review private (rietveld only)')
-  parser.add_option('--email', default=None,
-                    help='email address to use to connect to Rietveld')
+                    help='Set the review private. This implies --no-autocc.')
 
   orig_args = args
   auth.add_auth_options(parser)
@@ -5056,10 +4635,22 @@ def CMDupload(parser, args):
   settings.GetIsGerrit()
 
   cl = Changelist(auth_config=auth_config, codereview=options.forced_codereview)
+  if not cl.IsGerrit():
+    # Error out with instructions for repos not yet configured for Gerrit.
+    print('=====================================')
+    print('NOTICE: Rietveld is no longer supported. '
+          'You can upload changes to Gerrit with')
+    print('  git cl upload --gerrit')
+    print('or set Gerrit to be your default code review tool with')
+    print('  git config gerrit.host true')
+    print('=====================================')
+    return 1
+
   return cl.CMDUpload(options, args, orig_args)
 
 
 @subcommand.usage('--description=<description file>')
+@metrics.collector.collect_metrics('git cl split')
 def CMDsplit(parser, args):
   """Splits a branch into smaller branches and uploads CLs.
 
@@ -5077,6 +4668,18 @@ def CMDsplit(parser, args):
                     default=False,
                     help="List the files and reviewers for each CL that would "
                          "be created, but don't create branches or CLs.")
+  parser.add_option("--cq-dry-run", action='store_true',
+                    help="If set, will do a cq dry run for each uploaded CL. "
+                         "Please be careful when doing this; more than ~10 CLs "
+                         "has the potential to overload our build "
+                         "infrastructure. Try to upload these not during high "
+                         "load times (usually 11-3 Mountain View time). Email "
+                         "infra-dev@chromium.org with any questions.")
+  parser.add_option('-a', '--enable-auto-submit', action='store_true',
+                    default=True,
+                    help='Sends your change to the CQ after an approval. Only '
+                         'works on repos that have the Auto-Submit label '
+                         'enabled')
   options, _ = parser.parse_args(args)
 
   if not options.description_file:
@@ -5086,10 +4689,12 @@ def CMDsplit(parser, args):
     return CMDupload(OptionParser(), args)
 
   return split_cl.SplitCl(options.description_file, options.comment_file,
-                          Changelist, WrappedCMDupload, options.dry_run)
+                          Changelist, WrappedCMDupload, options.dry_run,
+                          options.cq_dry_run, options.enable_auto_submit)
 
 
 @subcommand.usage('DEPRECATED')
+@metrics.collector.collect_metrics('git cl commit')
 def CMDdcommit(parser, args):
   """DEPRECATED: Used to commit the current changelist via git-svn."""
   message = ('git-cl no longer supports committing to SVN repositories via '
@@ -5104,28 +4709,17 @@ CHERRY_PICK_BRANCH = 'git-cl-cherry-pick'
 
 
 @subcommand.usage('[upstream branch to apply against]')
+@metrics.collector.collect_metrics('git cl land')
 def CMDland(parser, args):
   """Commits the current changelist via git.
 
   In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
   upstream and closes the issue automatically and atomically.
-
-  Otherwise (in case of Rietveld):
-    Squashes branch into a single commit.
-    Updates commit message with metadata (e.g. pointer to review).
-    Pushes the code upstream.
-    Updates review and closes.
   """
   parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
                     help='bypass upload presubmit hook')
-  parser.add_option('-m', dest='message',
-                    help="override review description")
   parser.add_option('-f', '--force', action='store_true', dest='force',
                     help="force yes to questions (don't prompt)")
-  parser.add_option('-c', dest='contributor',
-                    help="external contributor for patch (appended to " +
-                         "description and used as author for git). Should be " +
-                         "formatted as 'First Last <email@example.com>'")
   parser.add_option('--parallel', action='store_true',
                     help='Run all tests specified by input_api.RunTests in all '
                          'PRESUBMIT files in parallel.')
@@ -5138,19 +4732,6 @@ def CMDland(parser, args):
   if not cl.IsGerrit():
     parser.error('rietveld is not supported')
 
-  if options.message:
-    # This could be implemented, but it requires sending a new patch to
-    # Gerrit, as Gerrit unlike Rietveld versions messages with patchsets.
-    # Besides, Gerrit has the ability to change the commit message on submit
-    # automatically, thus there is no need to support this option (so far?).
-    parser.error('-m MESSAGE option is not supported for Gerrit.')
-  if options.contributor:
-    parser.error(
-        '-c CONTRIBUTOR option is not supported for Gerrit.\n'
-        'Before uploading a commit to Gerrit, ensure it\'s author field is '
-        'the contributor\'s "name <email>". If you can\'t upload such a '
-        'commit for review, contact your repository admin and request'
-        '"Forge-Author" permission.')
   if not cl.GetIssue():
     DieWithError('You must upload the change first to Gerrit.\n'
                  '  If you would rather have `git cl land` upload '
@@ -5159,80 +4740,8 @@ def CMDland(parser, args):
                                      options.verbose, options.parallel)
 
 
-def PushToGitWithAutoRebase(remote, branch, original_description,
-                            git_numberer_enabled, max_attempts=3):
-  """Pushes current HEAD commit on top of remote's branch.
-
-  Attempts to fetch and autorebase on push failures.
-  Adds git number footers on the fly.
-
-  Returns integer code from last command.
-  """
-  cherry = RunGit(['rev-parse', 'HEAD']).strip()
-  code = 0
-  attempts_left = max_attempts
-  while attempts_left:
-    attempts_left -= 1
-    print('Attempt %d of %d' % (max_attempts - attempts_left, max_attempts))
-
-    # Fetch remote/branch into local cherry_pick_branch, overriding the latter.
-    # If fetch fails, retry.
-    print('Fetching %s/%s...' % (remote, branch))
-    code, out = RunGitWithCode(
-        ['retry', 'fetch', remote,
-         '+%s:refs/heads/%s' % (branch, CHERRY_PICK_BRANCH)])
-    if code:
-      print('Fetch failed with exit code %d.' % code)
-      print(out.strip())
-      continue
-
-    print('Cherry-picking commit on top of latest %s' % branch)
-    RunGitWithCode(['checkout', 'refs/heads/%s' % CHERRY_PICK_BRANCH],
-                   suppress_stderr=True)
-    parent_hash = RunGit(['rev-parse', 'HEAD']).strip()
-    code, out = RunGitWithCode(['cherry-pick', cherry])
-    if code:
-      print('Your patch doesn\'t apply cleanly to \'%s\' HEAD @ %s, '
-            'the following files have merge conflicts:' %
-            (branch, parent_hash))
-      print(RunGit(['-c', 'core.quotePath=false', 'diff',
-                    '--name-status', '--diff-filter=U']).strip())
-      print('Please rebase your patch and try again.')
-      RunGitWithCode(['cherry-pick', '--abort'])
-      break
-
-    commit_desc = ChangeDescription(original_description)
-    if git_numberer_enabled:
-      logging.debug('Adding git number footers')
-      parent_msg = RunGit(['show', '-s', '--format=%B', parent_hash]).strip()
-      commit_desc.update_with_git_number_footers(parent_hash, parent_msg,
-                                                 branch)
-      # Ensure timestamps are monotonically increasing.
-      timestamp = max(1 + _get_committer_timestamp(parent_hash),
-                      _get_committer_timestamp('HEAD'))
-      _git_amend_head(commit_desc.description, timestamp)
-
-    code, out = RunGitWithCode(
-        ['push', '--porcelain', remote, 'HEAD:%s' % branch])
-    print(out)
-    if code == 0:
-      break
-    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.\n'
-            'Hint: run command below to diangose common Git/Gerrit credential '
-            'problems:\n'
-            '  git cl creds-check\n')
-      break
-  return code
-
-
-def IsFatalPushFailure(push_stdout):
-  """True if retrying push won't help."""
-  return '(prohibited by Gerrit)' in push_stdout
-
-
 @subcommand.usage('<patch url or issue id or issue url>')
+@metrics.collector.collect_metrics('git cl patch')
 def CMDpatch(parser, args):
   """Patches in a code review."""
   parser.add_option('-b', dest='newbranch',
@@ -5363,6 +4872,7 @@ def GetTreeStatusReason():
   return status['message']
 
 
+@metrics.collector.collect_metrics('git cl tree')
 def CMDtree(parser, args):
   """Shows the status of the tree."""
   _, args = parser.parse_args(args)
@@ -5379,6 +4889,7 @@ def CMDtree(parser, args):
   return 0
 
 
+@metrics.collector.collect_metrics('git cl try')
 def CMDtry(parser, args):
   """Triggers try jobs using either BuildBucket or CQ dry run."""
   group = optparse.OptionGroup(parser, 'Try job options')
@@ -5474,16 +4985,6 @@ def CMDtry(parser, args):
       return 1
 
   patchset = cl.GetMostRecentPatchset()
-  # TODO(tandrii): Checking local patchset against remote patchset is only
-  # supported for Rietveld. Extend it to Gerrit or remove it completely.
-  if not cl.IsGerrit() and patchset != cl.GetPatchset():
-    print('Warning: Codereview server has newer patchsets (%s) than most '
-          'recent upload from local checkout (%s). Did a previous upload '
-          'fail?\n'
-          'By default, git cl try uses the latest patchset from '
-          'codereview, continuing to use patchset %s.\n' %
-          (patchset, cl.GetPatchset(), patchset))
-
   try:
     _trigger_try_jobs(auth_config, cl, buckets, options, patchset)
   except BuildbucketResponseException as ex:
@@ -5492,6 +4993,7 @@ def CMDtry(parser, args):
   return 0
 
 
+@metrics.collector.collect_metrics('git cl try-results')
 def CMDtry_results(parser, args):
   """Prints info about try jobs associated with current CL."""
   group = optparse.OptionGroup(parser, 'Try job results options')
@@ -5532,15 +5034,6 @@ def CMDtry_results(parser, args):
                    'Either upload first, or pass --patchset explicitly' %
                    cl.GetIssue())
 
-    # TODO(tandrii): Checking local patchset against remote patchset is only
-    # supported for Rietveld. Extend it to Gerrit or remove it completely.
-    if not cl.IsGerrit() and patchset != cl.GetPatchset():
-      print('Warning: Codereview server has newer patchsets (%s) than most '
-            'recent upload from local checkout (%s). Did a previous upload '
-            'fail?\n'
-            'By default, git cl try-results uses the latest patchset from '
-            'codereview, continuing to use patchset %s.\n' %
-            (patchset, cl.GetPatchset(), patchset))
   try:
     jobs = fetch_try_jobs(auth_config, cl, options.buildbucket_host, patchset)
   except BuildbucketResponseException as ex:
@@ -5554,6 +5047,7 @@ def CMDtry_results(parser, args):
 
 
 @subcommand.usage('[new upstream branch]')
+@metrics.collector.collect_metrics('git cl upstream')
 def CMDupstream(parser, args):
   """Prints or sets the name of the upstream branch, if any."""
   _, args = parser.parse_args(args)
@@ -5575,6 +5069,7 @@ def CMDupstream(parser, args):
   return 0
 
 
+@metrics.collector.collect_metrics('git cl web')
 def CMDweb(parser, args):
   """Opens the current CL in the web browser."""
   _, args = parser.parse_args(args)
@@ -5586,10 +5081,23 @@ def CMDweb(parser, args):
     print('ERROR No issue to open', file=sys.stderr)
     return 1
 
-  webbrowser.open(issue_url)
+  # Redirect I/O before invoking browser to hide its output. For example, this
+  # allows to hide "Created new window in existing browser session." message
+  # from Chrome. Based on https://stackoverflow.com/a/2323563.
+  saved_stdout = os.dup(1)
+  saved_stderr = os.dup(2)
+  os.close(1)
+  os.close(2)
+  os.open(os.devnull, os.O_RDWR)
+  try:
+    webbrowser.open(issue_url)
+  finally:
+    os.dup2(saved_stdout, 1)
+    os.dup2(saved_stderr, 2)
   return 0
 
 
+@metrics.collector.collect_metrics('git cl set-commit')
 def CMDset_commit(parser, args):
   """Sets the commit bit to trigger the Commit Queue."""
   parser.add_option('-d', '--dry-run', action='store_true',
@@ -5620,6 +5128,7 @@ def CMDset_commit(parser, args):
   return 0
 
 
+@metrics.collector.collect_metrics('git cl set-close')
 def CMDset_close(parser, args):
   """Closes the issue."""
   _add_codereview_issue_select_options(parser)
@@ -5638,6 +5147,7 @@ def CMDset_close(parser, args):
   return 0
 
 
+@metrics.collector.collect_metrics('git cl diff')
 def CMDdiff(parser, args):
   """Shows differences between local tree and last upload."""
   parser.add_option(
@@ -5676,12 +5186,17 @@ def CMDdiff(parser, args):
   return 0
 
 
+@metrics.collector.collect_metrics('git cl owners')
 def CMDowners(parser, args):
   """Finds potential owners for reviewing."""
   parser.add_option(
       '--ignore-current',
       action='store_true',
       help='Ignore the CL\'s current reviewers and start from scratch.')
+  parser.add_option(
+      '--ignore-self',
+      action='store_true',
+      help='Do not consider CL\'s author as an owners.')
   parser.add_option(
       '--no-color',
       action='store_true',
@@ -5721,15 +5236,23 @@ def CMDowners(parser, args):
       [] if options.ignore_current else cl.GetReviewers(),
       fopen=file, os_path=os.path,
       disable_color=options.no_color,
-      override_files=change.OriginalOwnersFiles()).run()
+      override_files=change.OriginalOwnersFiles(),
+      ignore_author=options.ignore_self).run()
 
 
-def BuildGitDiffCmd(diff_type, upstream_commit, args):
+def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
   """Generates a diff command."""
   # Generate diff for the current branch's changes.
-  diff_cmd = ['-c', 'core.quotePath=false', 'diff',
-              '--no-ext-diff', '--no-prefix', diff_type,
-              upstream_commit, '--']
+  diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
+
+  if allow_prefix:
+    # explicitly setting --src-prefix and --dst-prefix is necessary in the
+    # case that diff.noprefix is set in the user's git config.
+    diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
+  else:
+    diff_cmd += ['--no-prefix']
+
+  diff_cmd += [diff_type, upstream_commit, '--']
 
   if args:
     for arg in args:
@@ -5747,6 +5270,7 @@ def MatchingFileType(file_name, extensions):
 
 
 @subcommand.usage('[files or directories to diff]')
+@metrics.collector.collect_metrics('git cl format')
 def CMDformat(parser, args):
   """Runs auto-formatting tools (clang-format etc.) on the diff."""
   CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
@@ -5755,8 +5279,20 @@ def CMDformat(parser, args):
                     help='Reformat the full content of all touched files')
   parser.add_option('--dry-run', action='store_true',
                     help='Don\'t modify any file on disk.')
-  parser.add_option('--python', action='store_true',
-                    help='Format python code with yapf (experimental).')
+  parser.add_option(
+      '--python',
+      action='store_true',
+      default=None,
+      help='Enables python formatting on all python files.')
+  parser.add_option(
+      '--no-python',
+      action='store_true',
+      dest='python',
+      help='Disables python formatting on all python files. '
+      'Takes precedence over --python. '
+      'If neither --python or --no-python are set, python '
+      'files that have a .style.yapf file in an ancestor '
+      'directory will be formatted.')
   parser.add_option('--js', action='store_true',
                     help='Format javascript code with clang-format.')
   parser.add_option('--diff', action='store_true',
@@ -5797,7 +5333,7 @@ def CMDformat(parser, args):
   diff_files = [x for x in diff_files if os.path.isfile(x)]
 
   if opts.js:
-    CLANG_EXTS.append('.js')
+    CLANG_EXTS.extend(['.js', '.ts'])
 
   clang_diff_files = [x for x in diff_files if MatchingFileType(x, CLANG_EXTS)]
   python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
@@ -5849,26 +5385,73 @@ def CMDformat(parser, args):
 
   # Similar code to above, but using yapf on .py files rather than clang-format
   # on C/C++ files
-  if opts.python:
-    yapf_tool = gclient_utils.FindExecutable('yapf')
-    if yapf_tool is None:
-      DieWithError('yapf not found in PATH')
-
-    if opts.full:
-      if python_diff_files:
-        if opts.dry_run or opts.diff:
-          cmd = [yapf_tool, '--diff'] + python_diff_files
-          stdout = RunCommand(cmd, error_ok=True, cwd=top_dir)
-          if opts.diff:
-            sys.stdout.write(stdout)
-          elif len(stdout) > 0:
-            return_value = 2
-        else:
-          RunCommand([yapf_tool, '-i'] + python_diff_files, cwd=top_dir)
+  py_explicitly_disabled = opts.python is not None and not opts.python
+  if python_diff_files and not py_explicitly_disabled:
+    depot_tools_path = os.path.dirname(os.path.abspath(__file__))
+    yapf_tool = os.path.join(depot_tools_path, 'yapf')
+    if sys.platform.startswith('win'):
+      yapf_tool += '.bat'
+
+    # If we couldn't find a yapf file we'll default to the chromium style
+    # specified in depot_tools.
+    chromium_default_yapf_style = os.path.join(depot_tools_path,
+                                               YAPF_CONFIG_FILENAME)
+    # Used for caching.
+    yapf_configs = {}
+    for f in python_diff_files:
+      # Find the yapf style config for the current file, defaults to depot
+      # tools default.
+      _FindYapfConfigFile(f, yapf_configs, top_dir)
+
+    # Turn on python formatting by default if a yapf config is specified.
+    # This breaks in the case of this repo though since the specified
+    # style file is also the global default.
+    if opts.python is None:
+      filtered_py_files = []
+      for f in python_diff_files:
+        if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
+          filtered_py_files.append(f)
     else:
-      # TODO(sbc): yapf --lines mode still has some issues.
-      # https://github.com/google/yapf/issues/154
-      DieWithError('--python currently only works with --full')
+      filtered_py_files = python_diff_files
+
+    # Note: yapf still seems to fix indentation of the entire file
+    # even if line ranges are specified.
+    # See https://github.com/google/yapf/issues/499
+    if not opts.full and filtered_py_files:
+      py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
+
+    for f in filtered_py_files:
+      yapf_config = _FindYapfConfigFile(f, yapf_configs, top_dir)
+      if yapf_config is None:
+        yapf_config = chromium_default_yapf_style
+
+      cmd = [yapf_tool, '--style', yapf_config, f]
+
+      has_formattable_lines = False
+      if not opts.full:
+        # Only run yapf over changed line ranges.
+        for diff_start, diff_len in py_line_diffs[f]:
+          diff_end = diff_start + diff_len - 1
+          # Yapf errors out if diff_end < diff_start but this
+          # is a valid line range diff for a removal.
+          if diff_end >= diff_start:
+            has_formattable_lines = True
+            cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
+        # If all line diffs were removals we have nothing to format.
+        if not has_formattable_lines:
+          continue
+
+      if opts.diff or opts.dry_run:
+        cmd += ['--diff']
+        # Will return non-zero exit code if non-empty diff.
+        stdout = RunCommand(cmd, error_ok=True, cwd=top_dir)
+        if opts.diff:
+          sys.stdout.write(stdout)
+        elif len(stdout) > 0:
+          return_value = 2
+      else:
+        cmd += ['-i']
+        RunCommand(cmd, cwd=top_dir)
 
   # Dart's formatter does not have the nice property of only operating on
   # modified chunks, so hard code full.
@@ -5939,6 +5522,7 @@ def GetDirtyMetricsDirs(diff_files):
 
 
 @subcommand.usage('<codereview url or issue id>')
+@metrics.collector.collect_metrics('git cl checkout')
 def CMDcheckout(parser, args):
   """Checks out a branch associated with a given Rietveld or Gerrit issue."""
   _, args = parser.parse_args(args)
@@ -6002,13 +5586,42 @@ class OptionParser(optparse.OptionParser):
         '-v', '--verbose', action='count', default=0,
         help='Use 2 times for more debugging info')
 
-  def parse_args(self, args=None, values=None):
-    options, args = optparse.OptionParser.parse_args(self, args, values)
+  def parse_args(self, args=None, _values=None):
+    try:
+      return self._parse_args(args)
+    finally:
+      # Regardless of success or failure of args parsing, we want to report
+      # metrics, but only after logging has been initialized (if parsing
+      # succeeded).
+      global settings
+      settings = Settings()
+
+      if not metrics.DISABLE_METRICS_COLLECTION:
+        # GetViewVCUrl ultimately calls logging method.
+        project_url = settings.GetViewVCUrl().strip('/+')
+        if project_url in metrics_utils.KNOWN_PROJECT_URLS:
+          metrics.collector.add('project_urls', [project_url])
+
+  def _parse_args(self, args=None):
+    # Create an optparse.Values object that will store only the actual passed
+    # options, without the defaults.
+    actual_options = optparse.Values()
+    _, args = optparse.OptionParser.parse_args(self, args, actual_options)
+    # Create an optparse.Values object with the default options.
+    options = optparse.Values(self.get_default_values().__dict__)
+    # Update it with the options passed by the user.
+    options._update_careful(actual_options.__dict__)
+    # Store the options passed by the user in an _actual_options attribute.
+    # We store only the keys, and not the values, since the values can contain
+    # arbitrary information, which might be PII.
+    metrics.collector.add('arguments', actual_options.__dict__.keys())
+
     levels = [logging.WARNING, logging.INFO, logging.DEBUG]
     logging.basicConfig(
         level=levels[min(options.verbose, len(levels) - 1)],
         format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
                '%(filename)s] %(message)s')
+
     return options, args
 
 
@@ -6018,10 +5631,6 @@ def main(argv):
           (sys.version.split(' ', 1)[0],), file=sys.stderr)
     return 2
 
-  # Reload settings.
-  global settings
-  settings = Settings()
-
   colorize_CMDstatus_doc()
   dispatcher = subcommand.CommandDispatcher(__name__)
   try:
@@ -6042,8 +5651,5 @@ if __name__ == '__main__':
   # unit testing.
   fix_encoding.fix_encoding()
   setup_color.init()
-  try:
+  with metrics.collector.print_notice_and_exit():
     sys.exit(main(sys.argv[1:]))
-  except KeyboardInterrupt:
-    sys.stderr.write('interrupted\n')
-    sys.exit(1)