Tighten match for the chromium 'src' repo.

buildspec_to_git.py

 # Copyright 2014 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.
 
 """Public buildspec to GIT mapping."""
 
 import re
 from deps2git import SplitScmUrl
 
 GIT_HOST = 'https://chromium.googlesource.com/'
@@ skipping 110 matching lines @@
 def SvnUrlToGitUrl(path, svn_url):
   """Convert a chromium SVN URL to a chromium Git URL."""
 
   match = re.match(
       '(https?://src.chromium.org/svn|svn://svn.chromium.org/chrome)(/.*)',
       svn_url)
   if match:
     svn_url = match.group(2)
 
   # Handle the main 'src' repo which only appears in buildspecs.
-  match = re.match('/(branches/(?P<branch>[^/]+)|trunk)/src', svn_url)
+  match = re.match('/(branches/(?P<branch>[^/]+)|trunk)/src^', svn_url)

[szager1, 2014/06/04 22:42:51]

Should that be '$'?

[Michael Moss, 2014/06/04 22:44:38]

UGH. Yes.

   if match:
     if match.groupdict().get('branch'):
       return (path, GIT_HOST + 'chromium/src.git', GIT_HOST,
               match.groupdict().get('branch'))
     else:
       return (path, GIT_HOST + 'chromium/src.git', GIT_HOST)
 
   # libvpx branches in the chrome branches area.
   match = re.match('/branches/libvpx/(?P<branch>[^/]+)', svn_url)
   if match:
@@ skipping 82 matching lines @@
     if match.group('path'):
       repo = GIT_HOST + 'chromium/blink-public.git'
     else:
       repo = GIT_HOST + 'chromium/blink.git'
     return (path, repo, GIT_HOST, match.group('branch'))
 
   # reference builds
   if svn_url.startswith('/trunk/deps/reference_builds/chrome'):
     return (path, GIT_HOST + 'chromium/reference_builds/chrome.git',
             GIT_HOST)