Add support for wildcards in svn remote configuration.

git_cl/git_cl.py

 #!/usr/bin/python
 # git-cl -- a git-command for integrating reviews on Rietveld
 # Copyright (C) 2008 Evan Martin <martine@danga.com>
 
 import errno
 import logging
 import optparse
 import os
 import re
 import subprocess
@@ skipping 78 matching lines @@
   return hook
 
 
 def FixUrl(server):
   """Fix a server url to defaults protocol to http:// if none is specified."""
   if not server:
     return server
   if not re.match(r'[a-z]+\://.*', server):
     return 'http://' + server
   return server
 

[M-A Ruel, 2011/03/02 14:24:59]

Two empty lines between file level symbols.

[Bernhard Bauer, 2011/03/02 14:36:06]

Done.

+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])

[M-A Ruel, 2011/03/02 14:24:59]

Otherwise you could use fnmatch.fnmatch(). It won't work with '?' or '*' in
branch name but I don't think we care.

[Bernhard Bauer, 2011/03/02 14:36:06]

The thing is I have to support whatever git-svn is configured with, which
includes * and {foo,bar} wildcards. I thought I could get by without them, but
the recent v8 breakage proved me wrong, so I'm trying to be as correct as
possible this time.

+    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 Settings(object):
   def __init__(self):
     self.default_server = None
     self.cc = None
     self.root = None
     self.is_git_svn = None
     self.svn_branch = None
     self.tree_status_url = None
     self.viewvc_url = None
@@ skipping 73 matching lines @@
       if url:
         svn_remote_re = re.compile(r'^svn-remote\.([^.]+)\.url (.*)$')
         remotes = RunGit(['config', '--get-regexp',
                           r'^svn-remote\..*\.url']).splitlines()
         for remote in remotes:
           match = svn_remote_re.match(remote)
           if match:
             remote = match.group(1)
             base_url = match.group(2)
             fetch_spec = RunGit(
-                ['config', 'svn-remote.'+remote+'.fetch']).strip().split(':')
-            if fetch_spec[0]:
-              full_url = base_url + '/' + fetch_spec[0]
-            else:
-              full_url = base_url
-            if full_url == url:
-              self.svn_branch = fetch_spec[1]
-              break
+                ['config', 'svn-remote.%s.fetch' % remote],
+                error_ok=True).strip()
+            if fetch_spec:
+              self.svn_branch = MatchSvnGlob(url, base_url, fetch_spec, False)
+              if self.svn_branch:
+                break
+            branch_spec = RunGit(
+                ['config', 'svn-remote.%s.branches' % remote],
+                error_ok=True).strip()
+            if branch_spec:
+              self.svn_branch = MatchSvnGlob(url, base_url, branch_spec, True)
+              if self.svn_branch:
+                break
+            tag_spec = RunGit(
+                ['config', 'svn-remote.%s.tags' % remote],
+                error_ok=True).strip()
+            if tag_spec:
+              self.svn_branch = MatchSvnGlob(url, base_url, tag_spec, True)
+              if self.svn_branch:
+                break
 
       if not self.svn_branch:
         DieWithError('Can\'t guess svn branch -- try specifying it on the '
             'command line')
 
     return self.svn_branch
 
   def GetTreeStatusUrl(self, error_ok=False):
     if not self.tree_status_url:
       error_message = ('You must configure your tree status URL by running '
@@ skipping 1067 matching lines @@
             ('AppEngine is misbehaving and returned HTTP %d, again. Keep faith '
              'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
 
   # Not a known command. Default to help.
   GenUsage(parser, 'help')
   return CMDhelp(parser, argv)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))