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

git_common.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.
 
 # Monkeypatch IMapIterator so that Ctrl-C can kill everything properly.
 # Derived from https://gist.github.com/aljungberg/626518
 import multiprocessing.pool
 from multiprocessing.pool import IMapIterator
 def wrapper(func):
   def wrap(self, timeout=None):
@@ skipping 266 matching lines @@
   return _inner_gen().next
 
 
 ## Git functions
 
 
 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 {}
 
 
 def branches(*args):
   NO_BRANCH = ('* (no branch', '* (detached', '* (HEAD detached')
 
   key = 'depot-tools.branch-limit'
   limit = 20
@@ skipping 244 matching lines @@
 
 
 def run_with_retcode(*cmd, **kwargs):
   """Run a command but only return the status code."""
   try:
     run(*cmd, **kwargs)
     return 0
   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).
 
   stderr is dropped to avoid races if the process outputs to both stdout and
   stderr.
   """
   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
 
 
 @contextlib.contextmanager
 def run_stream_with_retcode(*cmd, **kwargs):
   """Runs a git command as context manager yielding stdout as a PIPE.
 
   stderr is dropped to avoid races if the process outputs to both stdout and
   stderr.
 
   Raises subprocess2.CalledProcessError on nonzero return code.
   """
   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)
     yield proc.stdout
   finally:
     retcode = proc.wait()
     if retcode != 0:
       raise subprocess2.CalledProcessError(retcode, cmd, os.getcwd(),
                                            None, None)
 
 
 def run_with_stderr(*cmd, **kwargs):
   """Runs a git command.
 
   Returns (stdout, stderr) as a pair of strings.
 
   kwargs
     autostrip (bool) - Strip the output. Defaults to True.
     indata (str) - Specifies stdin data for the process.
   """
   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)
 
   cmd = (GIT_EXE, '-c', 'color.ui=never') + cmd
   proc = subprocess2.Popen(cmd, **kwargs)
   ret, err = proc.communicate(indata)
   retcode = proc.wait()
   if retcode != 0:
     raise subprocess2.CalledProcessError(retcode, cmd, os.getcwd(), ret, err)
 
@@ skipping 234 matching lines @@
                       ['HEAD'])
 
 
 def clone_file(repository, new_workdir, link, operation):
   if not os.path.exists(os.path.join(repository, link)):
     return
   link_dir = os.path.dirname(os.path.join(new_workdir, link))
   if not os.path.exists(link_dir):
     os.makedirs(link_dir)
   operation(os.path.join(repository, link), os.path.join(new_workdir, link))