tools/git-sync-deps improvements

  * Use `/usr/bin/env python` patten: more robust on non-standard systems.
  * Factor out status line, make formatting clearer.
  * Alwyas call `git remote set-url origin $repo` since it is quick.
  * Find `fetch-gn` script more robustly.
  * `--help` works again.
  * handling deps_os better
  * check to see that directories don't include each other

Change-Id: I06806226e2c263147723c6326c09c5e385abc68d
Reviewed-on: https://skia-review.googlesource.com/7646
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Hal Canary <halcanary@google.com>

1 files changed, 40 insertions, 21 deletions

diff --git a/tools/git-sync-deps b/tools/git-sync-deps
index 2ff342723f..8fec0aa45a 100755
--- a/tools/git-sync-deps
+++ b/tools/git-sync-deps
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # Copyright 2014 Google Inc.
 #
 # Use of this source code is governed by a BSD-style license that can be
@@ -63,12 +63,12 @@ DEFAULT_DEPS_PATH = os.path.normpath(
 def usage(deps_file_path = None):
   sys.stderr.write(
     'Usage: run to grab dependencies, with optional platform support:\n')
-  sys.stderr.write('  python %s' % __file__)
+  sys.stderr.write('  %s %s' % (sys.executable, __file__))
   if deps_file_path:
-    for deps_os in parse_file_to_dict(deps_file_path)['deps_os']:
-      sys.stderr.write(' [%s]' % deps_os)
-  else:
-    sys.stderr.write(' [DEPS_OS...]')
+    parsed_deps = parse_file_to_dict(deps_file_path)
+    if 'deps_os' in parsed_deps:
+      for deps_os in parsed_deps['deps_os']:
+        sys.stderr.write(' [%s]' % deps_os)
   sys.stderr.write('\n\n')
   sys.stderr.write(__doc__)
 
@@ -99,6 +99,15 @@ def is_git_toplevel(git, directory):
     return False
 
 
+def status(directory, checkoutable):
+  def truncate(s, length):
+    return s if len(s) <= length else s[:(length - 3)] + '...'
+  dlen = 36
+  directory = truncate(directory, dlen)
+  checkoutable = truncate(checkoutable, 40)
+  sys.stdout.write('%-*s @ %s\n' % (dlen, directory, checkoutable))
+
+
 def git_checkout_to_directory(git, repo, checkoutable, directory, verbose):
   """Checkout (and clone if needed) a Git repository.
 
@@ -137,20 +146,20 @@ def git_checkout_to_directory(git, repo, checkoutable, directory, verbose):
       [git, 'checkout', '--quiet', checkoutable], cwd=directory):
     # if this succeeds, skip slow `git fetch`.
     if verbose:
-      sys.stdout.write('%s\n  @ %s\n' % (directory, checkoutable))
+      status(directory, checkoutable)  # Success.
     return
 
+  # If the repo has changed, always force use of the correct repo.
+  # If origin already points to repo, this is a quick no-op.
+  subprocess.check_call(
+      [git, 'remote', 'set-url', 'origin', repo], cwd=directory)
+
   subprocess.check_call([git, 'fetch', '--quiet'], cwd=directory)
 
-  if 0 != subprocess.call(
-      [git, 'checkout', '--quiet', checkoutable], cwd=directory):
-      subprocess.check_call(
-          [git, 'remote', 'set-url', 'origin', repo], cwd=directory)
-      subprocess.check_call([git, 'fetch', '--quiet'], cwd=directory)
-      subprocess.check_call([git, 'checkout', '--quiet'], cwd=directory)
+  subprocess.check_call([git, 'checkout', '--quiet'], cwd=directory)
 
   if verbose:
-    sys.stdout.write('%s\n  @ %s\n' % (directory, checkoutable))  # Success.
+    status(directory, checkoutable)  # Success.
 
 
 def parse_file_to_dict(path):
@@ -177,13 +186,21 @@ def git_sync_deps(deps_file_path, command_line_os_requests, verbose):
   deps_file_directory = os.path.dirname(deps_file_path)
   deps_file = parse_file_to_dict(deps_file_path)
   dependencies = deps_file['deps'].copy()
-  os_specific_dependencies = deps_file.get('deps_os', [])
-  for os_name in command_line_os_requests:
-    # Add OS-specific dependencies
-    if os_name in os_specific_dependencies:
-      dependencies.update(os_specific_dependencies[os_name])
-  list_of_arg_lists = []
+  os_specific_dependencies = deps_file.get('deps_os', dict())
+  if 'all' in command_line_os_requests:
+    for value in os_specific_dependencies.itervalues():
+      dependencies.update(value)
+  else:
+    for os_name in command_line_os_requests:
+      # Add OS-specific dependencies
+      if os_name in os_specific_dependencies:
+        dependencies.update(os_specific_dependencies[os_name])
   for directory in dependencies:
+    for other_dir in dependencies:
+      if directory.startswith(other_dir + '/'):
+        raise Exception('%r is parent of %r' % (other_dir, directory))
+  list_of_arg_lists = []
+  for directory in sorted(dependencies):
     if '@' in dependencies[directory]:
       repo, checkoutable = dependencies[directory].split('@', 1)
     else:
@@ -223,7 +240,9 @@ def main(argv):
     return 1
 
   git_sync_deps(deps_file_path, argv, verbose)
-  subprocess.check_call([sys.executable, 'bin/fetch-gn'])
+  subprocess.check_call(
+      [sys.executable,
+       os.path.join(os.path.dirname(deps_file_path), 'bin', 'fetch-gn')])
   return 0