2 # TopGit - A different patch queue manager
3 # (c) Petr Baudis <pasky@suse.cz> 2008
18 branches="$1"; shift;;
24 echo "Usage: tg [...] export ([--collapse] NEWBRANCH | [-b BRANCH1,BRANCH2...] --quilt DIRECTORY)" >&2
27 [ -z "$output" ] || die "output already specified ($output)"
34 [ -z "$branches" -o "$driver" = "quilt" ] ||
35 die "-b works only with the quilt driver"
37 if [ -z "$branches" ]; then
38 # this check is only needed when no branches have been passed
39 name="$(git symbolic-ref HEAD | sed 's#^refs/heads/##')"
40 base_rev="$(git rev-parse --short --verify "refs/top-bases/$name" 2>/dev/null)" ||
41 die "not on a TopGit-controlled branch"
45 playground="$(mktemp -d -t tg-export.XXXXXX)"
46 trap 'rm -rf "$playground"' EXIT
52 # Output tree ID of a cleaned-up tree without tg's artifacts.
55 (export GIT_INDEX_FILE="$playground/^index"
57 git update-index --force-remove ".topmsg" ".topdeps"
61 # collapsed_commit NAME
62 # Produce a collapsed commit of branch NAME.
67 rm -f "$playground/^pre" "$playground/^post"
70 # Get commit message and authorship information
71 git cat-file blob "$name:.topmsg" | git mailinfo "$playground/^msg" /dev/null > "$playground/^info"
73 GIT_AUTHOR_NAME="$(sed -n '/^Author/ s/Author: //p' "$playground/^info")"
74 GIT_AUTHOR_EMAIL="$(sed -n '/^Email/ s/Email: //p' "$playground/^info")"
75 GIT_AUTHOR_DATE="$(sed -n '/^Date/ s/Date: //p' "$playground/^info")"
76 SUBJECT="$(sed -n '/^Subject/ s/Subject: //p' "$playground/^info")"
78 test -n "$GIT_AUTHOR_NAME" && export GIT_AUTHOR_NAME
79 test -n "$GIT_AUTHOR_EMAIL" && export GIT_AUTHOR_EMAIL
80 test -n "$GIT_AUTHOR_DATE" && export GIT_AUTHOR_DATE
83 parent="$(cut -f 1 "$playground/$name^parents")"
84 if [ "$(cat "$playground/$name^parents" | wc -l)" -gt 1 ]; then
85 # Produce a merge commit first
87 echo "TopGit-driven merge of branches:"
89 cut -f 2 "$playground/$name^parents"
90 } | git commit-tree "$(pretty_tree "refs/top-bases/$name")" \
91 $(for p in $parent; do echo -p $p; done))"
94 (printf '%s\n\n' "$SUBJECT"; cat "$playground/^msg") |
96 git commit-tree "$(pretty_tree "$name")" -p "$parent"
98 echo "$name" >>"$playground/^ticker"
102 # This will collapse a single branch, using information about
103 # previously collapsed branches stored in $playground.
106 if [ -s "$playground/$_dep" ]; then
107 # We've already seen this dep
108 commit="$(cat "$playground/$_dep")"
110 elif [ -z "$_dep_is_tgish" ]; then
111 # This dep is not for rewrite
112 commit="$(git rev-parse --verify "$_dep")"
115 # First time hitting this dep; the common case
116 echo "Collapsing $_dep"
117 commit="$(collapsed_commit "$_dep")"
118 mkdir -p "$playground/$(dirname "$_dep")"
119 echo "$commit" >"$playground/$_dep"
122 # Propagate our work through the dependency chain
123 mkdir -p "$playground/$(dirname "$_name")"
124 echo "$commit $_dep" >>"$playground/$_name^parents"
132 if [ -z "$_dep_is_tgish" ]; then
133 # This dep is not for rewrite
137 filename="$output/$_dep.diff"
138 if [ -e "$filename" ]; then
139 # We've already seen this dep
143 if branch_empty "$_dep"; then
144 echo "Skip empty patch $_dep";
146 echo "Exporting $_dep"
147 mkdir -p "$(dirname "$filename")"
148 $tg patch "$_dep" >"$filename"
149 echo "$_dep.diff -p1" >>"$output/series"
156 if [ "$driver" = "collapse" ]; then
158 die "no target branch specified"
159 ! ref_exists "$output" ||
160 die "target branch '$output' already exists; first run: git branch -D $output"
162 elif [ "$driver" = "quilt" ]; then
164 die "no target directory specified"
165 [ ! -e "$output" ] ||
166 die "target directory already exists: $output"
174 case $_dep in refs/remotes/*) return;; esac
175 branch_needs_update >/dev/null
177 die "cancelling export of $_dep (-> $_name): branch not up-to-date"
182 # Call driver on all the branches - this will happen
183 # in topological order.
184 if [ -z "$branches" ]; then
185 recurse_deps driver "$name"
186 (_ret=0; _dep="$name"; _name=""; _dep_is_tgish=1; driver)
188 echo "$branches" | tr ',' '\n' | while read _dep; do
192 name="$(echo "$branches" | sed 's/.*,//')"
196 if [ "$driver" = "collapse" ]; then
197 git update-ref "refs/heads/$output" "$(cat "$playground/$name")" ""
199 depcount="$(cat "$playground/^ticker" | wc -l)"
200 echo "Exported topic branch $name (total $depcount topics) to branch $output"
202 elif [ "$driver" = "quilt" ]; then
203 depcount="$(cat "$output/series" | wc -l)"
204 echo "Exported topic branch $name (total $depcount topics) to directory $output"