deps2git: Improve support for WebRTC and its deps.

svn_to_git_public.py

Index: svn_to_git_public.py
===================================================================
--- svn_to_git_public.py	(revision 292133)
+++ svn_to_git_public.py	(working copy)
@@ -61,33 +61,11 @@
   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),

[Ryan Tseng, 2014/10/10 05:02:00]

I think you still need to special case /trunk/src, because that points to
external/webrtc/src instead of external/webrtc/trunk/src

[kjellander_chromium, 2014/10/10 08:46:20]

No, the src subdirectory of trunk is long gone and no longer used. See
https://chromium.googlesource.com/external/webrtc/src (the latest commit is 2
years old). I think that directory was renamed to webrtc and thus is reflected
by the https://chromium.googlesource.com/external/webrtc/trunk/webrtc/ mirror
instead.
I filed http://crbug.com/422217 to get that mirror removed.

So the cases we have is (SVN -> mirror):
svn/deps/*        -> external/webrtc/deps/third_party/junit	
                     external/webrtc/deps/third_party/openmax	
                     external/webrtc/deps/third_party/winsdk_samples_v71	
                     external/webrtc/deps/tools/android
                     (all created in http://crbug.com/390681)
svn/trunk         -> external/webrtc/
svn/trunk/talk    -> external/webrtc/trunk/talk/
svn/trunk/webrtc  -> external/webrtc/trunk/webrtc/

I added a unittest just to make sure I didn't miss anything.

             GIT_HOST)
 
   if svn_url in ('http://selenium.googlecode.com/svn/trunk/py/test',