deps2git: Improve support for WebRTC and its deps.

svn_to_git_public.py

 #!/usr/bin/python
 # Copyright (c) 2012 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.
 
 """SVN to GIT mapping for the public Chromium repositories."""
 
 import re
 
 
@@ skipping 43 matching lines @@
 
   if svn_url == 'svn://svn.chromium.org/gsutil/trunk/src':
     return (path, GIT_HOST + 'external/gsutil/src.git', GIT_HOST)
 
   if svn_url == 'svn://svn.chromium.org/jsoncpp/trunk/jsoncpp':
     return (path, GIT_HOST + 'external/jsoncpp/jsoncpp.git', GIT_HOST)
 
   if svn_url == '/trunk/deps/cdm':
     return (path, GIT_HOST + 'chromium/cdm.git', GIT_HOST)
 
-  # TODO(niklase) Remove after landing https://codereview.chromium.org/86563002
-  if re.match('^https?://webrtc.googlecode.com/svn/stable/webrtc$', svn_url):
-    return (path, GIT_HOST + 'external/webrtc/stable/webrtc.git', GIT_HOST)
-
-  # TODO(niklase) Remove after landing https://codereview.chromium.org/86563002
-  if re.match('^https?://webrtc.googlecode.com/svn/stable/talk$', svn_url):
-    return (path, GIT_HOST + 'external/webrtc/stable/talk.git', GIT_HOST)
-
-  # TODO(niklase) Remove after landing https://codereview.chromium.org/86563002
-  if re.match('^https?://webrtc.googlecode.com/svn/stable/src$', svn_url):
-    return (path, GIT_HOST + 'external/webrtc/stable/src.git', GIT_HOST)
-
-  # webrtc 'trunk/src' mirror was created without 'trunk' in the name, unlike
-  # the other ones which are matched next.
-  match = re.match('^https?://webrtc.googlecode.com/svn/trunk/src', svn_url)
+  match = re.match('^https?://webrtc.googlecode.com/svn/(deps|trunk)/(.*)',
+                   svn_url)
   if match:
-    return (path, GIT_HOST + 'external/webrtc/src.git', GIT_HOST)
-
-  # webrtc 'trunk' mappings for everything but 'trunk/src'.
-  match = re.match('^https?://webrtc.googlecode.com/svn/trunk/(.*)', svn_url)
-  if match:
-    repo = '%s.git' % match.group(1)
-    return (path, GIT_HOST + 'external/webrtc/trunk/%s' % repo, GIT_HOST)
-
-  if re.match('^https?://webrtc.googlecode.com/svn/deps/third_party/openmax$',
-              svn_url):
-    return (path, GIT_HOST + 'external/webrtc/deps/third_party/openmax.git',
+    repo = '%s.git' % match.group(2)
+    return (path, GIT_HOST + 'external/webrtc/%s/%s' % (match.group(1), repo),
             GIT_HOST)
 
   if svn_url in ('http://selenium.googlecode.com/svn/trunk/py/test',
                  'https://selenium.googlecode.com/svn/trunk/py/test',
                  '/trunk/deps/reference_builds/chrome'):
     # Those can't be git svn cloned. Skipping for now.
     return
 
   # Projects on sourceforge using trunk
   match = re.match('^https?://svn.code.sf.net/p/(.*)/code/trunk(.*)',
@@ skipping 97 matching lines @@
     return (path, GIT_HOST + 'chromium/deps/%s' % repo, GIT_HOST)
 
   # Subdirectories of the chromium deps/reference_builds directory.
   match = re.match('/trunk/deps/reference_builds/(.*)', svn_url)
   if match:
     repo = '%s.git' % match.group(1)
     return (path, GIT_HOST + 'chromium/reference_builds/%s' % repo, GIT_HOST)
 
   # Nothing yet? Oops.
   print 'No match for %s' % svn_url