Add support for wildcards in svn remote configuration.

scm.py

 # Copyright (c) 2010 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.
 
 """SCM-specific utility classes."""
 
 import cStringIO
 import glob
 import logging
 import os
@@ skipping 46 matching lines @@
   data.write("+++ %s\n" % filename)
   data.write("@@ -0,0 +1,%d @@\n" % nb_lines)
   # Prepend '+' to every lines.
   for line in file_content:
     data.write('+')
     data.write(line)
   result = data.getvalue()
   data.close()
   return result
 
+def MatchSvnGlob(url, base_url, glob_spec, allow_wildcards):
+  """Return the corresponding git ref if |base_url| together with |glob_spec|
+  matches the full |url|.
+
+  If |allow_wildcards| is true, |glob_spec| can contain wildcards (see below).
+  """
+  glob_spec = glob_spec.split(':')
+  if allow_wildcards:
+    glob_match = re.match('(.+/)?(\*|{[^/]*})(/.+)?', glob_spec[0])
+    if glob_match:
+      # Parse specs like "branches/*/src:refs/remotes/svn/*" or
+      # "branches/{472,597,648}/src:refs/remotes/svn/*".
+      branch_re = re.escape(base_url)
+      if glob_match.group(1):
+        branch_re += '/' + re.escape(glob_match.group(1))
+      wildcard = glob_match.group(2)
+      if wildcard == '*':
+        branch_re += '([^/]*)'
+      else:
+        # Escape and replace surrounding braces with parentheses and commas
+        # with pipe symbols.
+        wildcard = re.escape(wildcard)
+        wildcard = re.sub('^\\\\{', '(', wildcard)
+        wildcard = re.sub('\\\\,', '|', wildcard)
+        wildcard = re.sub('\\\\}$', ')', wildcard)
+        branch_re += wildcard
+      if glob_match.group(3):
+        branch_re += re.escape(glob_match.group(3))
+      match = re.match(branch_re, url)
+      if match:
+        return re.sub('\*$', match.group(1), glob_spec[1])
+
+  # Parse specs like "trunk/src:refs/remotes/origin/trunk".
+  if glob_spec[0]:
+    full_url = base_url + '/' + glob_spec[0]
+  else:
+    full_url = base_url
+  if full_url == url:
+    return glob_spec[1]
+  return None
+
 
 class GIT(object):
   @staticmethod
   def Capture(args, **kwargs):
     return gclient_utils.CheckCall(['git'] + args, print_error=False,
         **kwargs)[0]
 
   @staticmethod
   def CaptureStatus(files, upstream_branch=None):
     """Returns git status.
@@ skipping 87 matching lines @@
 
     if url:
       svn_remote_re = re.compile(r'^svn-remote\.([^.]+)\.url (.*)$')
       remotes = GIT.Capture(['config', '--get-regexp',
                             r'^svn-remote\..*\.url'], cwd=cwd).splitlines()
       for remote in remotes:
         match = svn_remote_re.match(remote)
         if match:
           remote = match.group(1)
           base_url = match.group(2)
-          fetch_spec = GIT.Capture(
-              ['config', 'svn-remote.%s.fetch' % remote],
-              cwd=cwd).strip().split(':')
-          if fetch_spec[0]:
-            full_url = base_url + '/' + fetch_spec[0]
-          else:
-            full_url = base_url
-          if full_url == url:
-            return fetch_spec[1]
+          try:
+            fetch_spec = GIT.Capture(
+                ['config', 'svn-remote.%s.fetch' % remote],
+                cwd=cwd).strip()
+            branch = MatchSvnGlob(url, base_url, fetch_spec, False)
+          except gclient_utils.CheckCallError:
+            branch = None
+          if branch:
+            return branch
+          try:
+            branch_spec = GIT.Capture(
+                ['config', 'svn-remote.%s.branches' % remote],
+                cwd=cwd).strip()
+            branch = MatchSvnGlob(url, base_url, branch_spec, True)
+          except gclient_utils.CheckCallError:
+            branch = None
+          if branch:
+            return branch
+          try:
+            tag_spec = GIT.Capture(
+                ['config', 'svn-remote.%s.tags' % remote],
+                cwd=cwd).strip()
+            branch = MatchSvnGlob(url, base_url, tag_spec, True)
+          except gclient_utils.CheckCallError:
+            branch = None
+          if branch:
+            return branch
 
   @staticmethod
   def FetchUpstreamTuple(cwd):
     """Returns a tuple containg remote and remote ref,
        e.g. 'origin', 'refs/heads/master'
        Tries to be intelligent and understand git-svn.
     """
     remote = '.'
     branch = GIT.GetBranch(cwd)
     try:
@@ skipping 696 matching lines @@
         elif os.path.isfile(file_path) or os.path.islink(file_path):
           logging.info('os.remove(%s)' % file_path)
           os.remove(file_path)
         elif os.path.isdir(file_path):
           logging.info('gclient_utils.RemoveDirectory(%s)' % file_path)
           gclient_utils.RemoveDirectory(file_path)
         else:
           logging.critical(
             ('No idea what is %s.\nYou just found a bug in gclient'
              ', please ping maruel@chromium.org ASAP!') % file_path)