+## Quilt driver
+
+quilt()
+{
+ if [ -z "$_dep_is_tgish" ]; then
+ # This dep is not for rewrite
+ return
+ fi
+
+ if "$flatten"; then
+ bn="$(echo "$_dep.diff" | sed -e 's#_#__#g' -e 's#/#_#g')";
+ dn="";
+ else
+ bn="$(basename "$_dep.diff")";
+ dn="$(dirname "$_dep.diff")/";
+ if [ "x$dn" = "x./" ]; then
+ dn="";
+ fi;
+ fi;
+
+ if [ -e "$playground/$_dep" ]; then
+ # We've already seen this dep
+ return
+ fi
+
+ mkdir -p "$playground/$(dirname "$_dep")";
+ touch "$playground/$_dep";
+
+ if branch_empty "$_dep"; then
+ echo "Skip empty patch $_dep";
+ else
+ if "$numbered"; then
+ number="$(echo $(($(cat "$playground/^number" 2>/dev/null) + 1)))";
+ bn="$(printf "%04u-$bn" $number)";
+ echo "$number" >"$playground/^number";
+ fi;
+
+ echo "Exporting $_dep"
+ mkdir -p "$output/$dn";
+ $tg patch "$_dep" >"$output/$dn$bn"
+ echo "$dn$bn -p1" >>"$output/series"
+ fi
+}
+
+linearize()
+{
+ if test ! -f "$playground/^BASE"; then
+ head="$(git rev-parse --verify "$_dep")"
+ echo "$head" > "$playground/^BASE"
+ git checkout -q "$head"
+ return;
+ fi;
+
+ head=$(git rev-parse --verify HEAD)
+
+ if [ -z "$_dep_is_tgish" ]; then
+ # merge in $_dep unless already included
+ rev="$(git rev-parse --verify "$_dep")";
+ common="$(git merge-base --all HEAD "$_dep")";
+ if test "$rev" = "$common"; then
+ # already included, just skip
+ :;
+ else
+ retmerge=0;
+
+ git merge -s recursive "$_dep" || retmerge="$?";
+ if test "x$retmerge" != "x0"; then
+ echo fix up the merge, commit and then exit;
+ #todo error handling
+ sh -i </dev/tty;
+ fi;
+ fi;
+ else
+ retmerge=0;
+
+ git merge-recursive "$(pretty_tree "refs/top-bases/$_dep")" -- HEAD "$(pretty_tree "refs/heads/$_dep")" || retmerge="$?";
+
+ if test "x$retmerge" != "x0"; then
+ git rerere;
+ echo "fix up the merge and update the index. Don't commit!"
+ #todo error handling
+ sh -i </dev/tty;
+ fi
+
+ result_tree=$(git write-tree)
+ # testing branch_empty might not always give the right answer.
+ # It can happen that the patch is non-empty but still after
+ # linearizing there is no change. So compare the trees.
+ if test "x$result_tree" = "x$(git rev-parse $head^{tree})"; then
+ echo "skip empty commit $_dep";
+ else
+ newcommit=$(create_tg_commit "$_dep" "$result_tree" HEAD)
+ git update-ref HEAD $newcommit $head
+ echo "exported commit $_dep";
+ fi
+ fi
+}
+
+## Machinery
+
+if [ "$driver" = "collapse" ] || [ "$driver" = "linearize" ]; 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"
+
+elif [ "$driver" = "linearize" ]; then
+ git checkout -q -b $output
+
+ echo $name
+ if test $(git rev-parse "$(pretty_tree $name)^{tree}") != $(git rev-parse "HEAD^{tree}"); then
+ echo "Warning: Exported result doesn't match";
+ echo "tg-head=$(git rev-parse "$name"), exported=$(git rev-parse "HEAD")";
+ #git diff $head HEAD;
+ fi;
+
+fi