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 122 matching lines @@
   def IsGitSvn(cwd):
     """Returns true if this repo looks like it's using git-svn."""
     # If you have any "svn-remote.*" config keys, we think you're using svn.
     try:
       GIT.Capture(['config', '--get-regexp', r'^svn-remote\.'], cwd=cwd)
       return True
     except gclient_utils.CheckCallError:
       return False
 
   @staticmethod
+  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).
+    """
+    fetch_suburl, as_ref = glob_spec.split(':')
+    if allow_wildcards:
+      glob_match = re.match('(.+/)?(\*|{[^/]*})(/.+)?', fetch_suburl)
+      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), as_ref)
+
+    # Parse specs like "trunk/src:refs/remotes/origin/trunk".
+    if fetch_suburl:
+      full_url = base_url + '/' + fetch_suburl
+    else:
+      full_url = base_url
+    if full_url == url:
+      return as_ref
+    return None
+
+  @staticmethod
   def GetSVNBranch(cwd):
     """Returns the svn branch name if found."""
     # Try to figure out which remote branch we're based on.
     # Strategy:
     # 1) iterate through our branch history and find the svn URL.
     # 2) find the svn-remote that fetches from the URL.
 
     # regexp matching the git-svn line that contains the URL.
     git_svn_re = re.compile(r'^\s*git-svn-id: (\S+)@', re.MULTILINE)
 
@@ skipping 11 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 = GIT.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 = GIT.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 = GIT.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 701 matching lines @@
       if 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)