libv8 5.7.492.65.1 → 5.9.211.38.0beta0

data/vendor/depot_tools/git-crrev-parse

@@ -39,6 +39,7 @@ while [ -n "$1" ]; do
   fi
   remote_ref="${ref/refs\/heads/refs\/remotes\/origin}"
   remote_ref="${remote_ref/refs\/branch-heads/refs\/remotes\/branch-heads}"
+  remote_ref="${remote_ref//\\}"
   num="${commit_pos#*@\{\#}"
   num="${num%\}}"
   if [ -z "$ref" -o -z "$num" ]; then

data/vendor/depot_tools/git-gs

@@ -6,4 +6,4 @@ git grep -n -e "$@" -- "*.h" "*.hpp" "*.cpp" "*.c" "*.cc" "*.cpp" "*.inl"\
    "*.grd" "*.grdp" "*.idl" "*.m" "*.mm" "*.py" "*.sh" "*.cfg" "*.tac" "*.go"\
    "*.vcproj" "*.vsprops" "*.make" "*.gyp" "*.gypi" "*.isolate" "*.java"\
    "*.js" "*.html" "*.css" "*.ebuild" "*.pl" "*.pm" "*.yaml" "*.gn" "*.gni"\
-   "*.json" "DEPS" "*/DEPS" "*.mojom"
+   "*.json" "DEPS" "*/DEPS" "*.mojom" "*.proto"

data/vendor/depot_tools/git_cl.py

@@ -59,6 +59,7 @@ import owners_finder
 import presubmit_support
 import rietveld
 import scm
+import split_cl
 import subcommand
 import subprocess2
 import watchlists
@@ -90,7 +91,7 @@ settings = None
 # Used by tests/git_cl_test.py to add extra logging.
 # Inside the weirdly failing test, add this:
 # >>> self.mock(git_cl, '_IS_BEING_TESTED', True)
-# And scroll up to see the strack trace printed.
+# And scroll up to see the stack trace printed.
 _IS_BEING_TESTED = False
 
 
@@ -273,7 +274,7 @@ def _git_set_branch_config_value(key, value, branch=None, **kwargs):
 
 
 def _get_committer_timestamp(commit):
-  """Returns unix timestamp as integer of a committer in a commit.
+  """Returns Unix timestamp as integer of a committer in a commit.
 
   Commit can be whatever git show would recognize, such as HEAD, sha1 or ref.
   """
@@ -305,6 +306,7 @@ def add_git_similarity(parser):
       help='Disallows git from looking for copies.')
 
   old_parser_args = parser.parse_args
+
   def Parse(args):
     options, args = old_parser_args(args)
 
@@ -324,10 +326,8 @@ def add_git_similarity(parser):
     else:
       _git_set_branch_config_value('git-find-copies', bool(options.find_copies))
 
-    print('Using %d%% similarity for rename/copy detection. '
-          'Override with --similarity.' % options.similarity)
-
     return options, args
+
   parser.parse_args = Parse
 
 
@@ -499,7 +499,7 @@ def _trigger_try_jobs(auth_config, changelist, buckets, options,
       issue=changelist.GetIssue(),
       patch=patchset)
 
-  shared_parameters_properties = changelist.GetTryjobProperties(patchset)
+  shared_parameters_properties = changelist.GetTryJobProperties(patchset)
   shared_parameters_properties['category'] = category
   if options.clobber:
     shared_parameters_properties['clobber'] = True
@@ -611,7 +611,7 @@ def fetch_try_jobs(auth_config, changelist, buildbucket_host,
 def print_try_jobs(options, builds):
   """Prints nicely result of fetch_try_jobs."""
   if not builds:
-    print('No try jobs scheduled')
+    print('No try jobs scheduled.')
     return
 
   # Make a copy, because we'll be modifying builds dictionary.
@@ -626,7 +626,7 @@ def print_try_jobs(options, builds):
         parameters = json.loads(b['parameters_json'])
         name = parameters['builder_name']
       except (ValueError, KeyError) as error:
-        print('WARNING: failed to get builder name for build %s: %s' % (
+        print('WARNING: Failed to get builder name for build %s: %s' % (
               b['id'], error))
         name = None
       builder_names_cache[b['id']] = name
@@ -858,9 +858,10 @@ class Settings(object):
     return self._GetRietveldConfig('private', error_ok=True)
 
   def GetIsGerrit(self):
-    """Return true if this repo is assosiated with gerrit code review system."""
+    """Return true if this repo is associated with gerrit code review system."""
     if self.is_gerrit is None:
-      self.is_gerrit = self._GetConfig('gerrit.host', error_ok=True)
+      self.is_gerrit = (
+          self._GetConfig('gerrit.host', error_ok=True).lower() == 'true')
     return self.is_gerrit
 
   def GetSquashGerritUploads(self):
@@ -939,7 +940,7 @@ def _get_gerrit_project_config_file(remote_url):
       '+refs/meta/config:refs/git_cl/meta/config'])
   if error:
     # Ref doesn't exist or isn't accessible to current user.
-    print('WARNING: failed to fetch project config for %s: %s' %
+    print('WARNING: Failed to fetch project config for %s: %s' %
           (remote_url, error))
     yield None
     return
@@ -1038,34 +1039,53 @@ class _CQState(object):
 
 
 class _ParsedIssueNumberArgument(object):
-  def __init__(self, issue=None, patchset=None, hostname=None):
+  def __init__(self, issue=None, patchset=None, hostname=None, codereview=None):
     self.issue = issue
     self.patchset = patchset
     self.hostname = hostname
+    assert codereview in (None, 'rietveld', 'gerrit')
+    self.codereview = codereview
 
   @property
   def valid(self):
     return self.issue is not None
 
 
-def ParseIssueNumberArgument(arg):
+def ParseIssueNumberArgument(arg, codereview=None):
   """Parses the issue argument and returns _ParsedIssueNumberArgument."""
   fail_result = _ParsedIssueNumberArgument()
 
   if arg.isdigit():
-    return _ParsedIssueNumberArgument(issue=int(arg))
+    return _ParsedIssueNumberArgument(issue=int(arg), codereview=codereview)
   if not arg.startswith('http'):
     return fail_result
+
   url = gclient_utils.UpgradeToHttps(arg)
   try:
     parsed_url = urlparse.urlparse(url)
   except ValueError:
     return fail_result
-  for cls in _CODEREVIEW_IMPLEMENTATIONS.itervalues():
-    tmp = cls.ParseIssueURL(parsed_url)
-    if tmp is not None:
-      return tmp
-  return fail_result
+
+  if codereview is not 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
+
+  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']
 
 
 class GerritChangeNotExists(Exception):
@@ -1173,9 +1193,10 @@ class Changelist(object):
     return self._codereview == 'gerrit'
 
   def GetCCList(self):
-    """Return the users cc'd on this CL.
+    """Returns the users cc'd on this CL.
 
-    Return is a string suitable for passing to git cl with the --cc flag.
+    The return value is a string suitable for passing to git cl with the --cc
+    flag.
     """
     if self.cc is None:
       base_cc = settings.GetDefaultCCList()
@@ -1190,8 +1211,8 @@ class Changelist(object):
     return self.cc
 
   def SetWatchers(self, watchers):
-    """Set the list of email addresses that should be cc'd based on the changed
-       files in this CL.
+    """Sets the list of email addresses that should be cc'd based on the changed
+    files in this CL.
     """
     self.watchers = watchers
 
@@ -1315,10 +1336,10 @@ class Changelist(object):
 
     if upstream_git_obj is None:
       if self.GetBranch() is None:
-        print('ERROR: unable to determine current branch (detached HEAD?)',
+        print('ERROR: Unable to determine current branch (detached HEAD?)',
               file=sys.stderr)
       else:
-        print('ERROR: no upstream branch', file=sys.stderr)
+        print('ERROR: No upstream branch.', file=sys.stderr)
       return False
 
     # Verify the commit we're diffing against is in our current branch.
@@ -1402,6 +1423,22 @@ class Changelist(object):
       return '\n'.join([wrapper.fill(line) for line in lines])
     return self.description
 
+  def GetDescriptionFooters(self):
+    """Returns (non_footer_lines, footers) for the commit message.
+
+    Returns:
+      non_footer_lines (list(str)) - Simple list of description lines without
+        any footer. The lines do not contain newlines, nor does the list contain
+        the empty line between the message and the footers.
+      footers (list(tuple(KEY, VALUE))) - List of parsed footers, e.g.
+        [("Change-Id", "Ideadbeef...."), ...]
+    """
+    raw_description = self.GetDescription()
+    msg_lines, _, footers = git_footers.split_footers(raw_description)
+    if footers:
+      msg_lines = msg_lines[:len(msg_lines)-1]
+    return msg_lines, footers
+
   def GetPatchset(self):
     """Returns the patchset number as a int or None if not set."""
     if self.patchset is None and not self.lookedup_patchset:
@@ -1434,6 +1471,12 @@ class Changelist(object):
             self._codereview_impl.CodereviewServerConfigKey(),
             codereview_server)
     else:
+      desc = self.GetDescription()
+      if desc and git_footers.get_footer_change_id(desc):
+        print('WARNING: The change patched into this branch has a Change-Id. '
+              'Removing it.')
+        RunGit(['commit', '--amend', '-m',
+                git_footers.remove_footer(desc, 'Change-Id')])
       # Reset all of these just to be clean.
       reset_suffixes = [
           'last-upload-hash',
@@ -1497,13 +1540,36 @@ class Changelist(object):
     self.description = description
     self.has_description = True
 
+  def UpdateDescriptionFooters(self, description_lines, footers, force=False):
+    """Sets the description for this CL remotely.
+
+    You can get description_lines and footers with GetDescriptionFooters.
+
+    Args:
+      description_lines (list(str)) - List of CL description lines without
+        newline characters.
+      footers (list(tuple(KEY, VALUE))) - List of footers, as returned by
+        GetDescriptionFooters. Key must conform to the git footers format (i.e.
+        `List-Of-Tokens`). It will be case-normalized so that each token is
+        title-cased.
+    """
+    new_description = '\n'.join(description_lines)
+    if footers:
+      new_description += '\n'
+      for k, v in footers:
+        foot = '%s: %s' % (git_footers.normalize_name(k), v)
+        if not git_footers.FOOTER_PATTERN.match(foot):
+          raise ValueError('Invalid footer %r' % foot)
+        new_description += foot + '\n'
+    self.UpdateDescription(new_description, force)
+
   def RunHook(self, committing, may_prompt, verbose, change):
     """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
     try:
       return presubmit_support.DoPresubmitChecks(change, committing,
           verbose=verbose, output_stream=sys.stdout, input_stream=sys.stdin,
           default_presubmit=None, may_prompt=may_prompt,
-          rietveld_obj=self._codereview_impl.GetRieveldObjForPresubmit(),
+          rietveld_obj=self._codereview_impl.GetRietveldObjForPresubmit(),
           gerrit_obj=self._codereview_impl.GetGerritObjForPresubmit())
     except presubmit_support.PresubmitFailure as e:
       DieWithError(
@@ -1522,13 +1588,13 @@ class Changelist(object):
       DieWithError('Failed to parse issue argument "%s". '
                    'Must be an issue number or a valid URL.' % issue_arg)
     return self._codereview_impl.CMDPatchWithParsedIssue(
-        parsed_issue_arg, reject, nocommit, directory)
+        parsed_issue_arg, reject, nocommit, directory, False)
 
   def CMDUpload(self, options, git_diff_args, orig_args):
     """Uploads a change to codereview."""
+    custom_cl_base = None
     if git_diff_args:
-      # TODO(ukai): is it ok for gerrit case?
-      base_branch = git_diff_args[0]
+      custom_cl_base = base_branch = git_diff_args[0]
     else:
       if self.GetBranch() is None:
         DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
@@ -1537,6 +1603,16 @@ 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
     # checks does not guarantee that uploading will not fail.
@@ -1551,11 +1627,12 @@ class Changelist(object):
       self.SetWatchers(watchlist.GetWatchersForPaths(files))
 
     if not options.bypass_hooks:
-      if options.reviewers or options.tbr_owners:
+      if options.reviewers or options.tbrs or options.add_owners_to:
         # Set the reviewer list now so that presubmit checks can access it.
         change_description = ChangeDescription(change.FullDescriptionText())
         change_description.update_reviewers(options.reviewers,
-                                            options.tbr_owners,
+                                            options.tbrs,
+                                            options.add_owners_to,
                                             change)
         change.SetDescriptionText(change_description.description)
       hook_results = self.RunHook(committing=False,
@@ -1583,7 +1660,7 @@ class Changelist(object):
         confirm_or_exit(action='upload')
 
     print_stats(options.similarity, options.find_copies, git_diff_args)
-    ret = self.CMDUploadChange(options, git_diff_args, change)
+    ret = self.CMDUploadChange(options, git_diff_args, custom_cl_base, change)
     if not ret:
       if options.use_commit_queue:
         self.SetCQState(_CQState.COMMIT)
@@ -1614,51 +1691,42 @@ class Changelist(object):
     return ret
 
   def SetCQState(self, new_state):
-    """Update the CQ state for latest patchset.
+    """Updates the CQ state for the latest patchset.
 
     Issue must have been already uploaded and known.
     """
     assert new_state in _CQState.ALL_STATES
     assert self.GetIssue()
-    return self._codereview_impl.SetCQState(new_state)
-
-  def TriggerDryRun(self):
-    """Triggers a dry run and prints a warning on failure."""
-    # TODO(qyearsley): Either re-use this method in CMDset_commit
-    # and CMDupload, or change CMDtry to trigger dry runs with
-    # just SetCQState, and catch keyboard interrupt and other
-    # errors in that method.
     try:
-      self.SetCQState(_CQState.DRY_RUN)
-      print('scheduled CQ Dry Run on %s' % self.GetIssueURL())
+      self._codereview_impl.SetCQState(new_state)
       return 0
     except KeyboardInterrupt:
       raise
     except:
-      print('WARNING: failed to trigger CQ Dry Run.\n'
+      print('WARNING: Failed to %s.\n'
             'Either:\n'
-            ' * your project has no CQ\n'
-            ' * you don\'t have permission to trigger Dry Run\n'
-            ' * bug in this code (see stack trace below).\n'
-            'Consider specifying which bots to trigger manually '
-            'or asking your project owners for permissions '
-            'or contacting Chrome Infrastructure team at '
-            'https://www.chromium.org/infra\n\n')
+            ' * Your project has no CQ,\n'
+            ' * You don\'t have permission to change the CQ state,\n'
+            ' * There\'s a bug in this code (see stack trace below).\n'
+            'Consider specifying which bots to trigger manually or asking your '
+            'project owners for permissions or contacting Chrome Infra at:\n'
+            'https://www.chromium.org/infra\n\n' %
+            ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
       # Still raise exception so that stack trace is printed.
       raise
 
   # Forward methods to codereview specific implementation.
 
-  def AddComment(self, message):
-    return self._codereview_impl.AddComment(message)
+  def AddComment(self, message, publish=None):
+    return self._codereview_impl.AddComment(message, publish=publish)
 
-  def GetCommentsSummary(self):
+  def GetCommentsSummary(self, readable=True):
     """Returns list of _CommentSummary for each comment.
 
-    Note: comments per file or per line are not included,
-    only top-level comments are returned.
+    args:
+    readable: determines whether the output is designed for a human or a machine
     """
-    return self._codereview_impl.GetCommentsSummary()
+    return self._codereview_impl.GetCommentsSummary(readable)
 
   def CloseIssue(self):
     return self._codereview_impl.CloseIssue()
@@ -1673,19 +1741,16 @@ class Changelist(object):
     """Get owner from codereview, which may differ from this checkout."""
     return self._codereview_impl.GetIssueOwner()
 
-  def GetApprovingReviewers(self):
-    return self._codereview_impl.GetApprovingReviewers()
-
   def GetMostRecentPatchset(self):
     return self._codereview_impl.GetMostRecentPatchset()
 
   def CannotTriggerTryJobReason(self):
-    """Returns reason (str) if unable trigger tryjobs on this CL or None."""
+    """Returns reason (str) if unable trigger try jobs on this CL or None."""
     return self._codereview_impl.CannotTriggerTryJobReason()
 
-  def GetTryjobProperties(self, patchset=None):
-    """Returns dictionary of properties to launch tryjob."""
-    return self._codereview_impl.GetTryjobProperties(patchset=patchset)
+  def GetTryJobProperties(self, patchset=None):
+    """Returns dictionary of properties to launch try job."""
+    return self._codereview_impl.GetTryJobProperties(patchset=patchset)
 
   def __getattr__(self, attr):
     # This is because lots of untested code accesses Rietveld-specific stuff
@@ -1742,12 +1807,12 @@ class _ChangelistCodereviewBase(object):
     raise NotImplementedError()
 
   def _PostUnsetIssueProperties(self):
-    """Which branch-specific properties to erase when unsettin issue."""
+    """Which branch-specific properties to erase when unsetting issue."""
     return []
 
-  def GetRieveldObjForPresubmit(self):
+  def GetRietveldObjForPresubmit(self):
     # This is an unfortunate Rietveld-embeddedness in presubmit.
-    # For non-Rietveld codereviews, this probably should return a dummy object.
+    # For non-Rietveld code reviews, this probably should return a dummy object.
     raise NotImplementedError()
 
   def GetGerritObjForPresubmit(self):
@@ -1758,30 +1823,23 @@ class _ChangelistCodereviewBase(object):
     """Update the description on codereview site."""
     raise NotImplementedError()
 
-  def AddComment(self, message):
+  def AddComment(self, message, publish=None):
     """Posts a comment to the codereview site."""
     raise NotImplementedError()
 
-  def GetCommentsSummary(self):
+  def GetCommentsSummary(self, readable=True):
     raise NotImplementedError()
 
   def CloseIssue(self):
     """Closes the issue."""
     raise NotImplementedError()
 
-  def GetApprovingReviewers(self):
-    """Returns a list of reviewers approving the change.
-
-    Note: not necessarily committers.
-    """
-    raise NotImplementedError()
-
   def GetMostRecentPatchset(self):
     """Returns the most recent patchset number from the codereview site."""
     raise NotImplementedError()
 
   def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
-                              directory):
+                              directory, force):
     """Fetches and applies the issue.
 
     Arguments:
@@ -1791,6 +1849,7 @@ class _ChangelistCodereviewBase(object):
       nocommit: do not commit the patch, thus leave the tree dirty. Rietveld
         only.
       directory: switch to directory before applying the patch. Rietveld only.
+      force: if true, overwrites existing local state.
     """
     raise NotImplementedError()
 
@@ -1822,29 +1881,30 @@ class _ChangelistCodereviewBase(object):
     """
     raise NotImplementedError()
 
-  def CMDUploadChange(self, options, args, change):
+  def CMDUploadChange(self, options, git_diff_args, custom_cl_base, change):
     """Uploads a change to codereview."""
     raise NotImplementedError()
 
   def SetCQState(self, new_state):
-    """Update the CQ state for latest patchset.
+    """Updates the CQ state for the latest patchset.
 
     Issue must have been already uploaded and known.
     """
     raise NotImplementedError()
 
   def CannotTriggerTryJobReason(self):
-    """Returns reason (str) if unable trigger tryjobs on this CL or None."""
+    """Returns reason (str) if unable trigger try jobs on this CL or None."""
     raise NotImplementedError()
 
   def GetIssueOwner(self):
     raise NotImplementedError()
 
-  def GetTryjobProperties(self, patchset=None):
+  def GetTryJobProperties(self, patchset=None):
     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'
@@ -1927,8 +1987,8 @@ class _RietveldChangelistImpl(_ChangelistCodereviewBase):
       return 'CL %s is private' % self.GetIssue()
     return None
 
-  def GetTryjobProperties(self, patchset=None):
-    """Returns dictionary of properties to launch tryjob."""
+  def GetTryJobProperties(self, patchset=None):
+    """Returns dictionary of properties to launch try job."""
     project = (self.GetIssueProperties() or {}).get('project')
     return {
       'issue': self.GetIssue(),
@@ -1938,16 +1998,13 @@ class _RietveldChangelistImpl(_ChangelistCodereviewBase):
       'rietveld': self.GetCodereviewServer(),
     }
 
-  def GetApprovingReviewers(self):
-    return get_approving_reviewers(self.GetIssueProperties())
-
   def GetIssueOwner(self):
     return (self.GetIssueProperties() or {}).get('owner_email')
 
-  def AddComment(self, message):
+  def AddComment(self, message, publish=None):
     return self.RpcServer().add_comment(self.GetIssue(), message)
 
-  def GetCommentsSummary(self):
+  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')
@@ -1961,17 +2018,18 @@ class _RietveldChangelistImpl(_ChangelistCodereviewBase):
     return summary
 
   def GetStatus(self):
-    """Apply a rough heuristic to give a simple summary of an issue's review
+    """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
-      * 'lgtm'    - LGTM from at least one approved reviewer
-      * 'commit'  - in the commit queue
-      * 'closed'  - closed
+      * '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
@@ -1988,16 +2046,15 @@ class _RietveldChangelistImpl(_ChangelistCodereviewBase):
       # Issue is in the commit queue.
       return 'commit'
 
-    try:
-      reviewers = self.GetApprovingReviewers()
-    except urllib2.HTTPError:
-      return 'error'
+    messages = props.get('messages') or []
+    if not messages:
+      # No message was sent.
+      return 'unsent'
 
-    if reviewers:
-      # Was LGTM'ed.
+    if get_approving_reviewers(props):
       return 'lgtm'
-
-    messages = props.get('messages') or []
+    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:
@@ -2011,9 +2068,6 @@ class _RietveldChangelistImpl(_ChangelistCodereviewBase):
         # This is probably a CQ messages warranting user attention.
         break
 
-    if not messages:
-      # No message was sent.
-      return 'unsent'
     if messages[-1]['sender'] != props.get('owner_email'):
       # Non-LGTM reply from non-owner and not CQ bot.
       return 'reply'
@@ -2065,7 +2119,7 @@ class _RietveldChangelistImpl(_ChangelistCodereviewBase):
   def CodereviewServerConfigKey(cls):
     return 'rietveldserver'
 
-  def GetRieveldObjForPresubmit(self):
+  def GetRietveldObjForPresubmit(self):
     return self.RpcServer()
 
   def SetCQState(self, new_state):
@@ -2082,7 +2136,7 @@ class _RietveldChangelistImpl(_ChangelistCodereviewBase):
       self.SetFlags({'commit': '1', 'cq_dry_run': '1'})
 
   def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
-                              directory):
+                              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.
@@ -2125,23 +2179,26 @@ class _RietveldChangelistImpl(_ChangelistCodereviewBase):
       return _ParsedIssueNumberArgument(
           issue=int(match.group(1)),
           patchset=int(match2.group(1)),
-          hostname=parsed_url.netloc)
+          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)
+          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)
+          hostname=parsed_url.netloc,
+          codereview='rietveld')
     return None
 
-  def CMDUploadChange(self, options, args, change):
+  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()])
@@ -2172,10 +2229,9 @@ class _RietveldChangelistImpl(_ChangelistCodereviewBase):
         if options.title:
           message = options.title + '\n\n' + message
       change_desc = ChangeDescription(message)
-      if options.reviewers or options.tbr_owners:
-        change_desc.update_reviewers(options.reviewers,
-                                     options.tbr_owners,
-                                     change)
+      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)
 
@@ -2261,6 +2317,11 @@ class _RietveldChangelistImpl(_ChangelistCodereviewBase):
     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
@@ -2307,7 +2368,7 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
       # This happens for internal stuff http://crbug.com/614312.
       parsed = urlparse.urlparse(self.GetRemoteUrl())
       if parsed.scheme == 'sso':
-        print('WARNING: using non https URLs for remote is likely broken\n'
+        print('WARNING: using non-https URLs for remote is likely broken\n'
               '  Your current remote is: %s'  % self.GetRemoteUrl())
         self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
         self._gerrit_server = 'https://%s' % self._gerrit_host
@@ -2366,22 +2427,25 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
     if gerrit_auth and git_auth:
       if gerrit_auth == git_auth:
         return
+      all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
       print((
-          'WARNING: you have different credentials for Gerrit and git hosts.\n'
-          '         Check your %s or %s file for credentials of hosts:\n'
+          'WARNING: You have different credentials for Gerrit and git hosts:\n'
           '           %s\n'
           '           %s\n'
-          '         %s') %
-          (cookie_auth.get_gitcookies_path(), cookie_auth.get_netrc_path(),
-           git_host, self._gerrit_host,
+          '        Consider running the following command:\n'
+          '          git cl creds-check\n'
+          '        %s\n'
+          '        %s') %
+          (git_host, self._gerrit_host,
+           ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
            cookie_auth.get_new_password_message(git_host)))
       if not force:
         confirm_or_exit('If you know what you are doing', action='continue')
       return
     else:
       missing = (
-          [] if gerrit_auth else [self._gerrit_host] +
-          [] if git_auth else [git_host])
+          ([] if gerrit_auth else [self._gerrit_host]) +
+          ([] if git_auth else [git_host]))
       DieWithError('Credentials for the following hosts are required:\n'
                    '  %s\n'
                    'These are read from %s (or legacy %s)\n'
@@ -2414,13 +2478,13 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
       return
     logging.debug('change %s owner is %s, cookies user is %s',
                   self.GetIssue(), self.GetIssueOwner(), cookies_user)
-    # Maybe user has linked accounts or smth like that,
+    # Maybe user has linked accounts or something like that,
     # so ask what Gerrit thinks of this user.
     details = gerrit_util.GetAccountDetails(self._GetGerritHost(), 'self')
     if details['email'] == self.GetIssueOwner():
       return
     if not force:
-      print('WARNING: change %s is owned by %s, but you authenticate to Gerrit '
+      print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
             'as %s.\n'
             'Uploading may fail due to lack of permissions.' %
             (self.GetIssue(), self.GetIssueOwner(), details['email']))
@@ -2431,7 +2495,7 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
     """Which branch-specific properties to erase when unsetting issue."""
     return ['gerritsquashhash']
 
-  def GetRieveldObjForPresubmit(self):
+  def GetRietveldObjForPresubmit(self):
     class ThisIsNotRietveldIssue(object):
       def __nonzero__(self):
         # This is a hack to make presubmit_support think that rietveld is not
@@ -2443,7 +2507,7 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
         print(
             'You aren\'t using Rietveld at the moment, but Gerrit.\n'
             'Using Rietveld in your PRESUBMIT scripts won\'t work.\n'
-            'Please, either change your PRESUBIT to not use rietveld_obj.%s,\n'
+            'Please, either change your PRESUBMIT to not use rietveld_obj.%s,\n'
             'or use Rietveld for codereview.\n'
             'See also http://crbug.com/579160.' % attr)
         raise NotImplementedError()
@@ -2457,62 +2521,54 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
     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'   - no reviewers added
-      * 'waiting'  - waiting for review
-      * 'reply'    - waiting for owner to reply to review
-      * 'not lgtm' - Code-Review disapproval from at least one valid reviewer
-      * 'lgtm'     - Code-Review approval from at least one valid reviewer
-      * 'commit'   - in the commit queue
-      * 'closed'   - abandoned
+      * 'error'   - error from review tool (including deleted issues)
+      * 'unsent'  - no reviewers added
+      * 'waiting' - waiting for review
+      * 'reply'   - waiting for uploader to reply to review
+      * 'lgtm'    - Code-Review label has been set
+      * 'commit'  - in the commit queue
+      * 'closed'  - successfully submitted or abandoned
     """
     if not self.GetIssue():
       return None
 
     try:
-      data = self._GetChangeDetail(['DETAILED_LABELS', 'CURRENT_REVISION'])
+      data = self._GetChangeDetail([
+          'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
     except (httplib.HTTPException, GerritChangeNotExists):
       return 'error'
 
     if data['status'] in ('ABANDONED', 'MERGED'):
       return 'closed'
 
-    cq_label = data['labels'].get('Commit-Queue', {})
-    if cq_label:
-      votes = cq_label.get('all', [])
-      highest_vote = 0
-      for v in votes:
-        highest_vote = max(highest_vote, v.get('value', 0))
-      vote_value = str(highest_vote)
-      if vote_value != '0':
-        # Add a '+' if the value is not 0 to match the values in the label.
-        # The cq_label does not have negatives.
-        vote_value = '+' + vote_value
-      vote_text = cq_label.get('values', {}).get(vote_value, '')
-      if vote_text.lower() == 'commit':
-        return 'commit'
-
-    lgtm_label = data['labels'].get('Code-Review', {})
-    if lgtm_label:
-      if 'rejected' in lgtm_label:
-        return 'not lgtm'
-      if 'approved' in lgtm_label:
-        return 'lgtm'
+    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.
+      return 'commit'
+
+    if data['labels'].get('Code-Review', {}).get('approved'):
+      return 'lgtm'
 
     if not data.get('reviewers', {}).get('REVIEWER', []):
       return 'unsent'
 
-    messages = data.get('messages', [])
     owner = data['owner'].get('_account_id')
-    while messages:
-      last_message_author = messages.pop().get('author', {})
+    messages = sorted(data.get('messages', []), key=lambda m: m.get('updated'))
+    last_message_author = messages.pop().get('author', {})
+    while last_message_author:
       if last_message_author.get('email') == COMMIT_BOT_EMAIL:
         # Ignore replies from CQ.
+        last_message_author = messages.pop().get('author', {})
         continue
-      if last_message_author.get('_account_id') != owner:
+      if last_message_author.get('_account_id') == owner:
+        # Most recent message was by owner.
+        return 'waiting'
+      else:
         # Some reply from non-owner.
         return 'reply'
-    return 'waiting'
+
+    # Somehow there are no messages even though there are reviewers.
+    return 'unsent'
 
   def GetMostRecentPatchset(self):
     data = self._GetChangeDetail(['CURRENT_REVISION'])
@@ -2537,22 +2593,71 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
     gerrit_util.SetCommitMessage(self._GetGerritHost(), self.GetIssue(),
                                  description, notify='NONE')
 
-  def AddComment(self, message):
+  def AddComment(self, message, publish=None):
     gerrit_util.SetReview(self._GetGerritHost(), self.GetIssue(),
-                          msg=message)
+                          msg=message, ready=publish)
 
-  def GetCommentsSummary(self):
+  def GetCommentsSummary(self, readable=True):
     # DETAILED_ACCOUNTS is to get emails in accounts.
-    data = self._GetChangeDetail(options=['MESSAGES', 'DETAILED_ACCOUNTS'])
+    messages = self._GetChangeDetail(
+        options=['MESSAGES', 'DETAILED_ACCOUNTS']).get('messages', [])
+    file_comments = gerrit_util.GetChangeComments(
+        self._GetGerritHost(), self.GetIssue())
+
+    # Build dictionary of file comments for easy access and sorting later.
+    # {author+date: {path: {patchset: {line: url+message}}}}
+    comments = collections.defaultdict(
+        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'):
+          continue
+        key = (comment['author']['email'], comment['updated'])
+        if comment.get('side', 'REVISION') == 'PARENT':
+          patchset = 'Base'
+        else:
+          patchset = 'PS%d' % comment['patch_set']
+        line = comment.get('line', 0)
+        url = ('https://%s/c/%s/%s/%s#%s%s' %
+            (self._GetGerritHost(), self.GetIssue(), comment['patch_set'], path,
+             'b' if comment.get('side') == 'PARENT' else '',
+             str(line) if line else ''))
+        comments[key][path][patchset][line] = (url, comment['message'])
+
     summary = []
-    for msg in data.get('messages', []):
+    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=msg['message'],
+        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.
@@ -2565,13 +2670,6 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
   def CloseIssue(self):
     gerrit_util.AbandonChange(self._GetGerritHost(), self.GetIssue(), msg='')
 
-  def GetApprovingReviewers(self):
-    """Returns a list of reviewers approving the change.
-
-    Note: not necessarily committers.
-    """
-    raise NotImplementedError()
-
   def SubmitIssue(self, wait_for_merge=True):
     gerrit_util.SubmitChange(self._GetGerritHost(), self.GetIssue(),
                              wait_for_merge=wait_for_merge)
@@ -2612,8 +2710,8 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
           return data
 
     try:
-      data = gerrit_util.GetChangeDetail(self._GetGerritHost(), str(issue),
-                                         options, ignore_404=False)
+      data = gerrit_util.GetChangeDetail(
+          self._GetGerritHost(), str(issue), options)
     except gerrit_util.GerritError as e:
       if e.http_status == 404:
         raise GerritChangeNotExists(issue, self.GetCodereviewServer())
@@ -2625,9 +2723,12 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
   def _GetChangeCommit(self, issue=None):
     issue = issue or self.GetIssue()
     assert issue, 'issue is required to query Gerrit'
-    data = gerrit_util.GetChangeCommit(self._GetGerritHost(), str(issue))
-    if not data:
-      raise GerritChangeNotExists(issue, self.GetCodereviewServer())
+    try:
+      data = gerrit_util.GetChangeCommit(self._GetGerritHost(), str(issue))
+    except gerrit_util.GerritError as e:
+      if e.http_status == 404:
+        raise GerritChangeNotExists(issue, self.GetCodereviewServer())
+      raise
     return data
 
   def CMDLand(self, force, bypass_hooks, verbose):
@@ -2645,19 +2746,19 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
     last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
     # Note: git diff outputs nothing if there is no diff.
     if not last_upload or RunGit(['diff', last_upload]).strip():
-      print('WARNING: some changes from local branch haven\'t been uploaded')
+      print('WARNING: Some changes from local branch haven\'t been uploaded.')
     else:
       if detail['current_revision'] == last_upload:
         differs = False
       else:
-        print('WARNING: local branch contents differ from latest uploaded '
-              'patchset')
+        print('WARNING: Local branch contents differ from latest uploaded '
+              'patchset.')
     if differs:
       if not force:
         confirm_or_exit(
             'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
             action='submit')
-      print('WARNING: bypassing hooks and submitting latest uploaded patchset')
+      print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
     elif not bypass_hooks:
       hook_results = self.RunHook(
           committing=True,
@@ -2672,12 +2773,12 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
     links = self._GetChangeCommit().get('web_links', [])
     for link in links:
       if link.get('name') == 'gitiles' and link.get('url'):
-        print('Landed as %s' % link.get('url'))
+        print('Landed as: %s' % link.get('url'))
         break
     return 0
 
   def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
-                              directory):
+                              directory, force):
     assert not reject
     assert not nocommit
     assert not directory
@@ -2709,11 +2810,25 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
 
     fetch_info = revision_info['fetch']['http']
     RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
-    self.SetIssue(self.GetIssue())
+
+    if force:
+      RunGit(['reset', '--hard', 'FETCH_HEAD'])
+      print('Checked out commit for change %i patchset %i locally' %
+            (parsed_issue_arg.issue, patchset))
+    else:
+      RunGit(['cherry-pick', 'FETCH_HEAD'])
+      print('Committed patch for change %i patchset %i locally.' %
+            (parsed_issue_arg.issue, patchset))
+      print('Note: this created a local commit which does not have '
+            'the same hash as the one uploaded for review. This will make '
+            'uploading changes based on top of this branch difficult.\n'
+            'If you want to do that, use "git cl patch --force" instead.')
+
+    self.SetIssue(parsed_issue_arg.issue)
     self.SetPatchset(patchset)
-    RunGit(['cherry-pick', 'FETCH_HEAD'])
-    print('Committed patch for change %i patchset %i locally' %
-          (self.GetIssue(), self.GetPatchset()))
+    fetched_hash = RunGit(['rev-parse', 'FETCH_HEAD']).strip()
+    self._GitSetBranchConfigValue('last-upload-hash', fetched_hash)
+    self._GitSetBranchConfigValue('gerritsquashhash', fetched_hash)
     return 0
 
   @staticmethod
@@ -2733,7 +2848,8 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
       return _ParsedIssueNumberArgument(
           issue=int(match.group(2)),
           patchset=int(match.group(4)) if match.group(4) else None,
-          hostname=parsed_url.netloc)
+          hostname=parsed_url.netloc,
+          codereview='gerrit')
     return None
 
   def _GerritCommitMsgHookCheck(self, offer_removal):
@@ -2745,7 +2861,7 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
     data = gclient_utils.FileRead(hook)
     if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
       return
-    print('Warning: you have Gerrit commit-msg hook installed.\n'
+    print('WARNING: You have Gerrit commit-msg hook installed.\n'
           'It is not necessary for uploading with git cl in squash mode, '
           'and may interfere with it in subtle ways.\n'
           'We recommend you remove the commit-msg hook.')
@@ -2756,7 +2872,7 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
       else:
         print('OK, will keep Gerrit commit-msg hook in place.')
 
-  def CMDUploadChange(self, options, args, change):
+  def CMDUploadChange(self, options, git_diff_args, custom_cl_base, change):
     """Upload the current branch to Gerrit."""
     if options.squash and options.no_squash:
       DieWithError('Can only use one of --squash or --no-squash')
@@ -2767,10 +2883,6 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
     elif options.no_squash:
       options.squash = False
 
-    # We assume the remote called "origin" is the one we want.
-    # It is probably not worthwhile to support different workflows.
-    gerrit_remote = 'origin'
-
     remote, remote_branch = self.GetRemoteBranch()
     branch = GetTargetRef(remote, remote_branch, options.target_branch)
 
@@ -2788,11 +2900,20 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
               'failed to fetch description from current Gerrit change %d\n'
               '%s' % (self.GetIssue(), self.GetIssueURL()))
         if not title:
-          default_title = RunGit(['show', '-s', '--format=%s', 'HEAD']).strip()
-          title = ask_for_data(
-              'Title for patchset [%s]: ' % default_title) or default_title
-          if title == default_title:
-            automatic_title = True
+          if options.message:
+            # When uploading a subsequent patchset, -m|--message is taken
+            # as the patchset title if --title was not provided.
+            title = options.message.strip()
+          else:
+            default_title = RunGit(
+                ['show', '-s', '--format=%s', 'HEAD']).strip()
+            if options.force:
+              title = default_title
+            else:
+              title = ask_for_data(
+                  'Title for patchset [%s]: ' % default_title) or default_title
+            if title == default_title:
+              automatic_title = True
         change_id = self._GetChangeDetail()['change_id']
         while True:
           footer_change_ids = git_footers.get_footer_change_id(message)
@@ -2800,7 +2921,7 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
             break
           if not footer_change_ids:
             message = git_footers.add_footer_change_id(message, change_id)
-            print('WARNING: appended missing Change-Id to change description')
+            print('WARNING: appended missing Change-Id to change description.')
             continue
           # There is already a valid footer but with different or several ids.
           # Doing this automatically is non-trivial as we don't want to lose
@@ -2832,10 +2953,11 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
         if options.message:
           message = options.message
         else:
-          message = CreateDescriptionFromLog(args)
+          message = CreateDescriptionFromLog(git_diff_args)
           if options.title:
             message = options.title + '\n\n' + message
         change_desc = ChangeDescription(message)
+
         if not options.force:
           change_desc.prompt(bug=options.bug)
         # On first upload, patchset title is always this string, while
@@ -2844,57 +2966,46 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
         automatic_title = True
         if not change_desc.description:
           DieWithError("Description is empty. Aborting...")
-        message = change_desc.description
-        change_ids = git_footers.get_footer_change_id(message)
+        change_ids = git_footers.get_footer_change_id(change_desc.description)
         if len(change_ids) > 1:
           DieWithError('too many Change-Id footers, at most 1 allowed.')
         if not change_ids:
           # Generate the Change-Id automatically.
-          message = git_footers.add_footer_change_id(
-              message, GenerateGerritChangeId(message))
-          change_desc.set_description(message)
-          change_ids = git_footers.get_footer_change_id(message)
+          change_desc.set_description(git_footers.add_footer_change_id(
+              change_desc.description,
+              GenerateGerritChangeId(change_desc.description)))
+          change_ids = git_footers.get_footer_change_id(change_desc.description)
           assert len(change_ids) == 1
         change_id = change_ids[0]
 
-      remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
-      if remote is '.':
-        # If our upstream branch is local, we base our squashed commit on its
-        # squashed version.
-        upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
-        # Check the squashed hash of the parent.
-        parent = RunGit(['config',
-                         'branch.%s.gerritsquashhash' % upstream_branch_name],
-                        error_ok=True).strip()
-        # Verify that the upstream branch has been uploaded too, otherwise
-        # Gerrit will create additional CLs when uploading.
-        if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
-                          RunGitSilent(['rev-parse', parent + ':'])):
-          DieWithError(
-              '\nUpload upstream branch %s first.\n'
-              'It is likely that this branch has been rebased since its last '
-              'upload, so you just need to upload it again.\n'
-              '(If you uploaded it with --no-squash, then branch dependencies '
-              'are not supported, and you should reupload with --squash.)'
-              % upstream_branch_name, change_desc)
-      else:
-        parent = self.GetCommonAncestorWithUpstream()
+      if options.reviewers or options.tbrs or options.add_owners_to:
+        change_desc.update_reviewers(options.reviewers, options.tbrs,
+                                     options.add_owners_to, change)
 
+      remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
+      parent = self._ComputeParent(remote, upstream_branch, custom_cl_base,
+                                   options.force, change_desc)
       tree = RunGit(['rev-parse', 'HEAD:']).strip()
       ref_to_push = RunGit(['commit-tree', tree, '-p', parent,
-                            '-m', message]).strip()
+                            '-m', change_desc.description]).strip()
     else:
       change_desc = ChangeDescription(
-          options.message or CreateDescriptionFromLog(args))
+          options.message or CreateDescriptionFromLog(git_diff_args))
       if not change_desc.description:
         DieWithError("Description is empty. Aborting...")
 
       if not git_footers.get_footer_change_id(change_desc.description):
         DownloadGerritHook(False)
-        change_desc.set_description(self._AddChangeIdToCommitMessage(options,
-                                                                     args))
+        change_desc.set_description(
+            self._AddChangeIdToCommitMessage(options, git_diff_args))
+      if options.reviewers or options.tbrs or options.add_owners_to:
+        change_desc.update_reviewers(options.reviewers, options.tbrs,
+                                     options.add_owners_to, change)
       ref_to_push = 'HEAD'
-      parent = '%s/%s' % (gerrit_remote, branch)
+      # For no-squash mode, we assume the remote called "origin" is the one we
+      # want. It is not worthwhile to support different workflows for
+      # no-squash mode.
+      parent = 'origin/%s' % branch
       change_id = git_footers.get_footer_change_id(change_desc.description)[0]
 
     assert change_desc
@@ -2908,16 +3019,28 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
             'single commit.')
       confirm_or_exit(action='upload')
 
-    if options.reviewers or options.tbr_owners:
-      change_desc.update_reviewers(options.reviewers, options.tbr_owners,
-                                   change)
+    if options.reviewers or options.tbrs or options.add_owners_to:
+      change_desc.update_reviewers(options.reviewers, options.tbrs,
+                                   options.add_owners_to, change)
 
     # Extra options that can be specified at push time. Doc:
     # https://gerrit-review.googlesource.com/Documentation/user-upload.html
     refspec_opts = []
-    if change_desc.get_reviewers(tbr_only=True):
-      print('Adding self-LGTM (Code-Review +1) because of TBRs')
-      refspec_opts.append('l=Code-Review+1')
+
+    # By default, new changes are started in WIP mode, and subsequent patchsets
+    # don't send email. At any time, passing --send-mail will mark the change
+    # ready and send email for that particular patch.
+    if options.send_mail:
+      refspec_opts.append('ready')
+      refspec_opts.append('notify=ALL')
+    else:
+      if not self.GetIssue():
+        refspec_opts.append('wip')
+      else:
+        refspec_opts.append('notify=NONE')
+
+    # TODO(tandrii): options.message should be posted as a comment
+    # if --send-mail is set on non-initial upload as Rietveld used to do it.
 
     if title:
       if not re.match(r'^[\w ]+$', title):
@@ -2931,24 +3054,8 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
       # reverse on its side.
       refspec_opts.append('m=' + title.replace(' ', '_'))
 
-    if options.send_mail:
-      if not change_desc.get_reviewers():
-        DieWithError('Must specify reviewers to send email.', change_desc)
-      refspec_opts.append('notify=ALL')
-    else:
-      refspec_opts.append('notify=NONE')
-
-    reviewers = change_desc.get_reviewers()
-    if reviewers:
-      # TODO(tandrii): remove this horrible hack once (Poly)Gerrit fixes their
-      # side for real (b/34702620).
-      def clean_invisible_chars(email):
-        return email.decode('unicode_escape').encode('ascii', 'ignore')
-      refspec_opts.extend('r=' + clean_invisible_chars(email).strip()
-                          for email in reviewers)
-
     if options.private:
-      refspec_opts.append('draft')
+      refspec_opts.append('private')
 
     if options.topic:
       # Documentation on Gerrit topics is here:
@@ -2971,7 +3078,11 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
           filter_fn=lambda _: sys.stdout.flush())
     except subprocess2.CalledProcessError:
       DieWithError('Failed to create a change. Please examine output above '
-                   'for the reason of the failure. ', change_desc)
+                   '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)
 
     if options.squash:
       regex = re.compile(r'remote:\s+https?://[\w\-\.\/]*/(\d+)\s.*')
@@ -2985,19 +3096,91 @@ 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).
-    cc = self.GetCCList().split(',')
+    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())
-    if cc:
-      gerrit_util.AddReviewers(
-          self._GetGerritHost(), self.GetIssue(), cc,
-          is_reviewer=False, notify=bool(options.send_mail))
+
+    gerrit_util.AddReviewers(
+        self._GetGerritHost(), self.GetIssue(), reviewers, cc,
+        notify=bool(options.send_mail))
+
+    if change_desc.get_reviewers(tbr_only=True):
+      print('Adding self-LGTM (Code-Review +1) because of TBRs.')
+      gerrit_util.SetReview(
+          self._GetGerritHost(), self.GetIssue(),
+          labels={'Code-Review': 1}, notify=bool(options.send_mail))
+
     return 0
 
+  def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
+                     change_desc):
+    """Computes parent of the generated commit to be uploaded to Gerrit.
+
+    Returns revision or a ref name.
+    """
+    if custom_cl_base:
+      # Try to avoid creating additional unintended CLs when uploading, unless
+      # user wants to take this risk.
+      local_ref_of_target_remote = self.GetRemoteBranch()[1]
+      code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
+                                local_ref_of_target_remote])
+      if code == 1:
+        print('\nWARNING: Manually specified base of this CL `%s` '
+              'doesn\'t seem to belong to target remote branch `%s`.\n\n'
+              'If you proceed with upload, more than 1 CL may be created by '
+              'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
+              'If you are certain that specified base `%s` has already been '
+              'uploaded to Gerrit as another CL, you may proceed.\n' %
+              (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
+        if not force:
+          confirm_or_exit(
+              'Do you take responsibility for cleaning up potential mess '
+              'resulting from proceeding with upload?',
+              action='upload')
+      return custom_cl_base
+
+    if remote != '.':
+      return self.GetCommonAncestorWithUpstream()
+
+    # If our upstream branch is local, we base our squashed commit on its
+    # squashed version.
+    upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
+
+    if upstream_branch_name == 'master':
+      return self.GetCommonAncestorWithUpstream()
+
+    # Check the squashed hash of the parent.
+    # TODO(tandrii): consider checking parent change in Gerrit and using its
+    # hash if tree hash of latest parent revision (patchset) in Gerrit matches
+    # the tree hash of the parent branch. The upside is less likely bogus
+    # requests to reupload parent change just because it's uploadhash is
+    # missing, yet the downside likely exists, too (albeit unknown to me yet).
+    parent = RunGit(['config',
+                     'branch.%s.gerritsquashhash' % upstream_branch_name],
+                    error_ok=True).strip()
+    # Verify that the upstream branch has been uploaded too, otherwise
+    # Gerrit will create additional CLs when uploading.
+    if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
+                      RunGitSilent(['rev-parse', parent + ':'])):
+      DieWithError(
+          '\nUpload upstream branch %s first.\n'
+          'It is likely that this branch has been rebased since its last '
+          'upload, so you just need to upload it again.\n'
+          '(If you uploaded it with --no-squash, then branch dependencies '
+          'are not supported, and you should reupload with --squash.)'
+          % upstream_branch_name,
+          change_desc)
+    return parent
+
   def _AddChangeIdToCommitMessage(self, options, args):
     """Re-commits using the current message, assumes the commit hook is in
     place.
@@ -3022,7 +3205,7 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
     kwargs = {'labels': {'Commit-Queue': vote_map[new_state]}}
     if new_state == _CQState.DRY_RUN:
       # Don't spam everybody reviewer/owner.
-      kwargs['notify'] = 'NONE'
+      kwargs['notify'] = False
     gerrit_util.SetReview(self._GetGerritHost(), self.GetIssue(), **kwargs)
 
   def CannotTriggerTryJobReason(self):
@@ -3034,8 +3217,8 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
     if data['status'] in ('ABANDONED', 'MERGED'):
       return 'CL %s is closed' % self.GetIssue()
 
-  def GetTryjobProperties(self, patchset=None):
-    """Returns dictionary of properties to launch tryjob."""
+  def GetTryJobProperties(self, patchset=None):
+    """Returns dictionary of properties to launch try job."""
     data = self._GetChangeDetail(['ALL_REVISIONS'])
     patchset = int(patchset or self.GetPatchset())
     assert patchset
@@ -3165,14 +3348,34 @@ class ChangeDescription(object):
       lines.pop(-1)
     self._description_lines = lines
 
-  def update_reviewers(self, reviewers, add_owners_tbr=False, change=None):
-    """Rewrites the R=/TBR= line(s) as a single line each."""
+  def update_reviewers(self, reviewers, tbrs, add_owners_to=None, change=None):
+    """Rewrites the R=/TBR= line(s) as a single line each.
+
+    Args:
+      reviewers (list(str)) - list of additional emails to use for reviewers.
+      tbrs (list(str)) - list of additional emails to use for TBRs.
+      add_owners_to (None|'R'|'TBR') - Pass to do an OWNERS lookup for files in
+        the change that are missing OWNER coverage. If this is not None, you
+        must also pass a value for `change`.
+      change (Change) - The Change that should be used for OWNERS lookups.
+    """
     assert isinstance(reviewers, list), reviewers
-    if not reviewers and not add_owners_tbr:
+    assert isinstance(tbrs, list), tbrs
+
+    assert add_owners_to in (None, 'TBR', 'R'), add_owners_to
+    assert not add_owners_to or change, add_owners_to
+
+    if not reviewers and not tbrs and not add_owners_to:
       return
-    reviewers = reviewers[:]
 
-    # Get the set of R= and TBR= lines and remove them from the desciption.
+    reviewers = set(reviewers)
+    tbrs = set(tbrs)
+    LOOKUP = {
+      'TBR': tbrs,
+      'R': reviewers,
+    }
+
+    # Get the set of R= and TBR= lines and remove them from the description.
     regexp = re.compile(self.R_LINE)
     matches = [regexp.match(line) for line in self._description_lines]
     new_desc = [l for i, l in enumerate(self._description_lines)
@@ -3180,29 +3383,27 @@ class ChangeDescription(object):
     self.set_description(new_desc)
 
     # Construct new unified R= and TBR= lines.
-    r_names = []
-    tbr_names = []
+
+    # First, update tbrs/reviewers with names from the R=/TBR= lines (if any).
     for match in matches:
       if not match:
         continue
-      people = cleanup_list([match.group(2).strip()])
-      if match.group(1) == 'TBR':
-        tbr_names.extend(people)
-      else:
-        r_names.extend(people)
-    for name in r_names:
-      if name not in reviewers:
-        reviewers.append(name)
-    if add_owners_tbr:
+      LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()]))
+
+    # Next, maybe fill in OWNERS coverage gaps to either tbrs/reviewers.
+    if add_owners_to:
       owners_db = owners.Database(change.RepositoryRoot(),
-        fopen=file, os_path=os.path)
-      all_reviewers = set(tbr_names + reviewers)
+                                  fopen=file, os_path=os.path)
       missing_files = owners_db.files_not_covered_by(change.LocalPaths(),
-                                                     all_reviewers)
-      tbr_names.extend(owners_db.reviewers_for(missing_files,
-                                               change.author_email))
-    new_r_line = 'R=' + ', '.join(reviewers) if reviewers else None
-    new_tbr_line = 'TBR=' + ', '.join(tbr_names) if tbr_names else None
+                                                     (tbrs | reviewers))
+      LOOKUP[add_owners_to].update(
+        owners_db.reviewers_for(missing_files, change.author_email))
+
+    # If any folks ended up in both groups, remove them from tbrs.
+    tbrs -= reviewers
+
+    new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None
+    new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None
 
     # Put the new lines in the description where the old first R= line was.
     line_loc = next((i for i, match in enumerate(matches) if match), -1)
@@ -3322,13 +3523,14 @@ class ChangeDescription(object):
         re.match(self.CHERRY_PICK_LINE, self._description_lines[-1])):
       cp_line = self._description_lines.pop()
 
-    top_lines, _, parsed_footers = git_footers.split_footers(self.description)
+    top_lines, footer_lines, _ = git_footers.split_footers(self.description)
 
     # Original-ify all Cr- footers, to avoid re-lands, cherry-picks, or just
     # user interference with actual footers we'd insert below.
-    for i, (k, v) in enumerate(parsed_footers):
-      if k.startswith('Cr-'):
-        parsed_footers[i] = (k.replace('Cr-', 'Cr-Original-'), v)
+    for i, line in enumerate(footer_lines):
+      k, v = git_footers.parse_footer(line) or (None, None)
+      if k and k.startswith('Cr-'):
+        footer_lines[i] = '%s: %s' % ('Cr-Original-' + k[len('Cr-'):], v)
 
     # Add Position and Lineage footers based on the parent.
     lineage = list(reversed(parent_footer_map.get('Cr-Branched-From', [])))
@@ -3340,30 +3542,32 @@ class ChangeDescription(object):
       lineage.insert(0, '%s-%s@{#%d}' % (parent_hash, parent_position[0],
                                          int(parent_position[1])))
 
-    parsed_footers.append(('Cr-Commit-Position',
-                           '%s@{#%d}' % (dest_ref, number)))
-    parsed_footers.extend(('Cr-Branched-From', v) for v in lineage)
+    footer_lines.append('Cr-Commit-Position: %s@{#%d}' % (dest_ref, number))
+    footer_lines.extend('Cr-Branched-From: %s' % v for v in lineage)
 
     self._description_lines = top_lines
     if cp_line:
       self._description_lines.append(cp_line)
     if self._description_lines[-1] != '':
       self._description_lines.append('')  # Ensure footer separator.
-    self._description_lines.extend('%s: %s' % kv for kv in parsed_footers)
+    self._description_lines.extend(footer_lines)
 
 
-def get_approving_reviewers(props):
+def get_approving_reviewers(props, disapproval=False):
   """Retrieves the reviewers that approved a CL from the issue properties with
   messages.
 
   Note that the list may contain reviewers that are not committer, thus are not
   considered by the CQ.
+
+  If disapproval is True, instead returns reviewers who 'not lgtm'd the CL.
   """
+  approval_type = 'disapproval' if disapproval else 'approval'
   return sorted(
       set(
         message['sender']
         for message in props['messages']
-        if message['approval'] and message['sender'] in props['reviewers']
+        if message[approval_type] and message['sender'] in props['reviewers']
       )
   )
 
@@ -3520,7 +3724,7 @@ def GetRietveldCodereviewSettingsInteractively():
 
 
 class _GitCookiesChecker(object):
-  """Provides facilties for validating and suggesting fixes to .gitcookies."""
+  """Provides facilities for validating and suggesting fixes to .gitcookies."""
 
   _GOOGLESOURCE = 'googlesource.com'
 
@@ -3535,6 +3739,7 @@ class _GitCookiesChecker(object):
     default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
     configured_path = RunGitSilent(
         ['config', '--global', 'http.cookiefile']).strip()
+    configured_path = os.path.expanduser(configured_path)
     if configured_path:
       self._ensure_default_gitcookies_path(configured_path, default)
     else:
@@ -3548,7 +3753,7 @@ class _GitCookiesChecker(object):
             configured_path)
       return
 
-    print('WARNING: you have configured custom path to .gitcookies: %s\n'
+    print('WARNING: You have configured custom path to .gitcookies: %s\n'
           'Gerrit and other depot_tools expect .gitcookies at %s\n' %
           (configured_path, default_path))
 
@@ -3646,6 +3851,12 @@ class _GitCookiesChecker(object):
     prefix = git_host.split('.', 1)[0]
     return prefix + '-review.' + self._GOOGLESOURCE
 
+  def _get_counterpart_host(self, host):
+    assert host.endswith(self._GOOGLESOURCE)
+    git = self._canonical_git_googlesource_host(host)
+    gerrit = self._canonical_gerrit_googlesource_host(git)
+    return git if gerrit == host else gerrit
+
   def has_generic_host(self):
     """Returns whether generic .googlesource.com has been configured.
 
@@ -3671,14 +3882,14 @@ class _GitCookiesChecker(object):
 
   def get_partially_configured_hosts(self):
     return set(
-        host for host, identities_pair in
-        self._get_git_gerrit_identity_pairs().iteritems()
-        if None in identities_pair and host != '.' + self._GOOGLESOURCE)
+        (host if i1 else self._canonical_gerrit_googlesource_host(host))
+        for host, (i1, i2) in self._get_git_gerrit_identity_pairs().iteritems()
+        if None in (i1, i2) and host != '.' + self._GOOGLESOURCE)
 
   def get_conflicting_hosts(self):
     return set(
-        host for host, (i1, i2) in
-        self._get_git_gerrit_identity_pairs().iteritems()
+        host
+        for host, (i1, i2) in self._get_git_gerrit_identity_pairs().iteritems()
         if None not in (i1, i2) and i1 != i2)
 
   def get_duplicated_hosts(self):
@@ -3705,61 +3916,83 @@ class _GitCookiesChecker(object):
     return hosts
 
   @staticmethod
-  def print_hosts(hosts, extra_column_func=None):
+  def _format_hosts(hosts, extra_column_func=None):
     hosts = sorted(hosts)
     assert hosts
     if extra_column_func is None:
       extras = [''] * len(hosts)
     else:
       extras = [extra_column_func(host) for host in hosts]
-    tmpl = '    %%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
+    tmpl = '%%-%ds    %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
+    lines = []
     for he in zip(hosts, extras):
-      print(tmpl % he)
-    print()
-
-  def find_and_report_problems(self):
-    """Returns True if there was at least one problem, else False."""
-    problems = [False]
-    def add_problem():
-      if not problems[0]:
-        print('\n\n.gitcookies problem report:\n')
-      problems[0] = True
+      lines.append(tmpl % he)
+    return lines
 
+  def _find_problems(self):
     if self.has_generic_host():
-      add_problem()
-      print('  .googlesource.com record detected\n'
-            '    Chrome Infrastructure team recommends to list full host names '
-            'explicitly.\n')
+      yield ('.googlesource.com wildcard record detected',
+             ['Chrome Infrastructure team recommends to list full host names '
+              'explicitly.'],
+             None)
 
     dups = self.get_duplicated_hosts()
     if dups:
-      add_problem()
-      print('  The following hosts were defined twice:\n')
-      self.print_hosts(dups)
+      yield ('The following hosts were defined twice',
+             self._format_hosts(dups),
+             None)
 
     partial = self.get_partially_configured_hosts()
     if partial:
-      add_problem()
-      print('  Credentials should come in pairs for Git and Gerrit hosts. '
-            'These hosts are missing:')
-      self.print_hosts(partial)
+      yield ('Credentials should come in pairs for Git and Gerrit hosts. '
+             'These hosts are missing',
+             self._format_hosts(partial, lambda host: 'but %s defined' %
+                self._get_counterpart_host(host)),
+             partial)
 
     conflicting = self.get_conflicting_hosts()
     if conflicting:
-      add_problem()
-      print('  The following Git hosts have differing credentials from their '
-            'Gerrit counterparts:\n')
-      self.print_hosts(conflicting, lambda host: '%s vs %s' %
-                       tuple(self._get_git_gerrit_identity_pairs()[host]))
+      yield ('The following Git hosts have differing credentials from their '
+             'Gerrit counterparts',
+             self._format_hosts(conflicting, lambda host: '%s vs %s' %
+                 tuple(self._get_git_gerrit_identity_pairs()[host])),
+             conflicting)
 
     wrong = self.get_hosts_with_wrong_identities()
     if wrong:
-      add_problem()
-      print('  These hosts likely use wrong identity:\n')
-      self.print_hosts(wrong, lambda host: '%s but %s recommended' %
-                       (self._get_git_gerrit_identity_pairs()[host][0],
-                        self._EXPECTED_HOST_IDENTITY_DOMAINS[host]))
-    return problems[0]
+      yield ('These hosts likely use wrong identity',
+             self._format_hosts(wrong, lambda host: '%s but %s recommended' %
+                (self._get_git_gerrit_identity_pairs()[host][0],
+                 self._EXPECTED_HOST_IDENTITY_DOMAINS[host])),
+             wrong)
+
+  def find_and_report_problems(self):
+    """Returns True if there was at least one problem, else False."""
+    found = False
+    bad_hosts = set()
+    for title, sublines, hosts in self._find_problems():
+      if not found:
+        found = True
+        print('\n\n.gitcookies problem report:\n')
+      bad_hosts.update(hosts or [])
+      print('  %s%s' % (title , (':' if sublines else '')))
+      if sublines:
+        print()
+        print('    %s' % '\n    '.join(sublines))
+      print()
+
+    if bad_hosts:
+      assert found
+      print('  You can manually remove corresponding lines in your %s file and '
+            'visit the following URLs with correct account to generate '
+            'correct credential lines:\n' %
+            gerrit_util.CookiesAuthenticator.get_gitcookies_path())
+      print('    %s' % '\n    '.join(sorted(set(
+          gerrit_util.CookiesAuthenticator().get_new_password_url(
+              self._canonical_git_googlesource_host(host))
+          for host in bad_hosts
+      ))))
+    return found
 
 
 def CMDcreds_check(parser, args):
@@ -3776,7 +4009,7 @@ def CMDcreds_check(parser, args):
   checker.print_current_creds(include_netrc=True)
 
   if not checker.find_and_report_problems():
-    print('\nNo problems detected in your .gitcookies')
+    print('\nNo problems detected in your .gitcookies file.')
     return 0
   return 1
 
@@ -3785,7 +4018,7 @@ def CMDcreds_check(parser, args):
 def CMDconfig(parser, args):
   """Edits configuration for this tree."""
 
-  print('WARNING: git cl config works for Rietveld only')
+  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',
@@ -3835,9 +4068,10 @@ def CMDbaseurl(parser, args):
 def color_for_status(status):
   """Maps a Changelist status to color, for CMDstatus and other tools."""
   return {
-    'unsent': Fore.RED,
+    'unsent': Fore.YELLOW,
     'waiting': Fore.BLUE,
     'reply': Fore.YELLOW,
+    'not lgtm': Fore.RED,
     'lgtm': Fore.GREEN,
     'commit': Fore.MAGENTA,
     'closed': Fore.CYAN,
@@ -3865,7 +4099,7 @@ def get_cl_statuses(changes, fine_grained, max_processes=None):
 
   if not fine_grained:
     # Fast path which doesn't involve querying codereview servers.
-    # Do not use GetApprovingReviewers(), since it requires an HTTP request.
+    # Do not use get_approving_reviewers(), since it requires an HTTP request.
     for cl in changes:
       yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
     return
@@ -4091,12 +4325,13 @@ def CMDstatus(parser, args):
   """Show status of changelists.
 
   Colors are used to tell the state of the CL unless --fast is used:
-    - Red      not sent for review or broken
     - Blue     waiting for review
-    - Yellow   waiting for you to reply to review
+    - Yellow   waiting for you to reply to review, or not yet sent
     - Green    LGTM'ed
+    - Red      'not LGTM'ed
     - Magenta  in the commit queue
     - Cyan     was committed, branch can be deleted
+    - White    error, or unknown status
 
   Also see 'git cl comments'.
   """
@@ -4201,7 +4436,7 @@ def colorize_CMDstatus_doc():
   def colorize_line(line):
     for color in colors:
       if color in line.upper():
-        # Extract whitespaces first and the leading '-'.
+        # Extract whitespace first and the leading '-'.
         indent = len(line) - len(line.lstrip(' ')) + 1
         return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
     return line
@@ -4211,8 +4446,11 @@ def colorize_CMDstatus_doc():
 
 
 def write_json(path, contents):
-  with open(path, 'w') as f:
-    json.dump(contents, f)
+  if path == '-':
+    json.dump(contents, sys.stdout)
+  else:
+    with open(path, 'w') as f:
+      json.dump(contents, f)
 
 
 @subcommand.usage('[issue_number]')
@@ -4225,7 +4463,8 @@ def CMDissue(parser, args):
                     help='Lookup the branch(es) for the specified issues. If '
                          'no issues are specified, all branches with mapped '
                          'issues will be listed.')
-  parser.add_option('--json', help='Path to JSON output file.')
+  parser.add_option('--json',
+                    help='Path to JSON output file, or "-" for stdout.')
   _add_codereview_select_options(parser)
   options, args = parser.parse_args(args)
   _process_codereview_select_options(parser, options)
@@ -4233,7 +4472,6 @@ def CMDissue(parser, args):
   if options.reverse:
     branches = RunGit(['for-each-ref', 'refs/heads',
                        '--format=%(refname:short)']).splitlines()
-
     # Reverse issue lookup.
     issue_branch_map = {}
     for branch in branches:
@@ -4250,21 +4488,24 @@ def CMDissue(parser, args):
           issue, ', '.join(issue_branch_map.get(int(issue)) or ('None',))))
     if options.json:
       write_json(options.json, result)
+    return 0
+
+  if len(args) > 0:
+    issue = ParseIssueNumberArgument(args[0], options.forced_codereview)
+    if not issue.valid:
+      DieWithError('Pass a url or number to set the issue, 0 to unset it, '
+                   'or no argument to list it.\n'
+                   'Maybe you want to run git cl status?')
+    cl = Changelist(codereview=issue.codereview)
+    cl.SetIssue(issue.issue)
   else:
     cl = Changelist(codereview=options.forced_codereview)
-    if len(args) > 0:
-      try:
-        issue = int(args[0])
-      except ValueError:
-        DieWithError('Pass a number to set the issue or none to list it.\n'
-                     'Maybe you want to run git cl status?')
-      cl.SetIssue(issue)
-    print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
-    if options.json:
-      write_json(options.json, {
-        'issue': cl.GetIssue(),
-        'issue_url': cl.GetIssueURL(),
-      })
+  print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
+  if options.json:
+    write_json(options.json, {
+      'issue': cl.GetIssue(),
+      'issue_url': cl.GetIssueURL(),
+    })
   return 0
 
 
@@ -4275,8 +4516,12 @@ def CMDcomments(parser, args):
   parser.add_option('-i', '--issue', dest='issue',
                     help='review issue id (defaults to current issue). '
                          'If given, requires --rietveld or --gerrit')
+  parser.add_option('-m', '--machine-readable', dest='readable',
+                    action='store_false', default=True,
+                    help='output comments in a format compatible with '
+                         'editor parsing')
   parser.add_option('-j', '--json-file',
-                    help='File to write JSON summary to')
+                    help='File to write JSON summary to, or "-" for stdout')
   auth.add_auth_options(parser)
   _add_codereview_select_options(parser)
   options, args = parser.parse_args(args)
@@ -4293,16 +4538,15 @@ def CMDcomments(parser, args):
       parser.error('--gerrit or --rietveld is required if --issue is specified')
 
   cl = Changelist(issue=issue,
-                  # TODO(tandrii): remove 'rietveld' default.
-                  codereview=options.forced_codereview or (
-                      'rietveld' if issue else None),
+                  codereview=options.forced_codereview,
                   auth_config=auth_config)
 
   if options.comment:
     cl.AddComment(options.comment)
     return 0
 
-  summary = sorted(cl.GetCommentsSummary(), key=lambda c: c.date)
+  summary = sorted(cl.GetCommentsSummary(readable=options.readable),
+                   key=lambda c: c.date)
   for comment in summary:
     if comment.disapproval:
       color = Fore.RED
@@ -4348,10 +4592,10 @@ def CMDdescription(parser, args):
 
   target_issue_arg = None
   if len(args) > 0:
-    target_issue_arg = ParseIssueNumberArgument(args[0])
+    target_issue_arg = ParseIssueNumberArgument(args[0],
+                                                options.forced_codereview)
     if not target_issue_arg.valid:
-      parser.print_help()
-      return 1
+      parser.error('invalid codereview url or CL id')
 
   auth_config = auth.extract_auth_config_from_options(options)
 
@@ -4359,14 +4603,23 @@ def CMDdescription(parser, args):
       'auth_config': auth_config,
       'codereview': options.forced_codereview,
   }
+  detected_codereview_from_url = False
   if target_issue_arg:
     kwargs['issue'] = target_issue_arg.issue
     kwargs['codereview_host'] = target_issue_arg.hostname
+    if target_issue_arg.codereview and not options.forced_codereview:
+      detected_codereview_from_url = True
+      kwargs['codereview'] = target_issue_arg.codereview
 
   cl = Changelist(**kwargs)
-
   if not cl.GetIssue():
+    assert not detected_codereview_from_url
     DieWithError('This branch has no associated changelist.')
+
+  if detected_codereview_from_url:
+    logging.info('canonical issue/change URL: %s (type: %s)\n',
+                 cl.GetIssueURL(), target_issue_arg.codereview)
+
   description = ChangeDescription(cl.GetDescription())
 
   if options.display:
@@ -4531,7 +4784,7 @@ def GetTargetRef(remote, remote_branch, target_branch):
     return None
 
   if target_branch:
-    # Cannonicalize branch references to the equivalent local full symbolic
+    # Canonicalize branch references to the equivalent local full symbolic
     # refs, which are then translated into the remote full symbolic refs
     # below.
     if '/' not in target_branch:
@@ -4611,6 +4864,9 @@ def CMDupload(parser, args):
   parser.add_option('-r', '--reviewers',
                     action='append', default=[],
                     help='reviewer email addresses')
+  parser.add_option('--tbrs',
+                    action='append', default=[],
+                    help='TBR email addresses')
   parser.add_option('--cc',
                     action='append', default=[],
                     help='cc email addresses')
@@ -4639,8 +4895,10 @@ def CMDupload(parser, args):
                     help='Topic to specify when uploading (Gerrit only)')
   parser.add_option('--email', default=None,
                     help='email address to use to connect to Rietveld')
-  parser.add_option('--tbr-owners', dest='tbr_owners', action='store_true',
-                    help='add a set of OWNERS to TBR')
+  parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const',
+                    const='TBR', help='add a set of OWNERS to TBR')
+  parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
+                    const='R', help='add a set of OWNERS to R')
   parser.add_option('-d', '--cq-dry-run', dest='cq_dry_run',
                     action='store_true',
                     help='Send the patchset to do a CQ dry run right after '
@@ -4661,6 +4919,7 @@ def CMDupload(parser, args):
     return 1
 
   options.reviewers = cleanup_list(options.reviewers)
+  options.tbrs = cleanup_list(options.tbrs)
   options.cc = cleanup_list(options.cc)
 
   if options.message_file:
@@ -4679,6 +4938,31 @@ def CMDupload(parser, args):
   return cl.CMDUpload(options, args, orig_args)
 
 
+@subcommand.usage('--description=<description file>')
+def CMDsplit(parser, args):
+  """Splits a branch into smaller branches and uploads CLs.
+
+  Creates a branch and uploads a CL for each group of files modified in the
+  current branch that share a common OWNERS file. In the CL description and
+  comment, the string '$directory', is replaced with the directory containing
+  the shared OWNERS file.
+  """
+  parser.add_option("-d", "--description", dest="description_file",
+                    help="A text file containing a CL description. ")
+  parser.add_option("-c", "--comment", dest="comment_file",
+                    help="A text file containing a CL comment.")
+  options, _ = parser.parse_args(args)
+
+  if not options.description_file:
+    parser.error('No --description flag specified.')
+
+  def WrappedCMDupload(args):
+    return CMDupload(OptionParser(), args)
+
+  return split_cl.SplitCl(options.description_file, options.comment_file,
+                          Changelist, WrappedCMDupload)
+
+
 @subcommand.usage('DEPRECATED')
 def CMDdcommit(parser, args):
   """DEPRECATED: Used to commit the current changelist via git-svn."""
@@ -4766,7 +5050,7 @@ def CMDland(parser, args):
 
   if options.contributor:
     if not re.match('^.*\s<\S+@\S+>$', options.contributor):
-      print("Please provide contibutor as 'First Last <email@example.com>'")
+      print("Please provide contributor as 'First Last <email@example.com>'")
       return 1
 
   base_branch = args[0]
@@ -4824,7 +5108,8 @@ def CMDland(parser, args):
   # contains the link to the Rietveld issue, while the Rietveld message contains
   # the commit viewvc url.
   if cl.GetIssue():
-    change_desc.update_reviewers(cl.GetApprovingReviewers())
+    change_desc.update_reviewers(
+        get_approving_reviewers(cl.GetIssueProperties()), [])
 
   commit_desc = ChangeDescription(change_desc.description)
   if cl.GetIssue():
@@ -4996,7 +5281,10 @@ def PushToGitWithAutoRebase(remote, branch, original_description,
       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.')
+            '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
 
@@ -5012,9 +5300,9 @@ def CMDpatch(parser, args):
   parser.add_option('-b', dest='newbranch',
                     help='create a new branch off trunk for the patch')
   parser.add_option('-f', '--force', action='store_true',
-                    help='with -b, clobber any existing branch')
+                    help='overwrite state on the current or chosen branch')
   parser.add_option('-d', '--directory', action='store', metavar='DIR',
-                    help='Change to the directory DIR immediately, '
+                    help='change to the directory DIR immediately, '
                          'before doing anything else. Rietveld only.')
   parser.add_option('--reject', action='store_true',
                     help='failed patches spew .rej files rather than '
@@ -5044,7 +5332,6 @@ def CMDpatch(parser, args):
   _process_codereview_select_options(parser, options)
   auth_config = auth.extract_auth_config_from_options(options)
 
-
   if options.reapply:
     if options.newbranch:
       parser.error('--reapply works on the current branch only')
@@ -5070,6 +5357,22 @@ def CMDpatch(parser, args):
   if len(args) != 1 or not args[0]:
     parser.error('Must specify issue number or url')
 
+  target_issue_arg = ParseIssueNumberArgument(args[0],
+                                              options.forced_codereview)
+  if not target_issue_arg.valid:
+    parser.error('invalid codereview url or CL id')
+
+  cl_kwargs = {
+      'auth_config': auth_config,
+      'codereview_host': target_issue_arg.hostname,
+      'codereview': options.forced_codereview,
+  }
+  detected_codereview_from_url = False
+  if target_issue_arg.codereview and not options.forced_codereview:
+    detected_codereview_from_url = True
+    cl_kwargs['codereview'] = target_issue_arg.codereview
+    cl_kwargs['issue'] = target_issue_arg.issue
+
   # We don't want uncommitted changes mixed up with the patch.
   if git_common.is_dirty_git_tree('patch'):
     return 1
@@ -5082,7 +5385,7 @@ def CMDpatch(parser, args):
   elif not GetCurrentBranch():
     DieWithError('A branch is required to apply patch. Hint: use -b option.')
 
-  cl = Changelist(auth_config=auth_config, codereview=options.forced_codereview)
+  cl = Changelist(**cl_kwargs)
 
   if cl.IsGerrit():
     if options.reject:
@@ -5092,8 +5395,13 @@ def CMDpatch(parser, args):
     if options.directory:
       parser.error('--directory is not supported with Gerrit codereview.')
 
-  return cl.CMDPatchIssue(args[0], options.reject, options.nocommit,
-                          options.directory)
+  if detected_codereview_from_url:
+    print('canonical issue/change URL: %s (type: %s)\n' %
+          (cl.GetIssueURL(), target_issue_arg.codereview))
+
+  return cl.CMDPatchWithParsedIssue(target_issue_arg, options.reject,
+                                    options.nocommit, options.directory,
+                                    options.force)
 
 
 def GetTreeStatus(url=None):
@@ -5211,8 +5519,9 @@ def CMDtry(parser, args):
   # then we default to triggering a CQ dry run (see http://crbug.com/625697).
   if not buckets:
     if options.verbose:
-      print('git cl try with no bots now defaults to CQ Dry Run.')
-    return cl.TriggerDryRun()
+      print('git cl try with no bots now defaults to CQ dry run.')
+    print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
+    return cl.SetCQState(_CQState.DRY_RUN)
 
   for builders in buckets.itervalues():
     if any('triggered' in b for b in builders):
@@ -5256,7 +5565,8 @@ def CMDtry_results(parser, args):
       '--buildbucket-host', default='cr-buildbucket.appspot.com',
       help='Host of buildbucket. The default host is %default.')
   group.add_option(
-      '--json', help='Path of JSON output file to write try job results to.')
+      '--json', help=('Path of JSON output file to write try job results to,'
+                      'or "-" for stdout.'))
   parser.add_option_group(group)
   auth.add_auth_options(parser)
   options, args = parser.parse_args(args)
@@ -5356,7 +5666,6 @@ def CMDset_commit(parser, args):
   if options.clear:
     state = _CQState.NONE
   elif options.dry_run:
-      # TODO(qyearsley): Use cl.TriggerDryRun.
     state = _CQState.DRY_RUN
   else:
     state = _CQState.COMMIT
@@ -5438,7 +5747,7 @@ def CMDdiff(parser, args):
 
 
 def CMDowners(parser, args):
-  """Interactively find the owners for reviewing."""
+  """Interactively finds potential owners for reviewing."""
   parser.add_option(
       '--no-color',
       action='store_true',
@@ -5463,9 +5772,10 @@ def CMDowners(parser, args):
   return owners_finder.OwnersFinder(
       [f.LocalPath() for f in
           cl.GetChange(base_branch, None).AffectedFiles()],
-      change.RepositoryRoot(), author,
-      fopen=file, os_path=os.path,
-      disable_color=options.no_color).run()
+      change.RepositoryRoot(),
+      author, fopen=file, os_path=os.path,
+      disable_color=options.no_color,
+      override_files=change.OriginalOwnersFiles()).run()
 
 
 def BuildGitDiffCmd(diff_type, upstream_commit, args):
@@ -5646,24 +5956,30 @@ def CMDformat(parser, args):
         DieWithError("gn format failed on " + gn_diff_file +
                      "\nTry running 'gn format' on this file manually.")
 
-  metrics_xml_files = [
-    os.path.join('tools', 'metrics', 'actions', 'actions.xml'),
-    os.path.join('tools', 'metrics', 'histograms', 'histograms.xml'),
-    os.path.join('tools', 'metrics', 'rappor', 'rappor.xml')]
-  for xml_file in metrics_xml_files:
-    if xml_file in diff_files:
-      tool_dir = os.path.join(top_dir, os.path.dirname(xml_file))
-      cmd = [os.path.join(tool_dir, 'pretty_print.py'), '--non-interactive']
-      if opts.dry_run or opts.diff:
-        cmd.append('--diff')
-      stdout = RunCommand(cmd, cwd=top_dir)
-      if opts.diff:
-        sys.stdout.write(stdout)
-      if opts.dry_run and stdout:
-        return_value = 2  # Not formatted.
+  for xml_dir in GetDirtyMetricsDirs(diff_files):
+    tool_dir = os.path.join(top_dir, xml_dir)
+    cmd = [os.path.join(tool_dir, 'pretty_print.py'), '--non-interactive']
+    if opts.dry_run or opts.diff:
+      cmd.append('--diff')
+    stdout = RunCommand(cmd, cwd=top_dir)
+    if opts.diff:
+      sys.stdout.write(stdout)
+    if opts.dry_run and stdout:
+      return_value = 2  # Not formatted.
 
   return return_value
 
+def GetDirtyMetricsDirs(diff_files):
+  xml_diff_files = [x for x in diff_files if MatchingFileType(x, ['.xml'])]
+  metrics_xml_dirs = [
+    os.path.join('tools', 'metrics', 'actions'),
+    os.path.join('tools', 'metrics', 'histograms'),
+    os.path.join('tools', 'metrics', 'rappor'),
+    os.path.join('tools', 'metrics', 'ukm')]
+  for xml_dir in metrics_xml_dirs:
+    if any(file.startswith(xml_dir) for file in xml_diff_files):
+      yield xml_dir
+
 
 @subcommand.usage('<codereview url or issue id>')
 def CMDcheckout(parser, args):
@@ -5676,8 +5992,8 @@ def CMDcheckout(parser, args):
 
   issue_arg = ParseIssueNumberArgument(args[0])
   if not issue_arg.valid:
-    parser.print_help()
-    return 1
+    parser.error('invalid codereview url or CL id')
+
   target_issue = str(issue_arg.issue)
 
   def find_issues(issueprefix):