Fix rebase-update on windows on git-svn repos.

git_common.py

Index: git_common.py
diff --git a/git_common.py b/git_common.py
index d40514462c98775d3d5519a277bedfb2915fba0d..954060b77ce615e02aade5d17b80c1ea9223d990 100644
--- a/git_common.py
+++ b/git_common.py
@@ -284,11 +284,20 @@ def branch_config(branch, option, default=None):
   return config('branch.%s.%s' % (branch, option), default=default)
 
 
+def config_regexp(pattern):
+  if sys.platform.startswith('win'):

[M-A Ruel, 2016/01/08 21:11:21]

if sys.platform == 'win32':

the format you used was because in 2008 python thought it was a good idea to put
win64 in their x64 build but they quickly backtracked.

+    # this madness is because we call git.bat which calls git.exe which calls
+    # bash.exe (or something to that effect). Each layer divides the number of
+    # ^'s by 2.
+    pattern = pattern.replace('^', '^' * 8)
+  return run('config', '--get-regexp', pattern).splitlines()
+
+
 def branch_config_map(option):
   """Return {branch: <|option| value>} for all branches."""
   try:
     reg = re.compile(r'^branch\.(.*)\.%s$' % option)
-    lines = run('config', '--get-regexp', reg.pattern).splitlines()
+    lines = config_regexp(reg.pattern)
     return {reg.match(k).group(1): v for k, v in (l.split() for l in lines)}
   except subprocess2.CalledProcessError:
     return {}
@@ -553,7 +562,6 @@ def run_with_retcode(*cmd, **kwargs):
   except subprocess2.CalledProcessError as cpe:
     return cpe.returncode
 
-
 def run_stream(*cmd, **kwargs):
   """Runs a git command. Returns stdout as a PIPE (file-like object).
 
@@ -562,6 +570,7 @@ def run_stream(*cmd, **kwargs):
   """
   kwargs.setdefault('stderr', subprocess2.VOID)
   kwargs.setdefault('stdout', subprocess2.PIPE)
+  kwargs.setdefault('shell', False)

[iannucci, 2016/01/08 02:14:56]

GIT_EXE is always an absolute path, so we don't need this layer of cheese. If
this is True, then we need 16 ^'s :(

   cmd = (GIT_EXE, '-c', 'color.ui=never') + cmd
   proc = subprocess2.Popen(cmd, **kwargs)
   return proc.stdout
@@ -578,6 +587,7 @@ def run_stream_with_retcode(*cmd, **kwargs):
   """
   kwargs.setdefault('stderr', subprocess2.VOID)
   kwargs.setdefault('stdout', subprocess2.PIPE)
+  kwargs.setdefault('shell', False)
   cmd = (GIT_EXE, '-c', 'color.ui=never') + cmd
   try:
     proc = subprocess2.Popen(cmd, **kwargs)
@@ -601,6 +611,7 @@ def run_with_stderr(*cmd, **kwargs):
   kwargs.setdefault('stdin', subprocess2.PIPE)
   kwargs.setdefault('stdout', subprocess2.PIPE)
   kwargs.setdefault('stderr', subprocess2.PIPE)
+  kwargs.setdefault('shell', False)
   autostrip = kwargs.pop('autostrip', True)
   indata = kwargs.pop('indata', None)