Enforce cwd for GIT functions

scm.py

 # Copyright (c) 2011 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 79 matching lines @@
   if val.isdigit():
     return int(val)
   else:
     return 0
 
 
 class GIT(object):
   current_version = None
 
   @staticmethod
-  def Capture(args, **kwargs):
+  def Capture(args, cwd, **kwargs):
     return subprocess2.check_output(
-        ['git'] + args, stderr=subprocess2.PIPE, **kwargs)
+        ['git'] + args, cwd=cwd, stderr=subprocess2.PIPE, **kwargs)
 
   @staticmethod
-  def CaptureStatus(files, upstream_branch=None):
+  def CaptureStatus(files, cwd, upstream_branch):
     """Returns git status.
 
     @files can be a string (one file) or a list of files.
 
     Returns an array of (status, file) tuples."""
     if upstream_branch is None:
-      upstream_branch = GIT.GetUpstreamBranch(os.getcwd())
+      upstream_branch = GIT.GetUpstreamBranch(cwd)
       if upstream_branch is None:
         raise gclient_utils.Error('Cannot determine upstream branch')
     command = ['diff', '--name-status', '-r', '%s...' % upstream_branch]
     if not files:
       pass
     elif isinstance(files, basestring):
       command.append(files)
     else:
       command.extend(files)
-    status = GIT.Capture(command).rstrip()
+    status = GIT.Capture(command, cwd).rstrip()
     results = []
     if status:
       for statusline in status.splitlines():
         # 3-way merges can cause the status can be 'MMM' instead of 'M'. This
         # can happen when the user has 2 local branches and he diffs between
         # these 2 branches instead diffing to upstream.
         m = re.match('^(\w)+\t(.+)$', statusline)
         if not m:
           raise gclient_utils.Error(
               'status currently unsupported: %s' % statusline)
@@ skipping 86 matching lines @@
     # 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)
 
     # We don't want to go through all of history, so read a line from the
     # pipe at a time.
     # The -100 is an arbitrary limit so we don't search forever.
     cmd = ['git', 'log', '-100', '--pretty=medium']
-    proc = subprocess2.Popen(cmd, stdout=subprocess2.PIPE)
+    proc = subprocess2.Popen(cmd, cwd, stdout=subprocess2.PIPE)
     url = None
     for line in proc.stdout:
       match = git_svn_re.match(line)
       if match:
         url = match.group(1)
         proc.stdout.close()  # Cut pipe.
         break
 
     if url:
       svn_remote_re = re.compile(r'^svn-remote\.([^.]+)\.url (.*)$')
-      remotes = GIT.Capture(['config', '--get-regexp',
-                            r'^svn-remote\..*\.url'], cwd=cwd).splitlines()
+      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)
           try:
             fetch_spec = GIT.Capture(
                 ['config', 'svn-remote.%s.fetch' % remote],
                 cwd=cwd).strip()
             branch = GIT.MatchSvnGlob(url, base_url, fetch_spec, False)
@@ skipping 124 matching lines @@
   def GetCheckoutRoot(cwd):
     """Returns the top level directory of a git checkout as an absolute path.
     """
     root = GIT.Capture(['rev-parse', '--show-cdup'], cwd=cwd).strip()
     return os.path.abspath(os.path.join(cwd, root))
 
   @classmethod
   def AssertVersion(cls, min_version):
     """Asserts git's version is at least min_version."""
     if cls.current_version is None:
-      cls.current_version = cls.Capture(['--version']).split()[-1]
+      cls.current_version = cls.Capture(['--version'], '.').split()[-1]
     current_version_list = map(only_int, cls.current_version.split('.'))
     for min_ver in map(int, min_version.split('.')):
       ver = current_version_list.pop(0)
       if ver < min_ver:
         return (False, cls.current_version)
       elif ver > min_ver:
         return (True, cls.current_version)
     return (True, cls.current_version)
 
 
@@ skipping 606 matching lines @@
         # revert, like for properties.
         if not os.path.isdir(cwd):
           # '.' was deleted. It's not worth continuing.
           return
         try:
           SVN.Capture(['revert', file_status[1]], cwd=cwd)
         except subprocess2.CalledProcessError:
           if not os.path.exists(file_path):
             continue
           raise