Refactor with fixes for msys-git.

git-crup

Index: git-crup
diff --git a/git-crup b/git-crup
index 155afda63c6629f86336d0076851b00ed1bb4d53..dcc1ab548325305c6817ffdb8087d1c60c51827b 100755
--- a/git-crup
+++ b/git-crup
@@ -7,61 +7,40 @@
 # submodule-based checkout.  Fetches latest commits for top-level solutions;
 # updates submodules; and runs post-sync hooks.
 
-# Auto-update depot_tools
-if [ -z "$GIT_CRUP_REINVOKE" ]; then
-  update_depot_tools || exit 1
-  GIT_CRUP_REINVOKE=1 exec bash "$0" "$@"
-fi
-
-export GIT_MERGE_AUTOEDIT=0
-
+orig_args="$@"
 ECHO=
 pull=pull
 pull_args=
 hooks=yes
 j=10
 crup_runner="crup-runner.sh"
-runhooks="git-runhooks"
-
-kernel_name=$(uname -s)
-if [ "${kernel_name:0:5}" = "MINGW" -o "${kernel_name:0:6}" = "CYGWIN" ]; then
-  GIT_EXE=git.exe
-else
-  GIT_EXE=git
-fi
-export GIT_EXE
-
-if ( echo test | xargs --max-lines=1 true 2>/dev/null ); then
-  max_lines="--max-lines=1"
-else
-  max_lines="-L 1"
-fi
-
-if ( echo test | xargs -I bar true 2>/dev/null ); then
-  replace_arg="-I replace_arg"
-else
-  replace_arg="-ireplace_arg"
-fi
 
 usage() {
   cat <<EOF
 Usage: git-crup [-n|--dry-run] [--fetch|--sync] [-j|--jobs [jobs]]
     [--no-hooks] [<args to git-pull or git-fetch>]
+
+    -n, --dry-run        Don't do anything; just show what would have been done.
+    --fetch              Run 'git fetch' on top-level sources, but don't merge.
+    --sync               Don't do anything at all to the top-level sources.
+    -j, --jobs           Run this many jobs in parallel.
+    --no-hooks           Don't run hooks (e.g., to generate build files) after
+                         updating.
 EOF
 }
 
 serial_update() {
   ( cd "$1"
     if test -n "$toplevel_cmd"; then
-      $toplevel_cmd | sed "s/^/[$1] /g"
+      $ECHO $toplevel_cmd | sed "s/^/[$1] /g"
       if [ $? -ne 0 ]; then
         return $?
       fi
     fi
-    $GIT_EXE submodule --quiet sync
-    $GIT_EXE ls-files -s | grep ^160000 | awk '{print $4}' |
+    $ECHO $GIT_EXE submodule --quiet sync
+    $ECHO $GIT_EXE ls-files -s | grep ^160000 | awk '{print $4}' |
     while read submod; do
-      "$crup_runner" "$1/$submod"
+      $ECHO "$crup_runner" "$1/$submod"
     done
   )
 }
@@ -109,6 +88,31 @@ while test $# -ne 0; do
   shift
 done
 
+kernel_name=$(uname -s)
+if [ "${kernel_name:0:5}" = "MINGW" -o "${kernel_name:0:6}" = "CYGWIN" ]; then

[iannucci, 2013/03/19 22:11:52]

Why not do `which git` and fall back to git.exe?

[szager1, 2013/03/20 21:47:01]

On further examination, I don't think GIT_EXE is even necessary.  I was
concerned before that running 'git' on Windows would go through the whole
wrapper stack, but that doesn't appear to be the case.  So, I have just
s/GIT_EXE/git/ everywhere.

+  GIT_EXE=git.exe
+else
+  GIT_EXE=git
+fi
+
+# Auto-update depot_tools
+if [ -z "$GIT_CRUP_REINVOKE" ]; then
+  if [ "${kernel_name:0:5}" = "MINGW" ]; then
+    # Windows behaves badly if you rewrite a file while it's being executed,
+    # which might happen when update_depot_tools runs.
+    cat <<EOF > "$TEMP/git_crup_reinvoke.sh"
+#!/bin/bash
+
+cmd '/C update_depot_tools.bat'
+GIT_CRUP_REINVOKE=1 exec bash "$0" $orig_args
+EOF
+    exec bash "$TEMP/git_crup_reinvoke.sh"
+  else
+    update_depot_tools
+    GIT_CRUP_REINVOKE=1 exec bash "$0" $orig_args

[iannucci, 2013/03/19 22:11:52]

Why not just do the windows-path on all platforms? Less likely to have a
platform specific breakage and it can't hurt anything...

[szager1, 2013/03/20 21:47:01]

I separated out copying off upate_depot_tools.bat to this CL:

https://codereview.chromium.org/12755033/

This script will now run from a temporary bash script on all platforms.

+  fi
+fi
+
 while test "$PWD" != "/"; do
   if test -f "$PWD/src/.gitmodules"; then
     break
@@ -120,6 +124,21 @@ if test "$PWD" = "/"; then
   exit 1
 fi
 
+export GIT_EXE
+export GIT_MERGE_AUTOEDIT=no
+
+if ( echo test | xargs --max-lines=1 true 2>/dev/null ); then
+  max_lines="--max-lines=1"
+else
+  max_lines="-L 1"
+fi
+
+if ( echo test | xargs -I bar true 2>/dev/null ); then
+  replace_arg="-I replace_arg"
+else
+  replace_arg="-ireplace_arg"
+fi
+
 if ( echo test test | xargs -P 2 true 2>/dev/null ); then
   xargs_parallel=yes
 else
@@ -139,8 +158,8 @@ set -o pipefail
 if test "$xargs_parallel" = "yes"; then
   ( ls -d */.git | sed 's/\/\.git$//' |
    xargs $max_lines $replace_arg -P "$j" \
-      "$crup_runner" replace_arg $toplevel_cmd |
-   xargs $max_lines -P "$j" "$crup_runner" )
+       "$crup_runner" replace_arg $ECHO $toplevel_cmd |
+   xargs $max_lines -P "$j" $ECHO "$crup_runner" )
 else 
   ls -d */.git |
   while read gitdir; do
@@ -159,7 +178,7 @@ EOF
 fi
 
 if [ "$hooks" = "yes" ]; then
-  "$runhooks"
+  $ECHO $GIT_EXE runhooks
   status=$?
 fi