Add --workspace option, so deps2git.py may be run in a

deps2git/git_tools.py

 #!/usr/bin/python
 # Copyright (c) 2012 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.
 
 
 import re
 import subprocess
 
 
 # Show more information about the commands being executed.
 VERBOSE = False
 
 
-def GetStatusOutput(cmd):
+def GetStatusOutput(cmd, cwd=None):
   """Return (status, output) of executing cmd in a shell."""
   if VERBOSE:
     print ''
     print '[DEBUG] Running "%s"' % cmd
-  proc = subprocess.Popen(cmd, shell=True, universal_newlines=True,
+  proc = subprocess.Popen(cmd, shell=True, universal_newlines=True, cwd=cwd,
                           stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
   output = ''.join(proc.stdout.readlines())
   status = proc.wait()
   if status is None:
     status = 0
 
   if VERBOSE:
     short_output = ' '.join(output.splitlines())
     short_output = short_output.strip(' \t\n\r')
     print '[DEBUG] Output: %d, %-60s' % (status, short_output)
 
   return (status, output)
 
 
-def Git(git_repo, command):
+def Git(git_repo, command, mirror=False):
   """Execute a git command within a local git repo."""
-  cmd = 'git --git-dir=%s %s' % (git_repo, command)
+  if mirror:
+    cmd = 'git --git-dir=%s %s' % (git_repo, command)
+    cwd = None
+  else:
+    cmd = 'git %s' % command
+    cwd = git_repo
+  (status, output) = GetStatusOutput(cmd, cwd)
+  if status != 0:
+    raise Exception('Failed to run %s. error %d. output %s' % (cmd, status,
+                                                               output))
+  return (status, output)
+
+
+def Clone(git_url, git_repo, mirror):
+  """Clone a repository."""
+  if mirror:
+    return Git(git_repo, 'clone --mirror %s %s' % (git_url, git_repo))
+  cmd = 'git clone %s %s' % (git_url, git_repo)

[nsylvain, 2012/10/10 17:33:28]

Why can't you do Git('/', 'clone %s %s' % ..) ?

[szager, 2012/10/10 18:09:14]

The gotcha is that the directory git_repo might not exist, so we can't run a
command with cwd=git_repo, as Git() would do.

I changed it to explicitly os.mkdir(git_repo) and then call Git().

   (status, output) = GetStatusOutput(cmd)
   if status != 0:
     raise Exception('Failed to run %s. error %d. output %s' % (cmd, status,
                                                                output))
   return (status, output)
 
 
-def Clone(git_url, git_repo):
-  """Clone a repository."""
-  Git(git_repo, 'clone --mirror %s %s' % (git_url, git_repo))
-
-
-def Fetch(git_repo):
+def Fetch(git_repo, mirror):
   """Fetch the latest objects for a given git repository."""
-  Git(git_repo, 'fetch')
+  Git(git_repo, 'fetch', mirror)
 
 
 def Ping(git_repo):
   """Confirm that a remote repository URL is valid."""
   status, output = GetStatusOutput('git ls-remote ' + git_repo)
   return status == 0
 
 
 def CreateLessThanOrEqualRegex(number):
   """ Return a regular expression to test whether an integer less than or equal
@@ skipping 53 matching lines @@
   # Part 3: We add all the full ranges to match all numbers that are at least
   # one order of magnitude smaller than the original numbers.
   for index in range(1, num_len):
     expressions.append('[0-9]'*index)
 
   # All done. We now have our final regular expression.
   regex = '(%s)' % ('|'.join(expressions))
   return regex
 
 
-def Search(git_repo, svn_rev):
+def Search(git_repo, svn_rev, mirror):

[nsylvain, 2012/10/10 17:33:28]

Again i'm going to nitpick about the naming. It took me a while to understand
what that really meant.   What I think it means is more something like
"use_chrome_checkout=False".  It would probably be nice to use the word
"checkout" in the name so we see the link between both files.

Alternatively, could this be something like "bare=True" ?

[szager, 2012/10/10 18:09:14]

I think 'use_chrome_checkout' is overly-specific.  The real issue is this: is
this a regular clone, or a mirror?  And the only reason you need to know that is
to figure out whether to use --git-dir= when invoking git.

I could change it to 'is_mirror', if you'd prefer; and maybe it would be more
intuitive if I used a default value to clarify that it's a boolean:

def Search(git_repo, svn_rev, is_mirror=False)

WDYT?

   """Return the Git commit id matching the given SVN revision."""
   regex = CreateLessThanOrEqualRegex(svn_rev)
   (status, output) = Git(git_repo, ('log -E --grep=".*git-svn-id:.*@%s " '
-                                    '-1 --format=%%H FETCH_HEAD') % regex)
+                                    '-1 --format=%%H FETCH_HEAD') % regex,
+                         mirror)
   if output != '':
     output = output.splitlines()[0]
 
   print '%s: %s <-> %s' % (git_repo, output, svn_rev)
   if re.match('^[0-9a-fA-F]{40}$', output):
     return output
   raise Exception('Cannot find revision %s in %s' % (svn_rev, git_repo))