Drop libjingle/source/talk directory from DEPS.

tools/roll_webrtc.py

 #!/usr/bin/env python
 # Copyright 2015 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 argparse
 import collections
 import logging
 import os
 import re
@@ skipping 18 matching lines @@
 CHROMIUM_GIT_URL = 'https://chromium.googlesource.com/chromium/src.git'
 COMMIT_POSITION_RE = re.compile('^Cr-Original-Commit-Position: .*#([0-9]+).*$')
 CL_ISSUE_RE = re.compile('^Issue number: ([0-9]+) \((.*)\)$')
 RIETVELD_URL_RE = re.compile('^https?://(.*)/(.*)')
 ROLL_BRANCH_NAME = 'special_webrtc_roll_branch'
 TRYJOB_STATUS_SLEEP_SECONDS = 30
 
 # Use a shell for subcommands on Windows to get a PATH search.
 IS_WIN = sys.platform.startswith('win')
 WEBRTC_PATH = os.path.join('third_party', 'webrtc')
-LIBJINGLE_PATH = os.path.join('third_party', 'libjingle', 'source', 'talk')
-LIBJINGLE_README = os.path.join('third_party', 'libjingle', 'README.chromium')
 # Run these CQ trybots in addition to the default ones in infra/config/cq.cfg.
 EXTRA_TRYBOTS = ('tryserver.chromium.linux:linux_chromium_archive_rel_ng;'
                  'tryserver.chromium.mac:mac_chromium_archive_rel_ng')
 
 # Result codes from build/third_party/buildbot_8_4p1/buildbot/status/results.py
 # plus the -1 code which is used when there's no result yet.
 TRYJOB_STATUS = {
   -1: 'RUNNING',
   0: 'SUCCESS',
   1: 'WARNINGS',
@@ skipping 97 matching lines @@
   for trybot_result in tryjob_results:
     status = TRYJOB_STATUS.get(trybot_result['result'], 'UNKNOWN')
     status_to_name.setdefault(status, [])
     status_to_name[status].append(trybot_result['builder'])
 
   print '\n========== TRYJOBS STATUS =========='
   for status,name_list in status_to_name.iteritems():
     print '%s: %s' % (status, ','.join(sorted(name_list)))
 
 
-def _GenerateCLDescriptionCommand(webrtc_current, libjingle_current,
-                                  webrtc_new, libjingle_new):
+def _GenerateCLDescriptionCommand(webrtc_current, webrtc_new):
   delim = ''
   webrtc_str = ''
   def GetChangeLogURL(git_repo_url, current_hash, new_hash):
     return '%s/+log/%s..%s' % (git_repo_url, current_hash[0:7], new_hash[0:7])
 
   if webrtc_current.git_commit != webrtc_new.git_commit:

[kjellander_chromium, 2016/05/13 09:47:17]

Please remove line 165: it should always be true now (or the CL would be a
no-op, rendering no changes)

It was there since there could be a roll that included Libjingle-only changes,
which should not be possible anymore.

     webrtc_str = 'WebRTC %s:%s' % (webrtc_current.commit_position,
                                    webrtc_new.commit_position)
     webrtc_changelog_url = GetChangeLogURL(webrtc_current.git_repo_url,
                                            webrtc_current.git_commit,
                                            webrtc_new.git_commit)
 
-  libjingle_str = ''
-  if libjingle_current.git_commit != libjingle_new.git_commit:
-    if webrtc_str:
-      delim += ', '
-    libjingle_str = 'Libjingle %s:%s' % (libjingle_current.commit_position,
-                                         libjingle_new.commit_position)
-    libjingle_changelog_url = GetChangeLogURL(libjingle_current.git_repo_url,
-                                              libjingle_current.git_commit,
-                                              libjingle_new.git_commit)
-
-  description = [ '-m', 'Roll ' + webrtc_str + delim + libjingle_str ]
+  description = [ '-m', 'Roll ' + webrtc_str ]
   if webrtc_str:

[kjellander_chromium, 2016/05/13 09:47:17]

You can remove line 183 too after removing the check at line 165.

     description.extend(['-m', webrtc_str])

[kjellander_chromium, 2016/05/13 09:47:17]

I suggest dropping adding this to the description. It's already in the title of
the CL so this is just repeating the same thing (see
https://codereview.chromium.org/1920743002/ for an example CL).

     description.extend(['-m', 'Changes: %s' % webrtc_changelog_url])
-  if libjingle_str:
-    description.extend(['-m', libjingle_str])
-    description.extend(['-m', 'Changes: %s' % libjingle_changelog_url])
   description.extend(['-m', 'TBR='])
   description.extend(['-m', 'CQ_EXTRA_TRYBOTS=%s' % EXTRA_TRYBOTS])
   return description
 
 
 class AutoRoller(object):
   def __init__(self, chromium_src):
     self._chromium_src = chromium_src
 
   def _RunCommand(self, command, working_dir=None, ignore_exit_code=False,
@@ skipping 97 matching lines @@
       self._RunCommand(['git', 'pull'])
 
     self._RunCommand(['git', 'checkout', '-b', ROLL_BRANCH_NAME])
 
     # Modify Chromium's DEPS file.
 
     # Parse current hashes.
     deps_filename = os.path.join(self._chromium_src, 'DEPS')
     deps = _ParseDepsFile(deps_filename)
     webrtc_current = self._GetDepsCommitInfo(deps, WEBRTC_PATH)
-    libjingle_current = self._GetDepsCommitInfo(deps, LIBJINGLE_PATH)
 
     # Find ToT revisions.
     webrtc_latest = self._GetCommitInfo(WEBRTC_PATH)
-    libjingle_latest = self._GetCommitInfo(LIBJINGLE_PATH)
 
     if IS_WIN:
       # Make sure the roll script doesn't use Windows line endings.
       self._RunCommand(['git', 'config', 'core.autocrlf', 'true'])
 
     self._UpdateDep(deps_filename, WEBRTC_PATH, webrtc_latest)
-    self._UpdateDep(deps_filename, LIBJINGLE_PATH, libjingle_latest)
 
     if self._IsTreeClean():
-      print 'The latest revision is already rolled for WebRTC and libjingle.'
+      print 'The latest revision is already rolled for WebRTC.'
       self._DeleteRollBranch()
     else:
-      self._UpdateReadmeFile(LIBJINGLE_README, libjingle_latest.commit_position)
       description = _GenerateCLDescriptionCommand(
-        webrtc_current, libjingle_current, webrtc_latest, libjingle_latest)
+        webrtc_current, webrtc_latest)
       logging.debug('Committing changes locally.')
       self._RunCommand(['git', 'add', '--update', '.'])
       self._RunCommand(['git', 'commit'] + description)
       logging.debug('Uploading changes...')
       self._RunCommand(['git', 'cl', 'upload'],
                        extra_env={'EDITOR': 'true'})
       cl_info = self._GetCLInfo()
       logging.debug('Issue: %d URL: %s', cl_info.issue, cl_info.url)
 
       if not dry_run and not no_commit:
@@ skipping 58 matching lines @@
   def WaitForTrybots(self):
     active_branch, _ = self._GetBranches()
     if active_branch != ROLL_BRANCH_NAME:
       self._RunCommand(['git', 'checkout', ROLL_BRANCH_NAME])
     cl_info = self._GetCLInfo()
     return _WaitForTrybots(cl_info.issue, cl_info.rietveld_server)
 
 
 def main():
   parser = argparse.ArgumentParser(
-      description='Find webrtc and libjingle revisions for roll.')
+      description='Find webrtc revisions for roll.')
   parser.add_argument('--abort',
     help=('Aborts a previously prepared roll. '
           'Closes any associated issues and deletes the roll branches'),
     action='store_true')
   parser.add_argument('--no-commit',
     help=('Don\'t send the CL to the CQ. This is useful if additional changes '
           'are needed to the CL (like for API changes).'),
     action='store_true')
   parser.add_argument('--wait-for-trybots',
     help=('Waits until all trybots from a previously created roll are either '
@@ skipping 22 matching lines @@
   if args.abort:
     return autoroller.Abort()
   elif args.wait_for_trybots:
     return autoroller.WaitForTrybots()
   else:
     return autoroller.PrepareRoll(args.dry_run, args.ignore_checks,
                                   args.no_commit, args.close_previous_roll)
 
 if __name__ == '__main__':
   sys.exit(main())