tg update: Fix resume message

[topgit.git] / tg-export.sh

diff --git a/tg-export.sh b/tg-export.sh
index 4ce54cd1e96a903a72781eb90af0e63c9ff831cf..6098c1a8b4580914aee5143cafaf8b035237e376 100644 (file)
--- a/tg-export.sh
+++ b/tg-export.sh
@@ -18,7 +18,7 @@ while [ -n "$1" ]; do
        --collapse)
                driver=collapse;;
        -*)
-               echo "Usage: tg export ([--collapse] NEWBRANCH | --quilt DIRECTORY)" >&2
+               echo "Usage: tg [...] export ([--collapse] NEWBRANCH | --quilt DIRECTORY)" >&2
                exit 1;;
        *)
                [ -z "$output" ] || die "output already specified ($output)"
@@ -32,23 +32,12 @@ base_rev="$(git rev-parse --short --verify "refs/top-bases/$name" 2>/dev/null)"
        die "not on a TopGit-controlled branch"
 
 
-playground="$(mktemp -d)"
+playground="$(mktemp -d -t tg-export.XXXXXX)"
 trap 'rm -rf "$playground"' EXIT
 
 
 ## Collapse driver
 
-# Trusty Cogito code:
-load_author()
-{
-       if [ -z "$GIT_AUTHOR_NAME" ] && echo "$1" | grep -q '^[^< ]'; then
-               export GIT_AUTHOR_NAME="$(echo "$1" | sed 's/ *<.*//')"
-       fi
-       if [ -z "$GIT_AUTHOR_EMAIL" ] && echo "$1" | grep -q '<.*>'; then
-               export GIT_AUTHOR_EMAIL="$(echo "$1" | sed 's/.*<\(.*\)>.*/\1/')"
-       fi
-}
-
 # pretty_tree NAME
 # Output tree ID of a cleaned-up tree without tg's artifacts.
 pretty_tree()
@@ -69,19 +58,16 @@ collapsed_commit()
        >"$playground/^body"
 
        # Get commit message and authorship information
-       git cat-file blob "$name:.topmsg" >"$playground/^msg"
-       while read line; do
-               if [ -z "$line" ]; then
-                       # end of header
-                       cat >"$playground/^body"
-                       break
-               fi
-               case "$line" in
-               From:*) load_author "${line#From: }";;
-               Subject:*) echo "${line#Subject: }" >>"$playground/^pre";;
-               *) echo "$line" >>"$playground/^post";;
-               esac
-       done <"$playground/^msg"
+       git cat-file blob "$name:.topmsg" | git mailinfo "$playground/^msg" /dev/null > "$playground/^info"
+
+       GIT_AUTHOR_NAME="$(sed -n '/^Author/ s/Author: //p' "$playground/^info")"
+       GIT_AUTHOR_EMAIL="$(sed -n '/^Email/ s/Email: //p' "$playground/^info")"
+       GIT_AUTHOR_DATE="$(sed -n '/^Date/ s/Date: //p' "$playground/^info")"
+       SUBJECT="$(sed -n '/^Subject/ s/Subject: //p' "$playground/^info")"
+
+       test -n "$GIT_AUTHOR_NAME" && export GIT_AUTHOR_NAME
+       test -n "$GIT_AUTHOR_EMAIL" && export GIT_AUTHOR_EMAIL
+       test -n "$GIT_AUTHOR_DATE" && export GIT_AUTHOR_DATE
 
        # Determine parent
        parent="$(cut -f 1 "$playground/$name^parents")"
@@ -95,14 +81,9 @@ collapsed_commit()
                        $(for p in $parent; do echo -p $p; done))"
        fi
 
-       {
-               if [ -s "$playground/^pre" ]; then
-                       cat "$playground/^pre"
-                       echo
-               fi
-               cat "$playground/^body"
-               [ ! -s "$playground/^post" ] || cat "$playground/^post"
-       } | git commit-tree "$(pretty_tree "$name")" -p "$parent"
+       (printf '%s\n\n' "$SUBJECT"; cat "$playground/^msg") |
+       git stripspace |
+       git commit-tree "$(pretty_tree "$name")" -p "$parent"
 
        echo "$name" >>"$playground/^ticker"
 }
@@ -122,11 +103,10 @@ collapse()
 
        else
                # First time hitting this dep; the common case
+               echo "Collapsing $_dep"
                commit="$(collapsed_commit "$_dep")"
-
                mkdir -p "$playground/$(dirname "$_dep")"
                echo "$commit" >"$playground/$_dep"
-               echo "Collapsed $_dep"
        fi
 
        # Propagate our work through the dependency chain
@@ -150,10 +130,10 @@ quilt()
                return
        fi
 
+       echo "Exporting $_dep"
        mkdir -p "$(dirname "$filename")"
-       tg patch "$_dep" >"$filename"
+       $tg patch "$_dep" >"$filename"
        echo "$_dep.diff -p1" >>"$output/series"
-       echo "Exported $_dep"
 }
 
 
@@ -162,7 +142,7 @@ quilt()
 if [ "$driver" = "collapse" ]; then
        [ -n "$output" ] ||
                die "no target branch specified"
-       ! git rev-parse --verify "$output" >/dev/null 2>&1 ||
+       ! ref_exists "$output"  ||
                die "target branch '$output' already exists; first run: git branch -D $output"
 
 elif [ "$driver" = "quilt" ]; then
@@ -177,6 +157,7 @@ fi
 
 driver()
 {
+       case $_dep in refs/remotes/*) return;; esac
        branch_needs_update >/dev/null
        [ "$_ret" -eq 0 ] ||
                die "cancelling export of $_dep (-> $_name): branch not up-to-date"
@@ -191,7 +172,7 @@ recurse_deps driver "$name"
 
 
 if [ "$driver" = "collapse" ]; then
-       git update-ref "refs/heads/$output" "$(cat "$playground/$name")"
+       git update-ref "refs/heads/$output" "$(cat "$playground/$name")" ""
 
        depcount="$(cat "$playground/^ticker" | wc -l)"
        echo "Exported topic branch $name (total $depcount topics) to branch $output"