X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topgit.git;a=blobdiff_plain;f=tg-export.sh;h=52af88dfd14e891627b145f63702b1212155a82c;hp=db491691e6b17923b78b20389a0af59414ec20a1;hb=6643a8f637eb11b0a6e1879431eb1a9c60bf89b0;hpb=4f4b13970bdf1b55367e57381cff30b69f9d25f3 diff --git a/tg-export.sh b/tg-export.sh index db49169..52af88d 100644 --- a/tg-export.sh +++ b/tg-export.sh @@ -4,7 +4,9 @@ # GPLv2 name= +branches= output= +driver=collapse ## Parse options @@ -12,40 +14,39 @@ output= while [ -n "$1" ]; do arg="$1"; shift case "$arg" in + -b) + branches="$1"; shift;; + --quilt) + driver=quilt;; + --collapse) + driver=collapse;; -*) - echo "Usage: tg export NEWBRANCH" >&2 + echo "Usage: tg [...] export ([--collapse] NEWBRANCH | [-b BRANCH1,BRANCH2...] --quilt DIRECTORY)" >&2 exit 1;; *) - [ -z "$output" ] || die "new branch already specified ($output)" + [ -z "$output" ] || die "output already specified ($output)" output="$arg";; esac done -name="$(git symbolic-ref HEAD | sed 's#^refs/heads/##')" -base_rev="$(git rev-parse --short --verify "refs/top-bases/$name" 2>/dev/null)" || - die "not on a TopGit-controlled branch" -[ -n "$output" ] || - die "no target branch specified" +[ -z "$branches" -o "$driver" = "quilt" ] || + die "-b works only with the quilt driver" -! git rev-parse --verify "$output" >/dev/null 2>&1 || - die "target branch '$output' already exists; first run: git branch -D $output" +if [ -z "$branches" ]; then + # this check is only needed when no branches have been passed + name="$(git symbolic-ref HEAD | sed 's#^refs/heads/##')" + base_rev="$(git rev-parse --short --verify "refs/top-bases/$name" 2>/dev/null)" || + die "not on a TopGit-controlled branch" +fi -playground="$(mktemp -d)" +playground="$(mktemp -d -t tg-export.XXXXXX)" trap 'rm -rf "$playground"' EXIT -# 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 -} + +## Collapse driver # pretty_tree NAME # Output tree ID of a cleaned-up tree without tg's artifacts. @@ -67,19 +68,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")" @@ -93,27 +91,18 @@ 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" } -# collapse_one +# collapse # This will collapse a single branch, using information about # previously collapsed branches stored in $playground. -collapse_one() +collapse() { - branch_needs_update >/dev/null - [ "$_ret" -eq 0 ] || - die "cancelling $_ret export of $_dep (-> $_name): branch not up-to-date" - if [ -s "$playground/$_dep" ]; then # We've already seen this dep commit="$(cat "$playground/$_dep")" @@ -124,11 +113,10 @@ collapse_one() 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 @@ -136,12 +124,78 @@ collapse_one() echo "$commit $_dep" >>"$playground/$_name^parents" } -# Collapse all the branches - this way, collapse_one will be -# called in topological order. -recurse_deps collapse_one "$name" -(_ret=0; _dep="$name"; _name=""; _dep_is_tgish=1; collapse_one) -git update-ref "refs/heads/$output" "$(cat "$playground/$name")" +## Quilt driver + +quilt() +{ + if [ -z "$_dep_is_tgish" ]; then + # This dep is not for rewrite + return + fi + + filename="$output/$_dep.diff" + if [ -e "$filename" ]; then + # We've already seen this dep + return + fi + + echo "Exporting $_dep" + mkdir -p "$(dirname "$filename")" + $tg patch "$_dep" >"$filename" + echo "$_dep.diff -p1" >>"$output/series" +} + + +## Machinery + +if [ "$driver" = "collapse" ]; then + [ -n "$output" ] || + die "no target branch specified" + ! ref_exists "$output" || + die "target branch '$output' already exists; first run: git branch -D $output" + +elif [ "$driver" = "quilt" ]; then + [ -n "$output" ] || + die "no target directory specified" + [ ! -e "$output" ] || + die "target directory already exists: $output" + + mkdir -p "$output" +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" + + $driver +} -depcount="$(cat "$playground/^ticker" | wc -l)" -echo "Exported topic branch $name (total $depcount topics) to branch $output" +# Call driver on all the branches - this will happen +# in topological order. +if [ -z "$branches" ]; then + recurse_deps driver "$name" + (_ret=0; _dep="$name"; _name=""; _dep_is_tgish=1; driver) +else + echo "$branches" | tr ',' '\n' | while read _dep; do + _dep_is_tgish=1 + $driver + done + name="$(echo "$branches" | sed 's/.*,//')" +fi + + +if [ "$driver" = "collapse" ]; then + 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" + +elif [ "$driver" = "quilt" ]; then + depcount="$(cat "$output/series" | wc -l)" + echo "Exported topic branch $name (total $depcount topics) to directory $output" +fi