libv8 6.0.286.54.3 → 6.2.414.42.0beta1

data/vendor/depot_tools/bootstrap/win/manifest.txt

@@ -15,4 +15,4 @@
 infra/python/cpython/windows-386 version:2.7.6
 
 @Subdir git
-infra/git/${platform} version:2.14.1.chromium10
+infra/git/${platform} version:2.15.0.chromium12

data/vendor/depot_tools/bootstrap/win/manifest_bleeding_edge.txt

@@ -15,4 +15,4 @@
 infra/python/cpython/${platform} version:2.7.13.chromium7
 
 @Subdir git
-infra/git/${platform} version:2.14.1.chromium10
+infra/git/windows-${arch} version:2.15.1.2.chromium12

data/vendor/depot_tools/cipd_bin_setup.sh

@@ -4,9 +4,19 @@
 
 function cipd_bin_setup {
     local MYPATH=$(dirname "${BASH_SOURCE[0]}")
+    local ENSURE="$MYPATH/cipd_manifest.txt"
+    local ROOT="$MYPATH/.cipd_bin"
+
+    UNAME=`uname -s | tr '[:upper:]' '[:lower:]'`
+    case $UNAME in
+      cygwin*)
+        ENSURE="$(cygpath -w $ENSURE)"
+        ROOT="$(cygpath -w $ROOT)"
+        ;;
+    esac
 
     "$MYPATH/cipd" ensure \
         -log-level warning \
-        -ensure-file "$MYPATH/cipd_manifest.txt" \
-        -root "$MYPATH/.cipd_bin"
+        -ensure-file "$ENSURE" \
+        -root "$ROOT"
 }

data/vendor/depot_tools/cipd_manifest.txt

@@ -11,4 +11,7 @@ $VerifiedPlatform windows-386 windows-amd64
 infra/tools/luci/vpython/${platform}  git_revision:a3d636052088db3daa48413b3e209eed4f5cb4ad
 
 # LUCI editor
-infra/tools/luci/led/${platform}  git_revision:d1e9a52e1c8414cd0a0df8bec6c37f325e0fbaa1
+infra/tools/luci/led/${platform}  git_revision:9010ba713ba6fc9982c412161150a5cd70d5b623
+
+# Mac toolchain installer
+infra/tools/mac_toolchain/${os=mac}-${arch} git_revision:2b69be6203f56a970202d9b5984557c0453b4eb0

data/vendor/depot_tools/fetch.py

@@ -91,6 +91,8 @@ class GitCheckout(Checkout):
 
   def run_git(self, *cmd, **kwargs):
     print 'Running: git %s' % (' '.join(pipes.quote(x) for x in cmd))
+    if self.options.dry_run:
+      return ''
     return git_common.run(*cmd, **kwargs)
 
 

data/vendor/depot_tools/gclient.py

@@ -92,7 +92,6 @@ import pprint
 import re
 import sys
 import time
-import urllib
 import urlparse
 
 import fix_encoding
@@ -208,6 +207,8 @@ class Hook(object):
       # Python script.  Run it by starting a new copy of the same
       # interpreter.
       cmd[0] = sys.executable
+    elif cmd[0] == 'vpython' and _detect_host_os() == 'win':
+      cmd[0] += '.bat'
 
     cwd = root
     if self._cwd:
@@ -1329,10 +1330,7 @@ it or fix the checkout.
     if cache_dir:
       cache_dir = os.path.join(self.root_dir, cache_dir)
       cache_dir = os.path.abspath(cache_dir)
-      # If running on a bot, force break any stale git cache locks.
-      if os.path.exists(cache_dir) and os.environ.get('CHROME_HEADLESS'):
-        subprocess2.check_call(['git', 'cache', 'unlock', '--cache-dir',
-                                cache_dir, '--force', '--all'])
+
     gclient_scm.GitWrapper.cache_dir = cache_dir
     git_cache.Mirror.SetCachePath(cache_dir)
 
@@ -2201,7 +2199,7 @@ def CMDconfig(parser, args):
   parser.add_option('--name',
                     help='overrides the default name for the solution')
   parser.add_option('--deps-file', default='DEPS',
-                    help='overrides the default name for the DEPS file for the'
+                    help='overrides the default name for the DEPS file for the '
                          'main solutions and all sub-dependencies')
   parser.add_option('--unmanaged', action='store_true', default=False,
                     help='overrides the default behavior to make it possible '

data/vendor/depot_tools/gclient_scm.py

@@ -433,7 +433,7 @@ class GitWrapper(SCMWrapper):
         (os.path.isdir(self.checkout_path) and
          not os.path.exists(os.path.join(self.checkout_path, '.git')))):
       if mirror:
-        self._UpdateMirror(mirror, options)
+        self._UpdateMirrorIfNotContains(mirror, options, rev_type, revision)
       try:
         self._Clone(revision, url, options)
       except subprocess2.CalledProcessError:
@@ -456,7 +456,7 @@ class GitWrapper(SCMWrapper):
     self._maybe_break_locks(options)
 
     if mirror:
-      self._UpdateMirror(mirror, options)
+      self._UpdateMirrorIfNotContains(mirror, options, rev_type, revision)
 
     # See if the url has changed (the unittests use git://foo for the url, let
     # that through).
@@ -842,9 +842,16 @@ class GitWrapper(SCMWrapper):
       mirror_kwargs['refs'].append('refs/tags/*')
     return git_cache.Mirror(url, **mirror_kwargs)
 
-  @staticmethod
-  def _UpdateMirror(mirror, options):
-    """Update a git mirror by fetching the latest commits from the remote."""
+  def _UpdateMirrorIfNotContains(self, mirror, options, rev_type, revision):
+    """Update a git mirror by fetching the latest commits from the remote,
+    unless mirror already contains revision whose type is sha1 hash.
+    """
+    if rev_type == 'hash' and mirror.contains_revision(revision):
+      if options.verbose:
+        self.Print('skipping mirror update, it has rev=%s already' % revision,
+                   timestamp=False)
+      return
+
     if getattr(options, 'shallow', False):
       # HACK(hinoka): These repositories should be super shallow.
       if 'flash' in mirror.url:

data/vendor/depot_tools/gerrit_util.py

@@ -665,6 +665,7 @@ def AddReviewers(host, change, reviewers=None, ccs=None, notify=True,
   path = 'changes/%s/revisions/current/review' % change
 
   body = {
+    'drafts': 'KEEP',
     'reviewers': [],
     'notify': 'ALL' if notify else 'NONE',
   }
@@ -718,7 +719,7 @@ def SetReview(host, change, msg=None, labels=None, notify=None, ready=None):
   if not msg and not labels:
     return
   path = 'changes/%s/revisions/current/review' % change
-  body = {}
+  body = {'drafts': 'KEEP'}
   if msg:
     body['message'] = msg
   if labels:
@@ -760,6 +761,7 @@ def ResetReviewLabels(host, change, label, value='0', message=None,
   for review in jmsg.get('labels', {}).get(label, {}).get('all', []):
     if str(review.get('value', value)) != value:
       body = {
+          'drafts': 'KEEP',
           'message': message,
           'labels': {label: value},
           'on_behalf_of': review['_account_id'],
@@ -830,6 +832,26 @@ def GetAccountDetails(host, account_id='self'):
   return ReadHttpJsonResponse(conn)
 
 
+def PercentEncodeForGitRef(original):
+  """Apply percent-encoding for strings sent to gerrit via git ref metadata.
+
+  The encoding used is based on but stricter than URL encoding (Section 2.1
+  of RFC 3986). The only non-escaped characters are alphanumerics, and
+  'SPACE' (U+0020) can be represented as 'LOW LINE' (U+005F) or
+  'PLUS SIGN' (U+002B).
+
+  For more information, see the Gerrit docs here:
+
+  https://gerrit-review.googlesource.com/Documentation/user-upload.html#message
+  """
+  safe = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 '
+  encoded = ''.join(c if c in safe else '%%%02X' % ord(c) for c in original)
+
+  # spaces are not allowed in git refs; gerrit will interpret either '_' or
+  # '+' (or '%20') as space. Use '_' since that has been supported the longest.
+  return encoded.replace(' ', '_')
+
+
 @contextlib.contextmanager
 def tempdir():
   tdir = None

data/vendor/depot_tools/git_cache.py

@@ -6,6 +6,7 @@
 """A git command for managing a local cache of git repositories."""
 
 from __future__ import print_function
+import contextlib
 import errno
 import logging
 import optparse
@@ -25,6 +26,8 @@ import subcommand
 
 # Analogous to gc.autopacklimit git config.
 GC_AUTOPACKLIMIT = 50
+if sys.platform.startswith('win'):
+  GC_AUTOPACKLIMIT = 9
 
 GIT_CACHE_CORRUPT_MESSAGE = 'WARNING: The Git cache is corrupt.'
 
@@ -223,6 +226,14 @@ class Mirror(object):
   def print_without_file(self, message, **_kwargs):
     self.print_func(message)
 
+  @contextlib.contextmanager
+  def print_duration_of(self, what):
+    start = time.time()
+    try:
+      yield
+    finally:
+      self.print('%s took %.1f minutes' % (what, (time.time() - start) / 60.0))
+
   @property
   def bootstrap_bucket(self):
     u = urlparse.urlparse(self.url)
@@ -324,11 +335,10 @@ class Mirror(object):
           cwd=cwd)
 
   def bootstrap_repo(self, directory):
-    """Bootstrap the repo from Google Stroage if possible.
+    """Bootstrap the repo from Google Storage if possible.
 
     More apt-ly named bootstrap_repo_from_cloud_if_possible_else_do_nothing().
     """
-
     if not self.bootstrap_bucket:
       return False
     python_fallback = False
@@ -344,10 +354,13 @@ class Mirror(object):
     gs_folder = 'gs://%s/%s' % (self.bootstrap_bucket, self.basedir)
     gsutil = Gsutil(self.gsutil_exe, boto_path=None)
     # Get the most recent version of the zipfile.
-    _, ls_out, _ = gsutil.check_call('ls', gs_folder)
+    _, ls_out, ls_err = gsutil.check_call('ls', gs_folder)
     ls_out_sorted = sorted(ls_out.splitlines())
     if not ls_out_sorted:
       # This repo is not on Google Storage.
+      self.print('No bootstrap file for %s found in %s, stderr:\n  %s' %
+                 (self.mirror_path, self.bootstrap_bucket,
+                  '  '.join((ls_err or '').splitlines(True))))
       return False
     latest_checkout = ls_out_sorted[-1]
 
@@ -355,28 +368,30 @@ class Mirror(object):
     try:
       tempdir = tempfile.mkdtemp(prefix='_cache_tmp', dir=self.GetCachePath())
       self.print('Downloading %s' % latest_checkout)
-      code = gsutil.call('cp', latest_checkout, tempdir)
+      with self.print_duration_of('download'):
+        code = gsutil.call('cp', latest_checkout, tempdir)
       if code:
         return False
       filename = os.path.join(tempdir, latest_checkout.split('/')[-1])
 
       # Unpack the file with 7z on Windows, unzip on linux, or fallback.
-      if not python_fallback:
-        if sys.platform.startswith('win'):
-          cmd = ['7z', 'x', '-o%s' % directory, '-tzip', filename]
+      with self.print_duration_of('unzip'):
+        if not python_fallback:
+          if sys.platform.startswith('win'):
+            cmd = ['7z', 'x', '-o%s' % directory, '-tzip', filename]
+          else:
+            cmd = ['unzip', filename, '-d', directory]
+          retcode = subprocess.call(cmd)
         else:
-          cmd = ['unzip', filename, '-d', directory]
-        retcode = subprocess.call(cmd)
-      else:
-        try:
-          with zipfile.ZipFile(filename, 'r') as f:
-            f.printdir()
-            f.extractall(directory)
-        except Exception as e:
-          self.print('Encountered error: %s' % str(e), file=sys.stderr)
-          retcode = 1
-        else:
-          retcode = 0
+          try:
+            with zipfile.ZipFile(filename, 'r') as f:
+              f.printdir()
+              f.extractall(directory)
+          except Exception as e:
+            self.print('Encountered error: %s' % str(e), file=sys.stderr)
+            retcode = 1
+          else:
+            retcode = 0
     finally:
       # Clean up the downloaded zipfile.
       #
@@ -396,6 +411,24 @@ class Mirror(object):
       return False
     return True
 
+  def contains_revision(self, revision):
+    if not self.exists():
+      return False
+
+    if sys.platform.startswith('win'):
+      # Windows .bat scripts use ^ as escape sequence, which means we have to
+      # escape it with itself for every .bat invocation.
+      needle = '%s^^^^{commit}' % revision
+    else:
+      needle = '%s^{commit}' % revision
+    try:
+      # cat-file exits with 0 on success, that is git object of given hash was
+      # found.
+      self.RunGit(['cat-file', '-e', needle])
+      return True
+    except subprocess.CalledProcessError:
+      return False
+
   def exists(self):
     return os.path.isfile(os.path.join(self.mirror_path, 'config'))
 
@@ -432,6 +465,8 @@ class Mirror(object):
 
     if os.path.isdir(pack_dir):
       pack_files = [f for f in os.listdir(pack_dir) if f.endswith('.pack')]
+      self.print('%s has %d .pack files, re-bootstrapping if >%d' %
+                 (self.mirror_path, len(pack_files), GC_AUTOPACKLIMIT))
 
     should_bootstrap = (force or
                         not self.exists() or
@@ -455,8 +490,8 @@ class Mirror(object):
       else:
         # Bootstrap failed, previous cache exists; warn and continue.
         logging.warn(
-            'Git cache has a lot of pack files (%d).  Tried to re-bootstrap '
-            'but failed.  Continuing with non-optimized repository.'
+            'Git cache has a lot of pack files (%d). Tried to re-bootstrap '
+            'but failed. Continuing with non-optimized repository.'
             % len(pack_files))
         gclient_utils.rmtree(tempdir)
         tempdir = None
@@ -481,7 +516,8 @@ class Mirror(object):
     for spec in fetch_specs:
       try:
         self.print('Fetching %s' % spec)
-        self.RunGit(fetch_cmd + [spec], cwd=rundir, retry=True)
+        with self.print_duration_of('fetch %s' % spec):
+          self.RunGit(fetch_cmd + [spec], cwd=rundir, retry=True)
       except subprocess.CalledProcessError:
         if spec == '+refs/heads/*:refs/heads/*':
           raise ClobberNeeded()  # Corrupted cache.
@@ -509,7 +545,7 @@ class Mirror(object):
       self.print(GIT_CACHE_CORRUPT_MESSAGE)
       tempdir = self._ensure_bootstrapped(depth, bootstrap, force=True)
       assert tempdir
-      self._fetch(tempdir or self.mirror_path, verbose, depth)
+      self._fetch(tempdir, verbose, depth)
     finally:
       if tempdir:
         if os.path.exists(self.mirror_path):

data/vendor/depot_tools/git_cl.py

@@ -27,6 +27,7 @@ import re
 import shutil
 import stat
 import sys
+import tempfile
 import textwrap
 import urllib
 import urllib2
@@ -1154,7 +1155,7 @@ class Changelist(object):
     self.lookedup_patchset = False
     self.patchset = None
     self.cc = None
-    self.watchers = ()
+    self.more_cc = []
     self._remote = None
 
     self._codereview_impl = None
@@ -1202,21 +1203,19 @@ class Changelist(object):
     """
     if self.cc is None:
       base_cc = settings.GetDefaultCCList()
-      more_cc = ','.join(self.watchers)
+      more_cc = ','.join(self.more_cc)
       self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
     return self.cc
 
   def GetCCListWithoutDefault(self):
     """Return the users cc'd on this CL excluding default ones."""
     if self.cc is None:
-      self.cc = ','.join(self.watchers)
+      self.cc = ','.join(self.more_cc)
     return self.cc
 
-  def SetWatchers(self, watchers):
-    """Sets the list of email addresses that should be cc'd based on the changed
-    files in this CL.
-    """
-    self.watchers = watchers
+  def ExtendCC(self, more_cc):
+    """Extends the list of users to cc on this CL based on the changed files."""
+    self.more_cc.extend(more_cc)
 
   def GetBranch(self):
     """Returns the short branch name, e.g. 'master'."""
@@ -1626,7 +1625,7 @@ class Changelist(object):
     watchlist = watchlists.Watchlists(change.RepositoryRoot())
     files = [f.LocalPath() for f in change.AffectedFiles()]
     if not options.bypass_watchlists:
-      self.SetWatchers(watchlist.GetWatchersForPaths(files))
+      self.ExtendCC(watchlist.GetWatchersForPaths(files))
 
     if not options.bypass_hooks:
       if options.reviewers or options.tbrs or options.add_owners_to:
@@ -1645,6 +1644,7 @@ class Changelist(object):
         return 1
       if not options.reviewers and hook_results.reviewers:
         options.reviewers = hook_results.reviewers.split(',')
+      self.ExtendCC(hook_results.more_cc)
 
     # TODO(tandrii): Checking local patchset against remote patchset is only
     # supported for Rietveld. Extend it to Gerrit or remove it completely.
@@ -2900,7 +2900,12 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
 
     # This may be None; default fallback value is determined in logic below.
     title = options.title
-    automatic_title = False
+
+    # Extract bug number from branch name.
+    bug = options.bug
+    match = re.match(r'(?:bug|fix)[_-]?(\d+)', self.GetBranch())
+    if not bug and match:
+      bug = match.group(1)
 
     if options.squash:
       self._GerritCommitMsgHookCheck(offer_removal=not options.force)
@@ -2924,8 +2929,6 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
             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)
@@ -2952,7 +2955,7 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
           confirm_or_exit(action='edit')
           if not options.force:
             change_desc = ChangeDescription(message)
-            change_desc.prompt(bug=options.bug)
+            change_desc.prompt(bug=bug)
             message = change_desc.description
             if not message:
               DieWithError("Description is empty. Aborting...")
@@ -2971,11 +2974,10 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
         change_desc = ChangeDescription(message)
 
         if not options.force:
-          change_desc.prompt(bug=options.bug)
+          change_desc.prompt(bug=bug)
         # On first upload, patchset title is always this string, while
         # --title flag gets converted to first line of message.
         title = 'Initial upload'
-        automatic_title = True
         if not change_desc.description:
           DieWithError("Description is empty. Aborting...")
         change_ids = git_footers.get_footer_change_id(change_desc.description)
@@ -2998,8 +3000,12 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
       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', change_desc.description]).strip()
+      with tempfile.NamedTemporaryFile(delete=False) as desc_tempfile:
+        desc_tempfile.write(change_desc.description)
+        desc_tempfile.close()
+        ref_to_push = RunGit(['commit-tree', tree, '-p', parent,
+                              '-F', desc_tempfile.name]).strip()
+        os.remove(desc_tempfile.name)
     else:
       change_desc = ChangeDescription(
           options.message or CreateDescriptionFromLog(git_diff_args))
@@ -3045,26 +3051,17 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
     if options.send_mail:
       refspec_opts.append('ready')
       refspec_opts.append('notify=ALL')
+    elif not self.GetIssue():
+      refspec_opts.append('wip')
     else:
-      if not self.GetIssue():
-        refspec_opts.append('wip')
-      else:
-        refspec_opts.append('notify=NONE')
+      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):
-        title = re.sub(r'[^\w ]', '', title)
-        if not automatic_title:
-          print('WARNING: Patchset title may only contain alphanumeric chars '
-                'and spaces. You can edit it in the UI. '
-                'See https://crbug.com/663787.\n'
-                'Cleaned up title: %s' % title)
-      # Per doc, spaces must be converted to underscores, and Gerrit will do the
-      # reverse on its side.
-      refspec_opts.append('m=' + title.replace(' ', '_'))
+      # Punctuation and whitespace in |title| must be percent-encoded.
+      refspec_opts.append('m=' + gerrit_util.PercentEncodeForGitRef(title))
 
     if options.private:
       refspec_opts.append('private')
@@ -3074,6 +3071,12 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
       # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
       refspec_opts.append('topic=%s' % options.topic)
 
+    # Gerrit sorts hashtags, so order is not important.
+    hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
+    if not self.GetIssue():
+      hashtags.update(change_desc.get_hash_tags())
+    refspec_opts += ['hashtag=%s' % t for t in sorted(hashtags)]
+
     refspec_suffix = ''
     if refspec_opts:
       refspec_suffix = '%' + ','.join(refspec_opts)
@@ -3345,6 +3348,10 @@ class ChangeDescription(object):
   CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
   BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
   CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
+  STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
+  BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
+  COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):'
+  BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
 
   def __init__(self, description):
     self._description_lines = (description or '').strip().splitlines()
@@ -3517,6 +3524,37 @@ class ChangeDescription(object):
     cced = [match.group(2).strip() for match in matches if match]
     return cleanup_list(cced)
 
+  def get_hash_tags(self):
+    """Extracts and sanitizes a list of Gerrit hashtags."""
+    subject = (self._description_lines or ('',))[0]
+    subject = re.sub(
+        self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
+
+    tags = []
+    start = 0
+    bracket_exp = re.compile(self.BRACKET_HASH_TAG)
+    while True:
+      m = bracket_exp.match(subject, start)
+      if not m:
+        break
+      tags.append(self.sanitize_hash_tag(m.group(1)))
+      start = m.end()
+
+    if not tags:
+      # Try "Tag: " prefix.
+      m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
+      if m:
+        tags.append(self.sanitize_hash_tag(m.group(1)))
+    return tags
+
+  @classmethod
+  def sanitize_hash_tag(cls, tag):
+    """Returns a sanitized Gerrit hash tag.
+
+    A sanitized hashtag can be used as a git push refspec parameter value.
+    """
+    return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
+
   def update_with_git_number_footers(self, parent_hash, parent_msg, dest_ref):
     """Updates this commit description given the parent.
 
@@ -4495,7 +4533,7 @@ def CMDissue(parser, args):
 
   if options.reverse:
     branches = RunGit(['for-each-ref', 'refs/heads',
-                       '--format=%(refname:short)']).splitlines()
+                       '--format=%(refname)']).splitlines()
     # Reverse issue lookup.
     issue_branch_map = {}
     for branch in branches:
@@ -4743,6 +4781,8 @@ def CMDpresubmit(parser, args):
                     help='Run upload hook instead of the push hook')
   parser.add_option('-f', '--force', action='store_true',
                     help='Run checks even if tree is dirty')
+  parser.add_option('--all', action='store_true',
+                    help='Run checks against all files, not just modified ones')
   auth.add_auth_options(parser)
   options, args = parser.parse_args(args)
   auth_config = auth.extract_auth_config_from_options(options)
@@ -4758,11 +4798,26 @@ def CMDpresubmit(parser, args):
     # Default to diffing against the common ancestor of the upstream branch.
     base_branch = cl.GetCommonAncestorWithUpstream()
 
+  if options.all:
+    base_change = cl.GetChange(base_branch, None)
+    files = [('M', f) for f in base_change.AllFiles()]
+    change = presubmit_support.GitChange(
+        base_change.Name(),
+        base_change.FullDescriptionText(),
+        base_change.RepositoryRoot(),
+        files,
+        base_change.issue,
+        base_change.patchset,
+        base_change.author_email,
+        base_change._upstream)
+  else:
+    change = cl.GetChange(base_branch, None)
+
   cl.RunHook(
       committing=not options.upload,
       may_prompt=False,
       verbose=options.verbose,
-      change=cl.GetChange(base_branch, None))
+      change=change)
   return 0
 
 
@@ -4859,7 +4914,7 @@ def cleanup_list(l):
   return sorted(filter(None, stripped_items))
 
 
-@subcommand.usage('[args to "git diff"]')
+@subcommand.usage('[flags]')
 def CMDupload(parser, args):
   """Uploads the current changelist to codereview.
 
@@ -4868,6 +4923,16 @@ def CMDupload(parser, args):
   To unset run:
     git config --unset branch.branch_name.skip-deps-uploads
   Can also set the above globally by using the --global flag.
+
+  If the name of the checked out branch starts with "bug-" or "fix-" followed by
+  a bug number, this bug number is automatically populated in the CL
+  description.
+
+  If subject contains text in square brackets or has "<text>: " prefix, such
+  text(s) is treated as Gerrit hashtags. For example, CLs with subjects
+    [git-cl] add support for hashtags
+    Foo bar: implement foo
+  will be hashtagged with "git-cl" and "foo-bar" respectively.
   """
   parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
                     help='bypass upload presubmit hook')
@@ -4894,6 +4959,10 @@ def CMDupload(parser, args):
   parser.add_option('--cc',
                     action='append', default=[],
                     help='cc email addresses')
+  parser.add_option('--hashtag', dest='hashtags',
+                    action='append', default=[],
+                    help=('Gerrit hashtag for new CL; '
+                          'can be applied multiple times'))
   parser.add_option('-s', '--send-mail', action='store_true',
                     help='send email to reviewer(s) and cc(s) immediately')
   parser.add_option('--emulate_svn_auto_props',
@@ -4904,22 +4973,17 @@ def CMDupload(parser, args):
   parser.add_option('-c', '--use-commit-queue', action='store_true',
                     help='tell the commit queue to commit this patchset; '
                           'implies --send-mail')
-  parser.add_option('--private', action='store_true',
-                    help='set the review private (rietveld only)')
   parser.add_option('--target_branch',
                     '--target-branch',
                     metavar='TARGET',
                     help='Apply CL to remote ref TARGET.  ' +
                          'Default: remote branch head, or master')
   parser.add_option('--squash', action='store_true',
-                    help='Squash multiple commits into one (Gerrit only)')
+                    help='Squash multiple commits into one')
   parser.add_option('--no-squash', action='store_true',
-                    help='Don\'t squash multiple commits into one ' +
-                         '(Gerrit only)')
+                    help='Don\'t squash multiple commits into one')
   parser.add_option('--topic', default=None,
-                    help='Topic to specify when uploading (Gerrit only)')
-  parser.add_option('--email', default=None,
-                    help='email address to use to connect to Rietveld')
+                    help='Topic to specify when uploading')
   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',
@@ -4932,6 +4996,12 @@ def CMDupload(parser, args):
                     help='Uploads CLs of all the local branches that depend on '
                          'the current branch')
 
+  # TODO: remove Rietveld flags
+  parser.add_option('--private', action='store_true',
+                    help='set the review private (rietveld only)')
+  parser.add_option('--email', default=None,
+                    help='email address to use to connect to Rietveld')
+
   orig_args = args
   add_git_similarity(parser)
   auth.add_auth_options(parser)
@@ -4976,7 +5046,8 @@ def CMDsplit(parser, args):
   the shared OWNERS file.
   """
   parser.add_option("-d", "--description", dest="description_file",
-                    help="A text file containing a CL description. ")
+                    help="A text file containing a CL description in which "
+                         "$directory will be replaced by each CL's directory.")
   parser.add_option("-c", "--comment", dest="comment_file",
                     help="A text file containing a CL comment.")
   options, _ = parser.parse_args(args)