libv8 5.3.332.38.5 → 5.6.326.50.0beta1

data/vendor/depot_tools/man/src/depot_tools.txt

@@ -17,7 +17,7 @@ to the development flow, in the sense that you cannot successfully develop
 Chromium without them.
 
 Other tools are merely 'helper' tools. Not required, but they can substantially
-ease the develpment workflow.
+ease the development workflow.
 
 A listing of both categories of tools follows.
 

data/vendor/depot_tools/man/src/depot_tools_tutorial.txt

@@ -96,8 +96,8 @@ extract it somewhere.
 extract the hidden ``.git'' folder which is necessary for 'depot_tools' to
 autoupdate itself. You can use ``Extract all...'' from the context menu though.
 
-Add 'depot_tools' to the 'end' of your PATH. Assuming you unzipped the
-bundle to `C:\workspace\depot_tools`:
+Add 'depot_tools' to the 'start' of your PATH (must be ahead of any installs of
+Python). Assuming you unzipped the bundle to `C:\workspace\depot_tools`:
 
 With Administrator access: ::
   *Control Panel -> System and Security -> System -> Advanced system settings*
@@ -107,7 +107,7 @@ Modify the PATH system variable to include `C:\workspace\depot_tools`.
 Without Administrator access: ::
   *Control Panel -> User Accounts -> User Accounts -> Change my environment variables*
 +
-Add a PATH user variable: `%PATH%;C:\workspace\depot_tools`.
+Add a PATH user variable: `C:\workspace\depot_tools;%PATH%`.
 
 From a `cmd.exe` shell, run the command `gclient` (without arguments). On first
 run, gclient will install all the Windows-specific bits needed to work with the
@@ -121,10 +121,10 @@ code, including msysgit and python.
 * If you see strange errors with the file system on the first run of gclient,
   you may want to link:http://tortoisesvn.tigris.org/faq.html#cantmove2[disable
   Windows Indexing].
-* If you are running Windows XP and see errors like ``The system cannot execute
-  the specified program'', try installing the
-  link:http://code.google.com/p/chromium/issues/detail?id=75886[``Microsoft
-  Visual C++ 2008 Redistributable Package''].
+* After running gclient open a command prompt and type `where python` and confirm that
+  the depot_tools python.bat comes ahead of any copies of python.exe. Failing to ensure
+  this can lead to overbuilding when using gn - see
+  link:https://bugs.chromium.org/p/chromium/issues/detail?id=611087[crbug.com/611087].
 =====
 endif::backend-xhtml11[]
 

data/vendor/depot_tools/man/src/filter_demo_output.py

@@ -20,8 +20,8 @@ if not os.path.exists('ansi2html'):
 # if it doesn't exist, run ./make_docs.sh first
 sys.path.insert(0, 'ansi2html')
 
-import ansi2html            # pylint: disable=F0401, W0611
-import ansi2html.converter  # pylint: disable=F0401, W0611
+import ansi2html            # pylint: disable=import-error, W0611
+import ansi2html.converter  # pylint: disable=import-error, W0611
 
 def simpleXML(string):
   BRIGHT = 1

data/vendor/depot_tools/man/src/git-footers.demo.1.sh

@@ -4,7 +4,7 @@
 add deleted_file
 add unstaged_deleted_file
 add modified_file
-c 'I commited this and am proud of it.
+c 'I committed this and am proud of it.
 
 Cr-Commit-Position: refs/heads/master@{#292272}
 Tech-Debt-Introduced: 17 microMSOffices

data/vendor/depot_tools/man/src/git-retry.txt

@@ -9,7 +9,7 @@ include::_git-retry_desc.helper.txt[]
 SYNOPSIS
 --------
 [verse]
-'git retry' [-v] [-c COUNT] [-d DELAY] [-e] -- _<git_subcommand>_
+'git retry' [-v] [-c COUNT] [-d DELAY] [-D DELAY_FACTOR] -- _<git_subcommand>_
 
 DESCRIPTION
 -----------

data/vendor/depot_tools/man/src/git-squash-branch.txt

@@ -17,7 +17,7 @@ DESCRIPTION
 `git squash-branch` is a simple helper command. It takes all the commits on the
 current branch from the 'merge_base' to HEAD, and reduces them to a single
 commit. The new commit will contain a summary of all the commits which were
-squashed, preceeded by a header message indicating that it's the result of a
+squashed, preceded by a header message indicating that it's the result of a
 squash (or the message you pass on the command line.).
 
 Squashing branches is useful when trying to rebase-update over branches which
@@ -35,7 +35,7 @@ OPTIONS
 -m <message>::
 --message=<message>::
   Optional message to use for the first line of the squashed commit. If omitted,
-  it defaults to "git squash commit.".
+  it defaults to "git squash commit for <branch>.".
 
 EXAMPLE
 -------

data/vendor/depot_tools/man/src/git-upstream-diff.txt

@@ -14,7 +14,7 @@ SYNOPSIS
 DESCRIPTION
 -----------
 
-Shows a diff beween your current branch and it's upstream. This is 'roughly' the
+Shows a diff between your current branch and it's upstream. This is 'roughly' the
 same as:
 
 ----

data/vendor/depot_tools/my_activity.py

@@ -46,14 +46,14 @@ import auth
 from third_party import httplib2
 
 try:
-  from dateutil.relativedelta import relativedelta # pylint: disable=F0401
+  from dateutil.relativedelta import relativedelta # pylint: disable=import-error
 except ImportError:
   print 'python-dateutil package required'
   exit(1)
 
 # python-keyring provides easy access to the system keyring.
 try:
-  import keyring  # pylint: disable=W0611,F0401
+  import keyring  # pylint: disable=unused-import,F0401
 except ImportError:
   print 'Consider installing python-keyring'
 
@@ -433,6 +433,9 @@ class MyActivity(object):
               instance["name"], item["id"]),
           "comments": []
         }
+        if 'shorturl' in instance:
+          issue['url'] = 'http://%s/%d' % (instance['shorturl'], item['id'])
+
         if 'owner' in item:
           issue['owner'] = item['owner']['name']
         else:
@@ -665,7 +668,7 @@ def main():
 
   # Remove description formatting
   parser.format_description = (
-      lambda _: parser.description)  # pylint: disable=E1101
+      lambda _: parser.description)  # pylint: disable=no-member
 
   options, args = parser.parse_args()
   options.local_user = os.environ.get('USER')

data/vendor/depot_tools/my_reviews.py

@@ -338,7 +338,7 @@ def main():
   auth.add_auth_options(parser)
   # Remove description formatting
   parser.format_description = (
-      lambda _: parser.description)  # pylint: disable=E1101
+      lambda _: parser.description)  # pylint: disable=no-member
   options, args = parser.parse_args()
   auth_config = auth.extract_auth_config_from_options(options)
   if args:

data/vendor/depot_tools/ninja

@@ -12,7 +12,7 @@ cat <<-EOF
 No prebuilt ninja binary was found for this system.
 Try building your own binary by doing:
   cd ~
-  git clone https://github.com/martine/ninja.git -b v1.7.1
+  git clone https://github.com/martine/ninja.git -b v1.7.2
   cd ninja && ./configure.py --bootstrap
 Then add ~/ninja/ to your PATH.
 EOF
@@ -25,7 +25,7 @@ case "$OS" in
       i?86|x86_64)
         LONG_BIT=$(getconf LONG_BIT)
         # We know we are on x86 but we need to use getconf to determine
-        # bittage of the userspace install (e.g. when runing 32-bit userspace
+        # bittage of the userspace install (e.g. when running 32-bit userspace
         # on x86_64 kernel)
         exec "${THIS_DIR}/ninja-linux${LONG_BIT}" "$@";;
       *)

data/vendor/depot_tools/owners.py

@@ -71,7 +71,7 @@ BASIC_EMAIL_REGEXP = r'^[\w\-\+\%\.]+\@[\w\-\+\%\.]+$'
 def _assert_is_collection(obj):
   assert not isinstance(obj, basestring)
   # Module 'collections' has no 'Iterable' member
-  # pylint: disable=E1101
+  # pylint: disable=no-member
   if hasattr(collections, 'Iterable') and hasattr(collections, 'Sized'):
     assert (isinstance(obj, collections.Iterable) and
             isinstance(obj, collections.Sized))
@@ -118,6 +118,9 @@ class Database(object):
     # Mapping reviewers to the preceding comment per file in the OWNERS files.
     self.comments = {}
 
+    # Cache of compiled regexes for _fnmatch()
+    self._fnmatch_cache = {}
+
     # Set of paths that stop us from looking above them for owners.
     # (This is implicitly true for the root directory).
     self._stop_looking = set([''])
@@ -197,13 +200,13 @@ class Database(object):
         dirpath = self.os_path.dirname(dirpath)
 
   def _should_stop_looking(self, objname):
-    return any(fnmatch.fnmatch(objname, stop_looking)
+    return any(self._fnmatch(objname, stop_looking)
                for stop_looking in self._stop_looking)
 
   def _owners_for(self, objname):
     obj_owners = set()
     for owned_path, path_owners in self._paths_to_owners.iteritems():
-      if fnmatch.fnmatch(objname, owned_path):
+      if self._fnmatch(objname, owned_path):
         obj_owners |= path_owners
     return obj_owners
 
@@ -339,6 +342,14 @@ class Database(object):
         distance += 1
     return all_possible_owners
 
+  def _fnmatch(self, filename, pattern):
+    """Same as fnmatch.fnmatch(), but interally caches the compiled regexes."""
+    matcher = self._fnmatch_cache.get(pattern)
+    if matcher is None:
+      matcher = re.compile(fnmatch.translate(pattern)).match
+      self._fnmatch_cache[pattern] = matcher
+    return matcher(filename)
+
   @staticmethod
   def total_costs_by_owner(all_possible_owners, dirs):
     # We want to minimize both the number of reviewers and the distance

data/vendor/depot_tools/presubmit_canned_checks.py

@@ -106,6 +106,33 @@ def CheckChangeWasUploaded(input_api, output_api):
 
 ### Content checks
 
+def CheckAuthorizedAuthor(input_api, output_api):
+  """For non-googler/chromites committers, verify the author's email address is
+  in AUTHORS.
+  """
+  author = input_api.change.author_email
+  if not author:
+    input_api.logging.info('No author, skipping AUTHOR check')
+    return []
+  authors_path = input_api.os_path.join(
+      input_api.PresubmitLocalPath(), 'AUTHORS')
+  valid_authors = (
+      input_api.re.match(r'[^#]+\s+\<(.+?)\>\s*$', line)
+      for line in open(authors_path))
+  valid_authors = [item.group(1).lower() for item in valid_authors if item]
+  if not any(input_api.fnmatch.fnmatch(author.lower(), valid)
+             for valid in valid_authors):
+    input_api.logging.info('Valid authors are %s', ', '.join(valid_authors))
+    return [output_api.PresubmitPromptWarning(
+        ('%s is not in AUTHORS file. If you are a new contributor, please visit'
+        '\n'
+        'http://www.chromium.org/developers/contributing-code and read the '
+        '"Legal" section\n'
+        'If you are a chromite, verify the contributor signed the CLA.') %
+        author)]
+  return []
+
+
 def CheckDoNotSubmitInFiles(input_api, output_api):
   """Checks that the user didn't add 'DO NOT ''SUBMIT' to any files."""
   # We want to check every text file, not just source files.
@@ -127,7 +154,7 @@ def CheckChangeLintsClean(input_api, output_api, source_file_filter=None,
 
   cpplint = input_api.cpplint
   # Access to a protected member _XX of a client class
-  # pylint: disable=W0212
+  # pylint: disable=protected-access
   cpplint._cpplint_state.ResetErrorCounts()
 
   lint_filters = lint_filters or DEFAULT_LINT_FILTERS
@@ -420,53 +447,6 @@ def CheckLicense(input_api, output_api, license_re, source_file_filter=None,
   return []
 
 
-def CheckChangeSvnEolStyle(input_api, output_api, source_file_filter=None):
-  """Checks that the source files have svn:eol-style=LF."""
-  return CheckSvnProperty(input_api, output_api,
-                          'svn:eol-style', 'LF',
-                          input_api.AffectedSourceFiles(source_file_filter))
-
-
-def CheckSvnForCommonMimeTypes(input_api, output_api):
-  """Checks that common binary file types have the correct svn:mime-type."""
-  output = []
-  files = input_api.AffectedFiles(include_deletes=False)
-  def IsExts(x, exts):
-    path = x.LocalPath()
-    for extension in exts:
-      if path.endswith(extension):
-        return True
-    return False
-  def FilterFiles(extension):
-    return filter(lambda x: IsExts(x, extension), files)
-  def RunCheck(mime_type, files):
-    output.extend(CheckSvnProperty(input_api, output_api, 'svn:mime-type',
-                                   mime_type, files))
-  RunCheck('application/pdf', FilterFiles(['.pdf']))
-  RunCheck('image/bmp', FilterFiles(['.bmp']))
-  RunCheck('image/gif', FilterFiles(['.gif']))
-  RunCheck('image/png', FilterFiles(['.png']))
-  RunCheck('image/jpeg', FilterFiles(['.jpg', '.jpeg', '.jpe']))
-  RunCheck('image/vnd.microsoft.icon', FilterFiles(['.ico']))
-  return output
-
-
-def CheckSvnProperty(input_api, output_api, prop, expected, affected_files):
-  """Checks that affected_files files have prop=expected."""
-  if input_api.change.scm != 'svn':
-    return []
-
-  bad = filter(lambda f: f.Property(prop) != expected, affected_files)
-  if bad:
-    if input_api.is_committing:
-      res_type = output_api.PresubmitError
-    else:
-      res_type = output_api.PresubmitNotifyResult
-    message = 'Run the command: svn pset %s %s \\' % (prop, expected)
-    return [res_type(message, items=bad)]
-  return []
-
-
 ### Other checks
 
 def CheckDoNotSubmit(input_api, output_api):
@@ -878,18 +858,19 @@ def CheckOwners(input_api, output_api, source_file_filter=None):
     if input_api.tbr:
       return [output_api.PresubmitNotifyResult(
           '--tbr was specified, skipping OWNERS check')]
+    needed = 'LGTM from an OWNER'
+    output_fn = output_api.PresubmitError
     if input_api.change.issue:
       if input_api.dry_run:
-        return [output_api.PresubmitNotifyResult(
-            'This is a dry run, skipping OWNERS check')]
+        output_fn = lambda text: output_api.PresubmitNotifyResult(
+            'This is a dry run, but these failures would be reported on ' +
+            'commit:\n' + text)
     else:
       return [output_api.PresubmitError("OWNERS check failed: this change has "
           "no Rietveld issue number, so we can't check it for approvals.")]
-    needed = 'LGTM from an OWNER'
-    output = output_api.PresubmitError
   else:
     needed = 'OWNER reviewers'
-    output = output_api.PresubmitNotifyResult
+    output_fn = output_api.PresubmitNotifyResult
 
   affected_files = set([f.LocalPath() for f in
       input_api.change.AffectedFiles(file_filter=source_file_filter)])
@@ -911,17 +892,17 @@ def CheckOwners(input_api, output_api, source_file_filter=None):
 
   if missing_files:
     output_list = [
-        output('Missing %s for these files:\n    %s' %
-               (needed, '\n    '.join(sorted(missing_files))))]
+        output_fn('Missing %s for these files:\n    %s' %
+                  (needed, '\n    '.join(sorted(missing_files))))]
     if not input_api.is_committing:
       suggested_owners = owners_db.reviewers_for(missing_files, owner_email)
-      output_list.append(output('Suggested OWNERS: ' +
+      output_list.append(output_fn('Suggested OWNERS: ' +
           '(Use "git-cl owners" to interactively select owners.)\n    %s' %
           ('\n    '.join(suggested_owners or []))))
     return output_list
 
   if input_api.is_committing and not reviewers:
-    return [output('Missing LGTM from someone other than %s' % owner_email)]
+    return [output_fn('Missing LGTM from someone other than %s' % owner_email)]
   return []
 
 def GetCodereviewOwnerAndReviewers(input_api, email_regexp, approval_needed):
@@ -1124,17 +1105,11 @@ def PanProjectChecks(input_api, output_api,
   snapshot("checking nsobjects")
   results.extend(_CheckConstNSObject(
       input_api, output_api, source_file_filter=sources))
-  snapshot("checking eol style")
-  results.extend(input_api.canned_checks.CheckChangeSvnEolStyle(
-      input_api, output_api, source_file_filter=text_files))
   snapshot("checking license")
   results.extend(input_api.canned_checks.CheckLicense(
       input_api, output_api, license_header, source_file_filter=sources))
 
   if input_api.is_committing:
-    snapshot("checking svn mime types")
-    results.extend(input_api.canned_checks.CheckSvnForCommonMimeTypes(
-        input_api, output_api))
     snapshot("checking was uploaded")
     results.extend(input_api.canned_checks.CheckChangeWasUploaded(
         input_api, output_api))
@@ -1150,9 +1125,13 @@ def PanProjectChecks(input_api, output_api,
   return results
 
 
-def CheckPatchFormatted(input_api, output_api):
+def CheckPatchFormatted(input_api, output_api, check_js=False):
   import git_cl
-  cmd = ['cl', 'format', '--dry-run', input_api.PresubmitLocalPath()]
+  cmd = ['cl', 'format', '--dry-run']
+  if check_js:
+    cmd.append('--js')
+  cmd.append(input_api.PresubmitLocalPath())
+
   code, _ = git_cl.RunGitWithCode(cmd, suppress_stderr=True)
   if code == 2:
     short_path = input_api.basename(input_api.PresubmitLocalPath())
@@ -1160,8 +1139,8 @@ def CheckPatchFormatted(input_api, output_api):
                                           input_api.change.RepositoryRoot())
     return [output_api.PresubmitPromptWarning(
       'The %s directory requires source formatting. '
-      'Please run git cl format %s' %
-      (short_path, full_path))]
+      'Please run git cl format %s%s' %
+      (short_path, '--js ' if check_js else '', full_path))]
   # As this is just a warning, ignore all other errors if the user
   # happens to have a broken clang-format, doesn't use git, etc etc.
   return []

data/vendor/depot_tools/presubmit_support.py

@@ -197,9 +197,16 @@ class GerritAccessor(object):
 
   def _FetchChangeDetail(self, issue):
     # Separate function to be easily mocked in tests.
-    return gerrit_util.GetChangeDetail(
-        self.host, str(issue),
-        ['ALL_REVISIONS', 'DETAILED_LABELS'])
+    try:
+      return gerrit_util.GetChangeDetail(
+          self.host, str(issue),
+          ['ALL_REVISIONS', 'DETAILED_LABELS', 'ALL_COMMITS'],
+          ignore_404=False)
+    except gerrit_util.GerritError as e:
+      if e.http_status == 404:
+        raise Exception('Either Gerrit issue %s doesn\'t exist, or '
+                        'no credentials to fetch issue details' % issue)
+      raise
 
   def GetChangeInfo(self, issue):
     """Returns labels and all revisions (patchsets) for this issue.
@@ -233,12 +240,7 @@ class GerritAccessor(object):
       rev = info['current_revision']
       rev_info = info['revisions'][rev]
 
-    # Updates revision info, which is part of cached issue info.
-    if 'real_description' not in rev_info:
-      rev_info['real_description'] = (
-          gerrit_util.GetChangeDescriptionFromGitiles(
-              rev_info['fetch']['http']['url'], rev))
-    return rev_info['real_description']
+    return rev_info['commit']['message']
 
   def GetChangeOwner(self, issue):
     return self.GetChangeInfo(issue)['owner']['email']
@@ -246,7 +248,7 @@ class GerritAccessor(object):
   def GetChangeReviewers(self, issue, approving_only=True):
     cr = self.GetChangeInfo(issue)['labels']['Code-Review']
     max_value = max(int(k) for k in cr['values'].keys())
-    return [r['email'] for r in cr['all']
+    return [r.get('email') for r in cr.get('all', [])
             if not approving_only or r.get('value', 0) == max_value]
 
 
@@ -269,13 +271,45 @@ class OutputApi(object):
       return self.PresubmitNotifyResult(*args, **kwargs)
     return self.PresubmitPromptWarning(*args, **kwargs)
 
+  def EnsureCQIncludeTrybotsAreAdded(self, cl, bots_to_include, message):
+    """Helper for any PostUploadHook wishing to add CQ_INCLUDE_TRYBOTS.
+
+    Merges the bots_to_include into the current CQ_INCLUDE_TRYBOTS list,
+    keeping it alphabetically sorted. Returns the results that should be
+    returned from the PostUploadHook.
+
+    Args:
+      cl: The git_cl.Changelist object.
+      bots_to_include: A list of strings of bots to include, in the form
+        "master:slave".
+      message: A message to be printed in the case that
+        CQ_INCLUDE_TRYBOTS was updated.
+    """
+    description = cl.GetDescription(force=True)
+    all_bots = []
+    include_re = re.compile(r'^CQ_INCLUDE_TRYBOTS=(.*)', re.M | re.I)
+    m = include_re.search(description)
+    if m:
+      all_bots = [i.strip() for i in m.group(1).split(';') if i.strip()]
+    if set(all_bots) >= set(bots_to_include):
+      return []
+    # Sort the bots to keep them in some consistent order -- not required.
+    all_bots = sorted(set(all_bots) | set(bots_to_include))
+    new_include_trybots = 'CQ_INCLUDE_TRYBOTS=%s' % ';'.join(all_bots)
+    if m:
+      new_description = include_re.sub(new_include_trybots, description)
+    else:
+      new_description = description + '\n' + new_include_trybots + '\n'
+    cl.UpdateDescription(new_description, force=True)
+    return [self.PresubmitNotifyResult(message)]
+
 
 class InputApi(object):
   """An instance of this object is passed to presubmit scripts so they can
   know stuff about the change they're looking at.
   """
   # Method could be a function
-  # pylint: disable=R0201
+  # pylint: disable=no-self-use
 
   # File extensions that are considered source files from a style guide
   # perspective. Don't modify this list from a presubmit script!
@@ -394,7 +428,7 @@ class InputApi(object):
     # Replace <hash_map> and <hash_set> as headers that need to be included
     # with "base/containers/hash_tables.h" instead.
     # Access to a protected member _XX of a client class
-    # pylint: disable=W0212
+    # pylint: disable=protected-access
     self.cpplint._re_pattern_templates = [
       (a, b, 'base/containers/hash_tables.h')
         if header in ('<hash_map>', '<hash_set>') else (a, b, header)
@@ -411,35 +445,7 @@ class InputApi(object):
     """
     return self._current_presubmit_path
 
-  def DepotToLocalPath(self, depot_path):
-    """Translate a depot path to a local path (relative to client root).
-
-    Args:
-      Depot path as a string.
-
-    Returns:
-      The local path of the depot path under the user's current client, or None
-      if the file is not mapped.
-
-      Remember to check for the None case and show an appropriate error!
-    """
-    return scm.SVN.CaptureLocalInfo([depot_path], self.change.RepositoryRoot()
-        ).get('Path')
-
-  def LocalToDepotPath(self, local_path):
-    """Translate a local path to a depot path.
-
-    Args:
-      Local path (relative to current directory, or absolute) as a string.
-
-    Returns:
-      The depot path (SVN URL) of the file if mapped, otherwise None.
-    """
-    return scm.SVN.CaptureLocalInfo([local_path], self.change.RepositoryRoot()
-        ).get('URL')
-
-  def AffectedFiles(self, include_dirs=False, include_deletes=True,
-                    file_filter=None):
+  def AffectedFiles(self, include_deletes=True, file_filter=None):
     """Same as input_api.change.AffectedFiles() except only lists files
     (and optionally directories) in the same directory as the current presubmit
     script, or subdirectories thereof.
@@ -450,34 +456,34 @@ class InputApi(object):
 
     return filter(
         lambda x: normpath(x.AbsoluteLocalPath()).startswith(dir_with_slash),
-        self.change.AffectedFiles(include_dirs, include_deletes, file_filter))
+        self.change.AffectedFiles(include_deletes, file_filter))
 
-  def LocalPaths(self, include_dirs=False):
+  def LocalPaths(self):
     """Returns local paths of input_api.AffectedFiles()."""
-    paths = [af.LocalPath() for af in self.AffectedFiles(include_dirs)]
+    paths = [af.LocalPath() for af in self.AffectedFiles()]
     logging.debug("LocalPaths: %s", paths)
     return paths
 
-  def AbsoluteLocalPaths(self, include_dirs=False):
+  def AbsoluteLocalPaths(self):
     """Returns absolute local paths of input_api.AffectedFiles()."""
-    return [af.AbsoluteLocalPath() for af in self.AffectedFiles(include_dirs)]
-
-  def ServerPaths(self, include_dirs=False):
-    """Returns server paths of input_api.AffectedFiles()."""
-    return [af.ServerPath() for af in self.AffectedFiles(include_dirs)]
+    return [af.AbsoluteLocalPath() for af in self.AffectedFiles()]
 
-  def AffectedTextFiles(self, include_deletes=None):
-    """Same as input_api.change.AffectedTextFiles() except only lists files
+  def AffectedTestableFiles(self, include_deletes=None):
+    """Same as input_api.change.AffectedTestableFiles() except only lists files
     in the same directory as the current presubmit script, or subdirectories
     thereof.
     """
     if include_deletes is not None:
-      warn("AffectedTextFiles(include_deletes=%s)"
+      warn("AffectedTestableFiles(include_deletes=%s)"
                " is deprecated and ignored" % str(include_deletes),
            category=DeprecationWarning,
            stacklevel=2)
-    return filter(lambda x: x.IsTextFile(),
-                  self.AffectedFiles(include_dirs=False, include_deletes=False))
+    return filter(lambda x: x.IsTestableFile(),
+                  self.AffectedFiles(include_deletes=False))
+
+  def AffectedTextFiles(self, include_deletes=None):
+    """An alias to AffectedTestableFiles for backwards compatibility."""
+    return self.AffectedTestableFiles(include_deletes=include_deletes)
 
   def FilterSourceFile(self, affected_file, white_list=None, black_list=None):
     """Filters out files that aren't considered "source file".
@@ -494,20 +500,19 @@ class InputApi(object):
       local_path = affected_file.LocalPath()
       for item in items:
         if self.re.match(item, local_path):
-          logging.debug("%s matched %s", item, local_path)
           return True
       return False
     return (Find(affected_file, white_list or self.DEFAULT_WHITE_LIST) and
             not Find(affected_file, black_list or self.DEFAULT_BLACK_LIST))
 
   def AffectedSourceFiles(self, source_file):
-    """Filter the list of AffectedTextFiles by the function source_file.
+    """Filter the list of AffectedTestableFiles by the function source_file.
 
     If source_file is None, InputApi.FilterSourceFile() is used.
     """
     if not source_file:
       source_file = self.FilterSourceFile
-    return filter(source_file, self.AffectedTextFiles())
+    return filter(source_file, self.AffectedTestableFiles())
 
   def RightHandSideLines(self, source_file_filter=None):
     """An iterator over all text lines in "new" version of changed files.
@@ -580,19 +585,6 @@ class _DiffCache(object):
     raise NotImplementedError()
 
 
-class _SvnDiffCache(_DiffCache):
-  """DiffCache implementation for subversion."""
-  def __init__(self, *args, **kwargs):
-    super(_SvnDiffCache, self).__init__(*args, **kwargs)
-    self._diffs_by_file = {}
-
-  def GetDiff(self, path, local_root):
-    if path not in self._diffs_by_file:
-      self._diffs_by_file[path] = scm.SVN.GenerateDiff([path], local_root,
-                                                       False, None)
-    return self._diffs_by_file[path]
-
-
 class _GitDiffCache(_DiffCache):
   """DiffCache implementation for git; gets all file diffs at once."""
   def __init__(self, upstream):
@@ -641,25 +633,17 @@ class AffectedFile(object):
   DIFF_CACHE = _DiffCache
 
   # Method could be a function
-  # pylint: disable=R0201
+  # pylint: disable=no-self-use
   def __init__(self, path, action, repository_root, diff_cache):
     self._path = path
     self._action = action
     self._local_root = repository_root
     self._is_directory = None
-    self._properties = {}
     self._cached_changed_contents = None
     self._cached_new_contents = None
     self._diff_cache = diff_cache
     logging.debug('%s(%s)', self.__class__.__name__, self._path)
 
-  def ServerPath(self):
-    """Returns a path string that identifies the file in the SCM system.
-
-    Returns the empty string if the file does not exist in SCM.
-    """
-    return ''
-
   def LocalPath(self):
     """Returns the path of this file on the local disk relative to client root.
     """
@@ -670,32 +654,22 @@ class AffectedFile(object):
     """
     return os.path.abspath(os.path.join(self._local_root, self.LocalPath()))
 
-  def IsDirectory(self):
-    """Returns true if this object is a directory."""
-    if self._is_directory is None:
-      path = self.AbsoluteLocalPath()
-      self._is_directory = (os.path.exists(path) and
-                            os.path.isdir(path))
-    return self._is_directory
-
   def Action(self):
     """Returns the action on this opened file, e.g. A, M, D, etc."""
     # TODO(maruel): Somewhat crappy, Could be "A" or "A  +" for svn but
     # different for other SCM.
     return self._action
 
-  def Property(self, property_name):
-    """Returns the specified SCM property of this file, or None if no such
-    property.
-    """
-    return self._properties.get(property_name, None)
-
-  def IsTextFile(self):
+  def IsTestableFile(self):
     """Returns True if the file is a text file and not a binary file.
 
     Deleted files are not text file."""
     raise NotImplementedError()  # Implement when needed
 
+  def IsTextFile(self):
+    """An alias to IsTestableFile for backwards compatibility."""
+    return self.IsTestableFile()
+
   def NewContents(self):
     """Returns an iterator over the lines in the new version of file.
 
@@ -707,12 +681,11 @@ class AffectedFile(object):
     """
     if self._cached_new_contents is None:
       self._cached_new_contents = []
-      if not self.IsDirectory():
-        try:
-          self._cached_new_contents = gclient_utils.FileRead(
-              self.AbsoluteLocalPath(), 'rU').splitlines()
-        except IOError:
-          pass  # File not found?  That's fine; maybe it was deleted.
+      try:
+        self._cached_new_contents = gclient_utils.FileRead(
+            self.AbsoluteLocalPath(), 'rU').splitlines()
+      except IOError:
+        pass  # File not found?  That's fine; maybe it was deleted.
     return self._cached_new_contents[:]
 
   def ChangedContents(self):
@@ -728,9 +701,6 @@ class AffectedFile(object):
     self._cached_changed_contents = []
     line_num = 0
 
-    if self.IsDirectory():
-      return []
-
     for line in self.GenerateScmDiff().splitlines():
       m = re.match(r'^@@ [0-9\,\+\-]+ \+([0-9]+)\,[0-9]+ @@', line)
       if m:
@@ -749,100 +719,26 @@ class AffectedFile(object):
     return self._diff_cache.GetDiff(self.LocalPath(), self._local_root)
 
 
-class SvnAffectedFile(AffectedFile):
-  """Representation of a file in a change out of a Subversion checkout."""
-  # Method 'NNN' is abstract in class 'NNN' but is not overridden
-  # pylint: disable=W0223
-
-  DIFF_CACHE = _SvnDiffCache
-
-  def __init__(self, *args, **kwargs):
-    AffectedFile.__init__(self, *args, **kwargs)
-    self._server_path = None
-    self._is_text_file = None
-
-  def ServerPath(self):
-    if self._server_path is None:
-      self._server_path = scm.SVN.CaptureLocalInfo(
-          [self.LocalPath()], self._local_root).get('URL', '')
-    return self._server_path
-
-  def IsDirectory(self):
-    if self._is_directory is None:
-      path = self.AbsoluteLocalPath()
-      if os.path.exists(path):
-        # Retrieve directly from the file system; it is much faster than
-        # querying subversion, especially on Windows.
-        self._is_directory = os.path.isdir(path)
-      else:
-        self._is_directory = scm.SVN.CaptureLocalInfo(
-            [self.LocalPath()], self._local_root
-            ).get('Node Kind') in ('dir', 'directory')
-    return self._is_directory
-
-  def Property(self, property_name):
-    if not property_name in self._properties:
-      self._properties[property_name] = scm.SVN.GetFileProperty(
-          self.LocalPath(), property_name, self._local_root).rstrip()
-    return self._properties[property_name]
-
-  def IsTextFile(self):
-    if self._is_text_file is None:
-      if self.Action() == 'D':
-        # A deleted file is not a text file.
-        self._is_text_file = False
-      elif self.IsDirectory():
-        self._is_text_file = False
-      else:
-        mime_type = scm.SVN.GetFileProperty(
-            self.LocalPath(), 'svn:mime-type', self._local_root)
-        self._is_text_file = (not mime_type or mime_type.startswith('text/'))
-    return self._is_text_file
-
-
 class GitAffectedFile(AffectedFile):
   """Representation of a file in a change out of a git checkout."""
   # Method 'NNN' is abstract in class 'NNN' but is not overridden
-  # pylint: disable=W0223
+  # pylint: disable=abstract-method
 
   DIFF_CACHE = _GitDiffCache
 
   def __init__(self, *args, **kwargs):
     AffectedFile.__init__(self, *args, **kwargs)
     self._server_path = None
-    self._is_text_file = None
-
-  def ServerPath(self):
-    if self._server_path is None:
-      raise NotImplementedError('TODO(maruel) Implement.')
-    return self._server_path
-
-  def IsDirectory(self):
-    if self._is_directory is None:
-      path = self.AbsoluteLocalPath()
-      if os.path.exists(path):
-        # Retrieve directly from the file system; it is much faster than
-        # querying subversion, especially on Windows.
-        self._is_directory = os.path.isdir(path)
-      else:
-        self._is_directory = False
-    return self._is_directory
-
-  def Property(self, property_name):
-    if not property_name in self._properties:
-      raise NotImplementedError('TODO(maruel) Implement.')
-    return self._properties[property_name]
+    self._is_testable_file = None
 
-  def IsTextFile(self):
-    if self._is_text_file is None:
+  def IsTestableFile(self):
+    if self._is_testable_file is None:
       if self.Action() == 'D':
-        # A deleted file is not a text file.
-        self._is_text_file = False
-      elif self.IsDirectory():
-        self._is_text_file = False
+        # A deleted file is not testable.
+        self._is_testable_file = False
       else:
-        self._is_text_file = os.path.isfile(self.AbsoluteLocalPath())
-    return self._is_text_file
+        self._is_testable_file = os.path.isfile(self.AbsoluteLocalPath())
+    return self._is_testable_file
 
 
 class Change(object):
@@ -944,51 +840,44 @@ class Change(object):
     """List all files under source control in the repo."""
     raise NotImplementedError()
 
-  def AffectedFiles(self, include_dirs=False, include_deletes=True,
-                    file_filter=None):
+  def AffectedFiles(self, include_deletes=True, file_filter=None):
     """Returns a list of AffectedFile instances for all files in the change.
 
     Args:
       include_deletes: If false, deleted files will be filtered out.
-      include_dirs: True to include directories in the list
       file_filter: An additional filter to apply.
 
     Returns:
       [AffectedFile(path, action), AffectedFile(path, action)]
     """
-    if include_dirs:
-      affected = self._affected_files
-    else:
-      affected = filter(lambda x: not x.IsDirectory(), self._affected_files)
-
-    affected = filter(file_filter, affected)
+    affected = filter(file_filter, self._affected_files)
 
     if include_deletes:
       return affected
     else:
       return filter(lambda x: x.Action() != 'D', affected)
 
-  def AffectedTextFiles(self, include_deletes=None):
+  def AffectedTestableFiles(self, include_deletes=None):
     """Return a list of the existing text files in a change."""
     if include_deletes is not None:
-      warn("AffectedTextFiles(include_deletes=%s)"
+      warn("AffectedTeestableFiles(include_deletes=%s)"
                " is deprecated and ignored" % str(include_deletes),
            category=DeprecationWarning,
            stacklevel=2)
-    return filter(lambda x: x.IsTextFile(),
-                  self.AffectedFiles(include_dirs=False, include_deletes=False))
+    return filter(lambda x: x.IsTestableFile(),
+                  self.AffectedFiles(include_deletes=False))
 
-  def LocalPaths(self, include_dirs=False):
-    """Convenience function."""
-    return [af.LocalPath() for af in self.AffectedFiles(include_dirs)]
+  def AffectedTextFiles(self, include_deletes=None):
+    """An alias to AffectedTestableFiles for backwards compatibility."""
+    return self.AffectedTestableFiles(include_deletes=include_deletes)
 
-  def AbsoluteLocalPaths(self, include_dirs=False):
+  def LocalPaths(self):
     """Convenience function."""
-    return [af.AbsoluteLocalPath() for af in self.AffectedFiles(include_dirs)]
+    return [af.LocalPath() for af in self.AffectedFiles()]
 
-  def ServerPaths(self, include_dirs=False):
+  def AbsoluteLocalPaths(self):
     """Convenience function."""
-    return [af.ServerPath() for af in self.AffectedFiles(include_dirs)]
+    return [af.AbsoluteLocalPath() for af in self.AffectedFiles()]
 
   def RightHandSideLines(self):
     """An iterator over all text lines in "new" version of changed files.
@@ -1006,19 +895,7 @@ class Change(object):
     """
     return _RightHandSideLinesImpl(
         x for x in self.AffectedFiles(include_deletes=False)
-        if x.IsTextFile())
-
-
-class SvnChange(Change):
-  _AFFECTED_FILES = SvnAffectedFile
-  scm = 'svn'
-  _changelists = None
-
-  def AllFiles(self, root=None):
-    """List all files under source control in the repo."""
-    root = root or self.RepositoryRoot()
-    return subprocess.check_output(
-        ['svn', 'ls', '-R', '.'], cwd=root).splitlines()
+        if x.IsTestableFile())
 
 
 class GitChange(Change):
@@ -1085,83 +962,6 @@ def ListRelevantPresubmitFiles(files, root):
   return results
 
 
-class GetTrySlavesExecuter(object):
-  @staticmethod
-  def ExecPresubmitScript(script_text, presubmit_path, project, change):
-    """Executes GetPreferredTrySlaves() from a single presubmit script.
-
-    This will soon be deprecated and replaced by GetPreferredTryMasters().
-
-    Args:
-      script_text: The text of the presubmit script.
-      presubmit_path: Project script to run.
-      project: Project name to pass to presubmit script for bot selection.
-
-    Return:
-      A list of try slaves.
-    """
-    context = {}
-    main_path = os.getcwd()
-    try:
-      os.chdir(os.path.dirname(presubmit_path))
-      exec script_text in context
-    except Exception, e:
-      raise PresubmitFailure('"%s" had an exception.\n%s' % (presubmit_path, e))
-    finally:
-      os.chdir(main_path)
-
-    function_name = 'GetPreferredTrySlaves'
-    if function_name in context:
-      get_preferred_try_slaves = context[function_name]
-      function_info = inspect.getargspec(get_preferred_try_slaves)
-      if len(function_info[0]) == 1:
-        result = get_preferred_try_slaves(project)
-      elif len(function_info[0]) == 2:
-        result = get_preferred_try_slaves(project, change)
-      else:
-        result = get_preferred_try_slaves()
-      if not isinstance(result, types.ListType):
-        raise PresubmitFailure(
-            'Presubmit functions must return a list, got a %s instead: %s' %
-            (type(result), str(result)))
-      for item in result:
-        if isinstance(item, basestring):
-          # Old-style ['bot'] format.
-          botname = item
-        elif isinstance(item, tuple):
-          # New-style [('bot', set(['tests']))] format.
-          botname = item[0]
-        else:
-          raise PresubmitFailure('PRESUBMIT.py returned invalid tryslave/test'
-                                 ' format.')
-
-        if botname != botname.strip():
-          raise PresubmitFailure(
-              'Try slave names cannot start/end with whitespace')
-        if ',' in botname:
-          raise PresubmitFailure(
-              'Do not use \',\' separated builder or test names: %s' % botname)
-    else:
-      result = []
-
-    def valid_oldstyle(result):
-      return all(isinstance(i, basestring) for i in result)
-
-    def valid_newstyle(result):
-      return (all(isinstance(i, tuple) for i in result) and
-              all(len(i) == 2 for i in result) and
-              all(isinstance(i[0], basestring) for i in result) and
-              all(isinstance(i[1], set) for i in result)
-             )
-
-    # Ensure it's either all old-style or all new-style.
-    if not valid_oldstyle(result) and not valid_newstyle(result):
-      raise PresubmitFailure(
-          'PRESUBMIT.py returned invalid trybot specification!')
-
-    return result
-
-
 class GetTryMastersExecuter(object):
   @staticmethod
   def ExecPresubmitScript(script_text, presubmit_path, project, change):
@@ -1223,64 +1023,6 @@ class GetPostUploadExecuter(object):
     return post_upload_hook(cl, change, OutputApi(False))
 
 
-def DoGetTrySlaves(change,
-                   changed_files,
-                   repository_root,
-                   default_presubmit,
-                   project,
-                   verbose,
-                   output_stream):
-  """Get the list of try servers from the presubmit scripts (deprecated).
-
-  Args:
-    changed_files: List of modified files.
-    repository_root: The repository root.
-    default_presubmit: A default presubmit script to execute in any case.
-    project: Optional name of a project used in selecting trybots.
-    verbose: Prints debug info.
-    output_stream: A stream to write debug output to.
-
-  Return:
-    List of try slaves
-  """
-  presubmit_files = ListRelevantPresubmitFiles(changed_files, repository_root)
-  if not presubmit_files and verbose:
-    output_stream.write("Warning, no PRESUBMIT.py found.\n")
-  results = []
-  executer = GetTrySlavesExecuter()
-
-  if default_presubmit:
-    if verbose:
-      output_stream.write("Running default presubmit script.\n")
-    fake_path = os.path.join(repository_root, 'PRESUBMIT.py')
-    results.extend(executer.ExecPresubmitScript(
-        default_presubmit, fake_path, project, change))
-  for filename in presubmit_files:
-    filename = os.path.abspath(filename)
-    if verbose:
-      output_stream.write("Running %s\n" % filename)
-    # Accept CRLF presubmit script.
-    presubmit_script = gclient_utils.FileRead(filename, 'rU')
-    results.extend(executer.ExecPresubmitScript(
-        presubmit_script, filename, project, change))
-
-
-  slave_dict = {}
-  old_style = filter(lambda x: isinstance(x, basestring), results)
-  new_style = filter(lambda x: isinstance(x, tuple), results)
-
-  for result in new_style:
-    slave_dict.setdefault(result[0], set()).update(result[1])
-  slaves = list(slave_dict.items())
-
-  slaves.extend(set(old_style))
-
-  if slaves and verbose:
-    output_stream.write(', '.join((str(x) for x in slaves)))
-    output_stream.write('\n')
-  return slaves
-
-
 def _MergeMasters(masters1, masters2):
   """Merges two master maps. Merges also the tests of each builder."""
   result = {}
@@ -1459,7 +1201,6 @@ class PresubmitExecuter(object):
     os.chdir(main_path)
     return result
 
-
 def DoPresubmitChecks(change,
                       committing,
                       verbose,
@@ -1486,7 +1227,8 @@ def DoPresubmitChecks(change,
     output_stream: A stream to write output from presubmit tests to.
     input_stream: A stream to read input from the user.
     default_presubmit: A default presubmit script to execute in any case.
-    may_prompt: Enable (y/n) questions on warning or error.
+    may_prompt: Enable (y/n) questions on warning or error. If False,
+                any questions are answered with yes by default.
     rietveld_obj: rietveld.Rietveld object.
     gerrit_obj: provides basic Gerrit codereview functionality.
     dry_run: if true, some Checks will be skipped.
@@ -1512,7 +1254,7 @@ def DoPresubmitChecks(change,
       output.write("Running presubmit upload checks ...\n")
     start_time = time.time()
     presubmit_files = ListRelevantPresubmitFiles(
-        change.AbsoluteLocalPaths(True), change.RepositoryRoot())
+        change.AbsoluteLocalPaths(), change.RepositoryRoot())
     if not presubmit_files and verbose:
       output.write("Warning, no PRESUBMIT.py found.\n")
     results = []
@@ -1556,14 +1298,14 @@ def DoPresubmitChecks(change,
     if total_time > 1.0:
       output.write("Presubmit checks took %.1fs to calculate.\n\n" % total_time)
 
-    if not errors:
-      if not warnings:
-        output.write('Presubmit checks passed.\n')
-      elif may_prompt:
-        output.prompt_yes_no('There were presubmit warnings. '
-                            'Are you sure you wish to continue? (y/N): ')
-      else:
-        output.fail()
+    if errors:
+      output.fail()
+    elif warnings:
+      output.write('There were presubmit warnings. ')
+      if may_prompt:
+        output.prompt_yes_no('Are you sure you wish to continue? (y/N): ')
+    else:
+      output.write('Presubmit checks passed.\n')
 
     global _ASKED_FOR_FEEDBACK
     # Ask for feedback one time out of 5.
@@ -1604,15 +1346,11 @@ def ParseFiles(args, recursive):
 
 def load_files(options, args):
   """Tries to determine the SCM."""
-  change_scm = scm.determine_scm(options.root)
   files = []
   if args:
     files = ParseFiles(args, options.recursive)
-  if change_scm == 'svn':
-    change_class = SvnChange
-    if not files:
-      files = scm.SVN.CaptureStatus([], options.root)
-  elif change_scm == 'git':
+  change_scm = scm.determine_scm(options.root)
+  if change_scm == 'git':
     change_class = GitChange
     upstream = options.upstream or None
     if not files: