# GPLv2
name=
+branches=
output=
+driver=collapse
## Parse options
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.
{
(export GIT_INDEX_FILE="$playground/^index"
git read-tree "$1"
- git update-index --force-remove ".top*"
+ git update-index --force-remove ".topmsg" ".topdeps"
git write-tree)
}
>"$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")"
$(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"
+ if branch_empty "$name"; then
+ echo "$parent";
+ else
+ (printf '%s\n\n' "$SUBJECT"; cat "$playground/^msg") |
+ git stripspace |
+ git commit-tree "$(pretty_tree "$name")" -p "$parent"
+ fi;
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")"
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
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
+
+ if branch_empty "$_dep"; then
+ echo "Skip empty patch $_dep";
+ else
+ echo "Exporting $_dep"
+ mkdir -p "$(dirname "$filename")"
+ $tg patch "$_dep" >"$filename"
+ echo "$_dep.diff -p1" >>"$output/series"
+ fi
+}
+
+
+## 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
+}
+
+# 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
-depcount="$(cat "$playground/^ticker" | wc -l)"
-echo "Exported topic branch $name (total $depcount topics) to branch $output"
+# vim:noet
~ian / topgit.git / blobdiff