libv8 5.0.71.48.3 → 5.1.281.59.0beta3

data/vendor/depot_tools/fetch.py

@@ -231,6 +231,7 @@ def usage(msg=None):
     Valid options:
        -h, --help, help   Print this message.
        --nohooks          Don't run hooks after checkout.
+       --force            (dangerous) Don't look for existing .gclient file.
        -n, --dry-run      Don't run commands, only print them.
        --no-history       Perform shallow clones, don't fetch the full git history.
 
@@ -255,6 +256,7 @@ def handle_args(argv):
   dry_run = False
   nohooks = False
   no_history = False
+  force = False
   while len(argv) >= 2:
     arg = argv[1]
     if not arg.startswith('-'):
@@ -266,6 +268,8 @@ def handle_args(argv):
       nohooks = True
     elif arg == '--no-history':
       no_history = True
+    elif arg == '--force':
+      force = True
     else:
       usage('Invalid option %s.' % arg)
 
@@ -279,8 +283,11 @@ def handle_args(argv):
   config = argv[1]
   props = argv[2:]
   return (
-      optparse.Values(
-          {'dry_run':dry_run, 'nohooks':nohooks, 'no_history': no_history }),
+      optparse.Values({
+        'dry_run': dry_run,
+        'nohooks': nohooks,
+        'no_history': no_history,
+        'force': force}),
       config,
       props)
 
@@ -324,7 +331,7 @@ def run(options, spec, root):
     checkout = CheckoutFactory(checkout_type, options, checkout_spec, root)
   except KeyError:
     return 1
-  if checkout.exists():
+  if not options.force and checkout.exists():
     print 'Your current directory appears to already contain, or be part of, '
     print 'a checkout. "fetch" is used only to get new checkouts. Use '
     print '"gclient sync" to update existing checkouts.'

data/vendor/depot_tools/fetch_configs/infra.py

@@ -13,7 +13,9 @@ class Infra(config_util.Config):
   """Basic Config class for the Infrastructure repositories."""
 
   @staticmethod
-  def fetch_spec(_props):
+  def fetch_spec(props):
+    # This is used by [depot_tools]/testing_support/local_rietveld.py
+    managed = props.get('managed', 'false').lower() == 'true'
     return {
       'type': 'gclient_git',
       'gclient_git_spec': {
@@ -22,7 +24,7 @@ class Infra(config_util.Config):
             'name'     : 'infra',
             'url'      : 'https://chromium.googlesource.com/infra/infra.git',
             'deps_file': '.DEPS.git',
-            'managed'  : False,
+            'managed'  : managed,
           }
         ],
       },

data/vendor/depot_tools/fetch_configs/ios_internal.py

@@ -0,0 +1,49 @@
+# Copyright 2016 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import sys
+
+import config_util  # pylint: disable=F0401
+
+
+# This class doesn't need an __init__ method, so we disable the warning
+# pylint: disable=W0232
+class IOSInternal(config_util.Config):
+  """Basic Config class for Chrome on iOS."""
+
+  @staticmethod
+  def fetch_spec(props):
+    url = 'https://chrome-internal.googlesource.com/chrome/ios_internal.git'
+    solution = { 'name'   :'src/ios_internal',
+                 'url'    : url,
+                 'deps_file': 'DEPS',
+                 'managed'   : False,
+                 'custom_deps': {},
+                 'safesync_url': '',
+    }
+    spec = {
+      'solutions': [solution],
+    }
+    if props.get('target_os'):
+      spec['target_os'] = props['target_os'].split(',')
+    else:
+      spec['target_os'] = ['ios']
+    if props.get('target_os_only'):
+      spec['target_os_only'] = props['target_os_only']
+    return {
+      'type': 'gclient_git',
+      'gclient_git_spec': spec,
+    }
+
+  @staticmethod
+  def expected_root(_props):
+    return 'src'
+
+
+def main(argv=None):
+  return IOSInternal().handle_args(argv)
+
+
+if __name__ == '__main__':
+  sys.exit(main(sys.argv))

data/vendor/depot_tools/gclient.py

@@ -371,7 +371,15 @@ class Dependency(gclient_utils.WorkItem, DependencySettings):
     # recursedeps is a mutable value that selectively overrides the default
     # 'no recursion' setting on a dep-by-dep basis.  It will replace
     # recursion_override.
+    #
+    # It will be a dictionary of {deps_name: {"deps_file": depfile_name}} or
+    # None.
     self.recursedeps = None
+    # This is inherited from WorkItem.  We want the URL to be a resource.
+    if url and isinstance(url, basestring):
+      # The url is usually given to gclient either as https://blah@123
+      # or just https://blah.  The @123 portion is irrelevent.
+      self.resources.append(url.split('@')[0])
 
     if not self.name and self.parent:
       raise gclient_utils.Error('Dependency without name')
@@ -650,9 +658,14 @@ class Dependency(gclient_utils.WorkItem, DependencySettings):
       self.recursion_override = local_scope.get('recursion')
       logging.warning(
           'Setting %s recursion to %d.', self.name, self.recursion_limit)
-    self.recursedeps = local_scope.get('recursedeps', None)
+    self.recursedeps = None
     if 'recursedeps' in local_scope:
-      self.recursedeps = set(self.recursedeps)
+      self.recursedeps = {}
+      for ent in local_scope['recursedeps']:
+        if isinstance(ent, basestring):
+          self.recursedeps[ent] = {"deps_file": self.deps_file}
+        else:  # (depname, depsfilename)
+          self.recursedeps[ent[0]] = {"deps_file": ent[1]}
       logging.warning('Found recursedeps %r.', repr(self.recursedeps))
     # If present, save 'target_os' in the local_target_os property.
     if 'target_os' in local_scope:
@@ -687,9 +700,9 @@ class Dependency(gclient_utils.WorkItem, DependencySettings):
       # Update recursedeps if it's set.
       if self.recursedeps is not None:
         logging.warning('Updating recursedeps by prepending %s.', self.name)
-        rel_deps = set()
-        for d in self.recursedeps:
-          rel_deps.add(os.path.normpath(os.path.join(self.name, d)))
+        rel_deps = {}
+        for depname, options in self.recursedeps.iteritems():
+          rel_deps[os.path.normpath(os.path.join(self.name, depname))] = options
         self.recursedeps = rel_deps
 
     if 'allowed_hosts' in local_scope:
@@ -708,9 +721,14 @@ class Dependency(gclient_utils.WorkItem, DependencySettings):
     deps_to_add = []
     for name, url in deps.iteritems():
       should_process = self.recursion_limit and self.should_process
+      deps_file = self.deps_file
+      if self.recursedeps is not None:
+        ent = self.recursedeps.get(name)
+        if ent is not None:
+          deps_file = ent['deps_file']
       deps_to_add.append(Dependency(
           self, name, url, None, None, None, self.custom_vars, None,
-          self.deps_file, should_process))
+          deps_file, should_process))
     deps_to_add.sort(key=lambda x: x.name)
 
     # override named sets of hooks by the custom hooks
@@ -1220,12 +1238,19 @@ solutions = [
             dep.url, self.root_dir, dep.name, self.outbuf)
         actual_url = scm.GetActualRemoteURL(self._options)
         if actual_url and not scm.DoesRemoteURLMatch(self._options):
+          mirror = scm.GetCacheMirror()
+          if mirror:
+            mirror_string = '%s (exists=%s)' % (mirror.mirror_path,
+                                                mirror.exists())
+          else:
+            mirror_string = 'not used'
           raise gclient_utils.Error('''
 Your .gclient file seems to be broken. The requested URL is different from what
 is actually checked out in %(checkout_path)s.
 
 The .gclient file contains:
-%(expected_url)s (%(expected_scm)s)
+URL: %(expected_url)s (%(expected_scm)s)
+Cache mirror: %(mirror_string)s
 
 The local checkout in %(checkout_path)s reports:
 %(actual_url)s (%(actual_scm)s)
@@ -1237,6 +1262,7 @@ want to set 'managed': False in .gclient.
 '''  % {'checkout_path': os.path.join(self.root_dir, dep.name),
         'expected_url': dep.url,
         'expected_scm': gclient_scm.GetScmName(dep.url),
+        'mirror_string' : mirror_string,
         'actual_url': actual_url,
         'actual_scm': gclient_scm.GetScmName(actual_url)})
 

data/vendor/depot_tools/gclient_scm.py

@@ -173,19 +173,24 @@ class SCMWrapper(object):
     # Get the second token of the first line of the log.
     return log.splitlines()[0].split(' ', 1)[1]
 
+  def GetCacheMirror(self):
+    if (getattr(self, 'cache_dir', None)):
+      url, _ = gclient_utils.SplitUrlRevision(self.url)
+      return git_cache.Mirror(url)
+    return None
+
   def GetActualRemoteURL(self, options):
     """Attempt to determine the remote URL for this SCMWrapper."""
     # Git
     if os.path.exists(os.path.join(self.checkout_path, '.git')):
       actual_remote_url = self._get_first_remote_url(self.checkout_path)
 
-      # If a cache_dir is used, obtain the actual remote URL from the cache.
-      if getattr(self, 'cache_dir', None):
-        url, _ = gclient_utils.SplitUrlRevision(self.url)
-        mirror = git_cache.Mirror(url)
-        if (mirror.exists() and mirror.mirror_path.replace('\\', '/') ==
-            actual_remote_url.replace('\\', '/')):
-          actual_remote_url = self._get_first_remote_url(mirror.mirror_path)
+      mirror = self.GetCacheMirror()
+      # If the cache is used, obtain the actual remote URL from there.
+      if (mirror and mirror.exists() and
+          mirror.mirror_path.replace('\\', '/') ==
+          actual_remote_url.replace('\\', '/')):
+        actual_remote_url = self._get_first_remote_url(mirror.mirror_path)
       return actual_remote_url
 
     # Svn
@@ -553,9 +558,7 @@ class GitWrapper(SCMWrapper):
 
     if current_type == 'detached':
       # case 0
-      if not options.force:
-        # Don't do this check if nuclear option is on.
-        self._CheckClean(rev_str)
+      self._CheckClean(rev_str)
       self._CheckDetachedHead(rev_str, options)
       if self._Capture(['rev-list', '-n', '1', 'HEAD']) == revision:
         self.Print('Up-to-date; skipping checkout.')
@@ -565,7 +568,7 @@ class GitWrapper(SCMWrapper):
         self._Checkout(
             options,
             revision,
-            force=(options.force or options.delete_unversioned_trees),
+            force=(options.force and options.delete_unversioned_trees),
             quiet=True,
         )
       if not printed_path:

data/vendor/depot_tools/gclient_utils.py

@@ -784,6 +784,7 @@ class WorkItem(object):
     self._name = name
     self.outbuf = cStringIO.StringIO()
     self.start = self.finish = None
+    self.resources = []  # List of resources this work item requires.
 
   def run(self, work_queue):
     """work_queue is passed as keyword argument so it should be
@@ -869,6 +870,15 @@ class ExecutionQueue(object):
 ----------------------------------------""" % (
     task.name, comment, elapsed, task.outbuf.getvalue().strip())
 
+  def _is_conflict(self, job):
+    """Checks to see if a job will conflict with another running job."""
+    for running_job in self.running:
+      for used_resource in running_job.item.resources:
+        logging.debug('Checking resource %s' % used_resource)
+        if used_resource in job.resources:
+          return True
+    return False
+
   def flush(self, *args, **kwargs):
     """Runs all enqueued items until all are executed."""
     kwargs['work_queue'] = self
@@ -892,9 +902,10 @@ class ExecutionQueue(object):
             # Verify its requirements.
             if (self.ignore_requirements or
                 not (set(self.queued[i].requirements) - set(self.ran))):
-              # Start one work item: all its requirements are satisfied.
-              self._run_one_task(self.queued.pop(i), args, kwargs)
-              break
+              if not self._is_conflict(self.queued[i]):
+                # Start one work item: all its requirements are satisfied.
+                self._run_one_task(self.queued.pop(i), args, kwargs)
+                break
           else:
             # Couldn't find an item that could run. Break out the outher loop.
             break

data/vendor/depot_tools/git-gs

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

data/vendor/depot_tools/git_cache.py

@@ -38,7 +38,7 @@ except NameError:
 class LockError(Exception):
   pass
 
-class RefsHeadsFailedToFetch(Exception):
+class ClobberNeeded(Exception):
   pass
 
 class Lockfile(object):
@@ -246,7 +246,11 @@ class Mirror(object):
       cwd = self.mirror_path
 
     # Don't run git-gc in a daemon.  Bad things can happen if it gets killed.
-    self.RunGit(['config', 'gc.autodetach', '0'], cwd=cwd)
+    try:
+      self.RunGit(['config', 'gc.autodetach', '0'], cwd=cwd)
+    except subprocess.CalledProcessError:
+      # Hard error, need to clobber.
+      raise ClobberNeeded()
 
     # Don't combine pack files into one big pack file.  It's really slow for
     # repositories, and there's no way to track progress and make sure it's
@@ -407,7 +411,7 @@ class Mirror(object):
         self.RunGit(fetch_cmd + [spec], cwd=rundir, retry=True)
       except subprocess.CalledProcessError:
         if spec == '+refs/heads/*:refs/heads/*':
-          raise RefsHeadsFailedToFetch
+          raise ClobberNeeded()  # Corrupted cache.
         logging.warn('Fetch of %s failed' % spec)
 
   def populate(self, depth=None, shallow=False, bootstrap=False,
@@ -426,7 +430,7 @@ class Mirror(object):
       tempdir = self._ensure_bootstrapped(depth, bootstrap)
       rundir = tempdir or self.mirror_path
       self._fetch(rundir, verbose, depth)
-    except RefsHeadsFailedToFetch:
+    except ClobberNeeded:
       # This is a major failure, we need to clean and force a bootstrap.
       gclient_utils.rmtree(rundir)
       self.print(GIT_CACHE_CORRUPT_MESSAGE)

data/vendor/depot_tools/git_cl.py

@@ -18,11 +18,9 @@ import logging
 import multiprocessing
 import optparse
 import os
-import Queue
 import re
 import stat
 import sys
-import tempfile
 import textwrap
 import time
 import traceback
@@ -132,7 +130,7 @@ def RunGitWithCode(args, suppress_stderr=False):
 
 
 def RunGitSilent(args):
-  """Returns stdout, suppresses stderr and ingores the return code."""
+  """Returns stdout, suppresses stderr and ignores the return code."""
   return RunGitWithCode(args, suppress_stderr=True)[1]
 
 
@@ -929,6 +927,7 @@ class Changelist(object):
 
     self.branchref = branchref
     if self.branchref:
+      assert branchref.startswith('refs/heads/')
       self.branch = ShortBranchName(self.branchref)
     else:
       self.branch = None
@@ -1256,11 +1255,15 @@ class Changelist(object):
       if codereview_server:
         RunGit(['config', codereview_setting, codereview_server])
     else:
-      current_issue = self.GetIssue()
-      if current_issue:
-        RunGit(['config', '--unset', issue_setting])
+      # Reset it regardless. It doesn't hurt.
+      config_settings = [issue_setting, self._codereview_impl.PatchsetSetting()]
+      for prop in (['last-upload-hash'] +
+                    self._codereview_impl._PostUnsetIssueProperties()):
+        config_settings.append('branch.%s.%s' % (self.GetBranch(), prop))
+      for setting in config_settings:
+        RunGit(['config', '--unset', setting], error_ok=True)
       self.issue = None
-      self.SetPatchset(None)
+      self.patchset = None
 
   def GetChange(self, upstream_branch, author):
     if not self.GitSanityChecks(upstream_branch):
@@ -1449,7 +1452,7 @@ class Changelist(object):
   def __getattr__(self, attr):
     # This is because lots of untested code accesses Rietveld-specific stuff
     # directly, and it's hard to fix for sure. So, just let it work, and fix
-    # on a cases by case basis.
+    # on a case by case basis.
     return getattr(self._codereview_impl, attr)
 
 
@@ -1498,6 +1501,10 @@ class _ChangelistCodereviewBase(object):
     """Returns name of git config setting which stores issue number."""
     raise NotImplementedError()
 
+  def _PostUnsetIssueProperties(self):
+    """Which branch-specific properties to erase when unsettin issue."""
+    raise NotImplementedError()
+
   def GetRieveldObjForPresubmit(self):
     # This is an unfortunate Rietveld-embeddedness in presubmit.
     # For non-Rietveld codereviews, this probably should return a dummy object.
@@ -1739,6 +1746,10 @@ class _RietveldChangelistImpl(_ChangelistCodereviewBase):
       return 'branch.%s.rietveldserver' % branch
     return None
 
+  def _PostUnsetIssueProperties(self):
+    """Which branch-specific properties to erase when unsetting issue."""
+    return ['rietveldserver']
+
   def GetRieveldObjForPresubmit(self):
     return self.RpcServer()
 
@@ -1935,7 +1946,7 @@ class _RietveldChangelistImpl(_ChangelistCodereviewBase):
       upstream_branch = ShortBranchName(upstream_branch)
       if remote is '.':
         # A local branch is being tracked.
-        local_branch = ShortBranchName(upstream_branch)
+        local_branch = upstream_branch
         if settings.GetIsSkipDependencyUpload(local_branch):
           print
           print ('Skipping dependency patchset upload because git config '
@@ -1943,7 +1954,7 @@ class _RietveldChangelistImpl(_ChangelistCodereviewBase):
           print
         else:
           auth_config = auth.extract_auth_config_from_options(options)
-          branch_cl = Changelist(branchref=local_branch,
+          branch_cl = Changelist(branchref='refs/heads/'+local_branch,
                                  auth_config=auth_config)
           branch_cl_issue_url = branch_cl.GetIssueURL()
           branch_cl_issue = branch_cl.GetIssue()
@@ -2095,6 +2106,13 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
       return 'branch.%s.gerritserver' % branch
     return None
 
+  def _PostUnsetIssueProperties(self):
+    """Which branch-specific properties to erase when unsetting issue."""
+    return [
+        'gerritserver',
+        'gerritsquashhash',
+    ]
+
   def GetRieveldObjForPresubmit(self):
     class ThisIsNotRietveldIssue(object):
       def __nonzero__(self):
@@ -2138,7 +2156,7 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
     except httplib.HTTPException:
       return 'error'
 
-    if data['status'] == 'ABANDONED':
+    if data['status'] in ('ABANDONED', 'MERGED'):
       return 'closed'
 
     cq_label = data['labels'].get('Commit-Queue', {})
@@ -2296,6 +2314,27 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
           hostname=parsed_url.netloc)
     return None
 
+  def _GerritCommitMsgHookCheck(self, offer_removal):
+    hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
+    if not os.path.exists(hook):
+      return
+    # Crude attempt to distinguish Gerrit Codereview hook from potentially
+    # custom developer made one.
+    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'
+          'It is not neccessary 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.')
+    if offer_removal:
+      reply = ask_for_data('Do you want to remove it now? [Yes/No]')
+      if reply.lower().startswith('y'):
+        gclient_utils.rm_file_or_tree(hook)
+        print('Gerrit commit-msg hook removed.')
+      else:
+        print('OK, will keep Gerrit commit-msg hook in place.')
+
   def CMDUploadChange(self, options, args, change):
     """Upload the current branch to Gerrit."""
     if options.squash and options.no_squash:
@@ -2311,6 +2350,7 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
                           pending_prefix='')
 
     if options.squash:
+      self._GerritCommitMsgHookCheck(offer_removal=not options.force)
       if not self.GetIssue():
         # TODO(tandrii): deperecate this after 2016Q2.  Backwards compatibility
         # with shadow branch, which used to contain change-id for a given
@@ -2468,21 +2508,24 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
         print('WARNING: underscores in title will be converted to spaces.')
       refspec_opts.append('m=' + options.title.replace(' ', '_'))
 
+    if options.send_mail:
+      if not change_desc.get_reviewers():
+        DieWithError('Must specify reviewers to send email.')
+      refspec_opts.append('notify=ALL')
+    else:
+      refspec_opts.append('notify=NONE')
+
     cc = self.GetCCList().split(',')
     if options.cc:
       cc.extend(options.cc)
     cc = filter(None, cc)
     if cc:
-      # refspec_opts.extend('cc=' + email.strip() for email in cc)
-      # TODO(tandrii): enable this back. http://crbug.com/604377
-      print('WARNING: Gerrit doesn\'t yet support cc-ing arbitrary emails.\n'
-            '         Ignoring cc-ed emails. See http://crbug.com/604377.')
+      refspec_opts.extend('cc=' + email.strip() for email in cc)
 
     if change_desc.get_reviewers():
       refspec_opts.extend('r=' + email.strip()
                           for email in change_desc.get_reviewers())
 
-
     refspec_suffix = ''
     if refspec_opts:
       refspec_suffix = '%' + ','.join(refspec_opts)
@@ -2523,7 +2566,7 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
       print 'git-cl: Added Change-Id to commit message.'
       return new_log_desc
     else:
-      print >> sys.stderr, 'ERROR: Gerrit commit-msg hook not available.'
+      DieWithError('ERROR: Gerrit commit-msg hook not installed.')
 
   def SetCQState(self, new_state):
     """Sets the Commit-Queue label assuming canonical CQ config for Gerrit."""
@@ -2668,13 +2711,41 @@ class ChangeDescription(object):
     self.set_description(clean_lines)
 
   def append_footer(self, line):
-    if self._description_lines:
-      # Add an empty line if either the last line or the new line isn't a tag.
-      last_line = self._description_lines[-1]
-      if (not presubmit_support.Change.TAG_LINE_RE.match(last_line) or
-          not presubmit_support.Change.TAG_LINE_RE.match(line)):
-        self._description_lines.append('')
-    self._description_lines.append(line)
+    """Adds a footer line to the description.
+
+    Differentiates legacy "KEY=xxx" footers (used to be called tags) and
+    Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
+    that Gerrit footers are always at the end.
+    """
+    parsed_footer_line = git_footers.parse_footer(line)
+    if parsed_footer_line:
+      # Line is a gerrit footer in the form: Footer-Key: any value.
+      # Thus, must be appended observing Gerrit footer rules.
+      self.set_description(
+          git_footers.add_footer(self.description,
+                                 key=parsed_footer_line[0],
+                                 value=parsed_footer_line[1]))
+      return
+
+    if not self._description_lines:
+      self._description_lines.append(line)
+      return
+
+    top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
+    if gerrit_footers:
+      # git_footers.split_footers ensures that there is an empty line before
+      # actual (gerrit) footers, if any. We have to keep it that way.
+      assert top_lines and top_lines[-1] == ''
+      top_lines, separator = top_lines[:-1], top_lines[-1:]
+    else:
+      separator = []  # No need for separator if there are no gerrit_footers.
+
+    prev_line = top_lines[-1] if top_lines else ''
+    if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
+        not presubmit_support.Change.TAG_LINE_RE.match(line)):
+      top_lines.append('')
+    top_lines.append(line)
+    self._description_lines = top_lines + separator + gerrit_footers
 
   def get_reviewers(self):
     """Retrieves the list of reviewers."""
@@ -2919,21 +2990,9 @@ def color_for_status(status):
     'error': Fore.WHITE,
   }.get(status, Fore.WHITE)
 
-def fetch_cl_status(branch, auth_config=None):
-  """Fetches information for an issue and returns (branch, issue, status)."""
-  cl = Changelist(branchref=branch, auth_config=auth_config)
-  url = cl.GetIssueURL()
-  status = cl.GetStatus()
 
-  if url and (not status or status == 'error'):
-    # The issue probably doesn't exist anymore.
-    url += ' (broken)'
-
-  return (branch, url, status)
-
-def get_cl_statuses(
-    branches, fine_grained, max_processes=None, auth_config=None):
-  """Returns a blocking iterable of (branch, issue, status) for given branches.
+def get_cl_statuses(changes, fine_grained, max_processes=None):
+  """Returns a blocking iterable of (cl, status) for given branches.
 
   If fine_grained is true, this will fetch CL statuses from the server.
   Otherwise, simply indicate if there's a matching url for the given branches.
@@ -2944,50 +3003,45 @@ def get_cl_statuses(
 
   See GetStatus() for a list of possible statuses.
   """
-  def fetch(branch):
-    if not branch:
-      return None
-
-    return fetch_cl_status(branch, auth_config=auth_config)
-
   # Silence upload.py otherwise it becomes unwieldly.
   upload.verbosity = 0
 
   if fine_grained:
     # Process one branch synchronously to work through authentication, then
     # spawn processes to process all the other branches in parallel.
-    if branches:
+    if changes:
+      fetch = lambda cl: (cl, cl.GetStatus())
+      yield fetch(changes[0])
 
-      yield fetch(branches[0])
+      if not changes:
+        # Exit early if there was only one branch to fetch.
+        return
 
-      branches_to_fetch = branches[1:]
+      changes_to_fetch = changes[1:]
       pool = ThreadPool(
-          min(max_processes, len(branches_to_fetch))
+          min(max_processes, len(changes_to_fetch))
               if max_processes is not None
-              else len(branches_to_fetch))
+              else len(changes_to_fetch))
 
-      fetched_branches = set()
-      it = pool.imap_unordered(fetch, branches_to_fetch).__iter__()
+      fetched_cls = set()
+      it = pool.imap_unordered(fetch, changes_to_fetch).__iter__()
       while True:
         try:
           row = it.next(timeout=5)
         except multiprocessing.TimeoutError:
           break
 
-        fetched_branches.add(row[0])
+        fetched_cls.add(row[0])
         yield row
 
       # Add any branches that failed to fetch.
-      for b in set(branches_to_fetch) - fetched_branches:
-        cl = Changelist(branchref=b, auth_config=auth_config)
-        yield (b, cl.GetIssueURL() if b else None, 'error')
+      for cl in set(changes_to_fetch) - fetched_cls:
+        yield (cl, 'error')
 
   else:
     # Do not use GetApprovingReviewers(), since it requires an HTTP request.
-    for b in branches:
-      cl = Changelist(branchref=b, auth_config=auth_config)
-      url = cl.GetIssueURL() if b else None
-      yield (b, url, 'waiting' if url else 'error')
+    for cl in changes:
+      yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
 
 
 def upload_branch_deps(cl, args):
@@ -3090,6 +3144,69 @@ def upload_branch_deps(cl, args):
   return 0
 
 
+def CMDarchive(parser, args):
+  """Archives and deletes branches associated with closed changelists."""
+  parser.add_option(
+      '-j', '--maxjobs', action='store', type=int,
+      help='The maximum number of jobs to use when retrieving review status')
+  parser.add_option(
+      '-f', '--force', action='store_true',
+      help='Bypasses the confirmation prompt.')
+
+  auth.add_auth_options(parser)
+  options, args = parser.parse_args(args)
+  if args:
+    parser.error('Unsupported args: %s' % ' '.join(args))
+  auth_config = auth.extract_auth_config_from_options(options)
+
+  branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
+  if not branches:
+    return 0
+
+  print 'Finding all branches associated with closed issues...'
+  changes = [Changelist(branchref=b, auth_config=auth_config)
+              for b in branches.splitlines()]
+  alignment = max(5, max(len(c.GetBranch()) for c in changes))
+  statuses = get_cl_statuses(changes,
+                             fine_grained=True,
+                             max_processes=options.maxjobs)
+  proposal = [(cl.GetBranch(),
+               'git-cl-archived-%s-%s' % (cl.GetIssue(), cl.GetBranch()))
+              for cl, status in statuses
+              if status == 'closed']
+  proposal.sort()
+
+  if not proposal:
+    print 'No branches with closed codereview issues found.'
+    return 0
+
+  current_branch = GetCurrentBranch()
+
+  print '\nBranches with closed issues that will be archived:\n'
+  print '%*s | %s' % (alignment, 'Branch name', 'Archival tag name')
+  for next_item in proposal:
+    print '%*s   %s' % (alignment, next_item[0], next_item[1])
+
+  if any(branch == current_branch for branch, _ in proposal):
+    print('You are currently on a branch \'%s\' which is associated with a '
+          'closed codereview issue, so archive cannot proceed. Please '
+          'checkout another branch and run this command again.' %
+          current_branch)
+    return 1
+
+  if not options.force:
+    if ask_for_data('\nProceed with deletion (Y/N)? ').lower() != 'y':
+      print 'Aborted.'
+      return 1
+
+  for branch, tagname in proposal:
+    RunGit(['tag', tagname, branch])
+    RunGit(['branch', '-D', branch])
+  print '\nJob\'s done!'
+
+  return 0
+
+
 def CMDstatus(parser, args):
   """Show status of changelists.
 
@@ -3140,25 +3257,27 @@ def CMDstatus(parser, args):
     print('No local branch found.')
     return 0
 
-  changes = (
+  changes = [
       Changelist(branchref=b, auth_config=auth_config)
-      for b in branches.splitlines())
-  # TODO(tandrii): refactor to use CLs list instead of branches list.
-  branches = [c.GetBranch() for c in changes]
-  alignment = max(5, max(len(b) for b in branches))
+      for b in branches.splitlines()]
   print 'Branches associated with reviews:'
-  output = get_cl_statuses(branches,
+  output = get_cl_statuses(changes,
                            fine_grained=not options.fast,
-                           max_processes=options.maxjobs,
-                           auth_config=auth_config)
+                           max_processes=options.maxjobs)
 
   branch_statuses = {}
-  alignment = max(5, max(len(ShortBranchName(b)) for b in branches))
-  for branch in sorted(branches):
+  alignment = max(5, max(len(ShortBranchName(c.GetBranch())) for c in changes))
+  for cl in sorted(changes, key=lambda c: c.GetBranch()):
+    branch = cl.GetBranch()
     while branch not in branch_statuses:
-      b, i, status = output.next()
-      branch_statuses[b] = (i, status)
-    issue_url, status = branch_statuses.pop(branch)
+      c, status = output.next()
+      branch_statuses[c.GetBranch()] = status
+    status = branch_statuses.pop(branch)
+    url = cl.GetIssueURL()
+    if url and (not status or status == 'error'):
+      # The issue probably doesn't exist anymore.
+      url += ' (broken)'
+
     color = color_for_status(status)
     reset = Fore.RESET
     if not setup_color.IS_TTY:
@@ -3166,8 +3285,8 @@ def CMDstatus(parser, args):
       reset = ''
     status_str = '(%s)' % status if status else ''
     print '  %*s : %s%s %s%s' % (
-          alignment, ShortBranchName(branch), color, issue_url, status_str,
-          reset)
+          alignment, ShortBranchName(branch), color, url,
+          status_str, reset)
 
   cl = Changelist(auth_config=auth_config)
   print
@@ -4106,14 +4225,18 @@ def CMDpatch(parser, args):
   _process_codereview_select_options(parser, options)
   auth_config = auth.extract_auth_config_from_options(options)
 
-  cl = Changelist(auth_config=auth_config, codereview=options.forced_codereview)
 
-  issue_arg = None
   if options.reapply :
+    if options.newbranch:
+      parser.error('--reapply works on the current branch only')
     if len(args) > 0:
-      parser.error('--reapply implies no additional arguments.')
+      parser.error('--reapply implies no additional arguments')
+
+    cl = Changelist(auth_config=auth_config,
+                    codereview=options.forced_codereview)
+    if not cl.GetIssue():
+      parser.error('current branch must have an associated issue')
 
-    issue_arg = cl.GetIssue()
     upstream = cl.GetUpstreamBranch()
     if upstream == None:
       parser.error('No upstream branch specified. Cannot reset branch')
@@ -4121,37 +4244,34 @@ def CMDpatch(parser, args):
     RunGit(['reset', '--hard', upstream])
     if options.pull:
       RunGit(['pull'])
-  else:
-    if len(args) != 1:
-      parser.error('Must specify issue number or url')
-    issue_arg = args[0]
 
-  if not issue_arg:
-    parser.print_help()
-    return 1
+    return cl.CMDPatchIssue(cl.GetIssue(), options.reject, options.nocommit,
+                            options.directory)
 
-  if cl.IsGerrit():
-    if options.reject:
-      parser.error('--reject is not supported with Gerrit codereview.')
-    if options.nocommit:
-      parser.error('--nocommit is not supported with Gerrit codereview.')
-    if options.directory:
-      parser.error('--directory is not supported with Gerrit codereview.')
+  if len(args) != 1 or not args[0]:
+    parser.error('Must specify issue number or url')
 
   # We don't want uncommitted changes mixed up with the patch.
   if git_common.is_dirty_git_tree('patch'):
     return 1
 
   if options.newbranch:
-    if options.reapply:
-      parser.error("--reapply excludes any option other than --pull")
     if options.force:
       RunGit(['branch', '-D', options.newbranch],
-          stderr=subprocess2.PIPE, error_ok=True)
-    RunGit(['checkout', '-b', options.newbranch,
-            Changelist().GetUpstreamBranch()])
+             stderr=subprocess2.PIPE, error_ok=True)
+    RunGit(['new-branch', options.newbranch])
+
+  cl = Changelist(auth_config=auth_config, codereview=options.forced_codereview)
 
-  return cl.CMDPatchIssue(issue_arg, options.reject, options.nocommit,
+  if cl.IsGerrit():
+    if options.reject:
+      parser.error('--reject is not supported with Gerrit codereview.')
+    if options.nocommit:
+      parser.error('--nocommit is not supported with Gerrit codereview.')
+    if options.directory:
+      parser.error('--directory is not supported with Gerrit codereview.')
+
+  return cl.CMDPatchIssue(args[0], options.reject, options.nocommit,
                           options.directory)
 
 
@@ -4364,7 +4484,10 @@ def CMDtry(parser, args):
               # Skip presubmit builders, because these will fail without LGTM.
               masters.setdefault(master, {})[builder] = ['defaulttests']
           if masters:
+            print('Loaded default bots from CQ config (%s)' % cq_cfg)
             return masters
+          else:
+            print('CQ config exists (%s) but has no try bots listed' % cq_cfg)
 
     if not options.bot:
       parser.error('No default try builder to try, use --bot')