2 # TopGit - A different patch queue manager
3 # (c) Petr Baudis <pasky@suse.cz> 2008
20 branches="$1"; shift;;
33 echo "Usage: tg [...] export ([--collapse] NEWBRANCH | [-b BRANCH1,BRANCH2...] --quilt DIRECTORY | --linearize NEWBRANCH)" >&2
36 [ -z "$output" ] || die "output already specified ($output)"
43 [ -z "$branches" -o "$driver" = "quilt" ] ||
44 die "-b works only with the quilt driver"
46 [ "$driver" = "quilt" ] || ! "$numbered" ||
47 die "--numbered works only with the quilt driver";
49 [ "$driver" = "quilt" ] || ! "$flatten" ||
50 die "--flatten works only with the quilt driver"
52 if [ -z "$branches" ]; then
53 # this check is only needed when no branches have been passed
54 name="$(git symbolic-ref HEAD | sed 's#^refs/heads/##')"
55 base_rev="$(git rev-parse --short --verify "refs/top-bases/$name" 2>/dev/null)" ||
56 die "not on a TopGit-controlled branch"
60 playground="$(mktemp -d -t tg-export.XXXXXX)"
61 trap 'rm -rf "$playground"' EXIT
67 # Output tree ID of a cleaned-up tree without tg's artifacts.
70 git ls-tree --full-tree "$1" \
71 | awk -F ' ' '$2 !~ /^.top/' \
81 # Get commit message and authorship information
82 git cat-file blob "$name:.topmsg" | git mailinfo "$playground/^msg" /dev/null > "$playground/^info"
84 GIT_AUTHOR_NAME="$(sed -n '/^Author/ s/Author: //p' "$playground/^info")"
85 GIT_AUTHOR_EMAIL="$(sed -n '/^Email/ s/Email: //p' "$playground/^info")"
86 GIT_AUTHOR_DATE="$(sed -n '/^Date/ s/Date: //p' "$playground/^info")"
87 SUBJECT="$(sed -n '/^Subject/ s/Subject: //p' "$playground/^info")"
89 test -n "$GIT_AUTHOR_NAME" && export GIT_AUTHOR_NAME
90 test -n "$GIT_AUTHOR_EMAIL" && export GIT_AUTHOR_EMAIL
91 test -n "$GIT_AUTHOR_DATE" && export GIT_AUTHOR_DATE
93 (printf '%s\n\n' "$SUBJECT"; cat "$playground/^msg") |
95 git commit-tree "$tree" -p "$parent"
98 # collapsed_commit NAME
99 # Produce a collapsed commit of branch NAME.
104 rm -f "$playground/^pre" "$playground/^post"
108 parent="$(cut -f 1 "$playground/$name^parents")"
109 if [ "$(cat "$playground/$name^parents" | wc -l)" -gt 1 ]; then
110 # Produce a merge commit first
112 echo "TopGit-driven merge of branches:"
114 cut -f 2 "$playground/$name^parents"
115 } | git commit-tree "$(pretty_tree "refs/top-bases/$name")" \
116 $(for p in $parent; do echo -p $p; done))"
119 if branch_empty "$name"; then
122 create_tg_commit "$name" "$(pretty_tree $name)" "$parent"
125 echo "$name" >>"$playground/^ticker"
129 # This will collapse a single branch, using information about
130 # previously collapsed branches stored in $playground.
133 if [ -s "$playground/$_dep" ]; then
134 # We've already seen this dep
135 commit="$(cat "$playground/$_dep")"
137 elif [ -z "$_dep_is_tgish" ]; then
138 # This dep is not for rewrite
139 commit="$(git rev-parse --verify "$_dep")"
142 # First time hitting this dep; the common case
143 echo "Collapsing $_dep"
144 commit="$(collapsed_commit "$_dep")"
145 mkdir -p "$playground/$(dirname "$_dep")"
146 echo "$commit" >"$playground/$_dep"
149 # Propagate our work through the dependency chain
150 mkdir -p "$playground/$(dirname "$_name")"
151 echo "$commit $_dep" >>"$playground/$_name^parents"
159 if [ -z "$_dep_is_tgish" ]; then
160 # This dep is not for rewrite
165 bn="$(echo "$_dep.diff" | sed -e 's#_#__#g' -e 's#/#_#g')";
168 bn="$(basename "$_dep.diff")";
169 dn="$(dirname "$_dep.diff")/";
170 if [ "x$dn" = "x./" ]; then
175 if [ -e "$playground/$_dep" ]; then
176 # We've already seen this dep
180 mkdir -p "$playground/$(dirname "$_dep")";
181 touch "$playground/$_dep";
183 if branch_empty "$_dep"; then
184 echo "Skip empty patch $_dep";
187 number="$(echo $(($(cat "$playground/^number" 2>/dev/null) + 1)))";
188 bn="$(printf "%04u-$bn" $number)";
189 echo "$number" >"$playground/^number";
192 echo "Exporting $_dep"
193 mkdir -p "$output/$dn";
194 $tg patch "$_dep" >"$output/$dn$bn"
195 echo "$dn$bn -p1" >>"$output/series"
201 if test ! -f "$playground/^BASE"; then
202 head="$(git rev-parse --verify "$_dep")"
203 echo "$head" > "$playground/^BASE"
204 git checkout -q "$head"
208 head=$(git rev-parse --verify HEAD)
210 if [ -z "$_dep_is_tgish" ]; then
211 # merge in $_dep unless already included
212 rev="$(git rev-parse --verify "$_dep")";
213 common="$(git merge-base --all HEAD "$_dep")";
214 if test "$rev" = "$common"; then
215 # already included, just skip
220 git merge -s recursive "$_dep" || retmerge="$?";
221 if test "x$retmerge" != "x0"; then
222 echo fix up the merge, commit and then exit;
230 git merge-recursive "$(pretty_tree "refs/top-bases/$_dep")" -- HEAD "$(pretty_tree "refs/heads/$_dep")" || retmerge="$?";
232 if test "x$retmerge" != "x0"; then
234 echo "fix up the merge and update the index. Don't commit!"
239 result_tree=$(git write-tree)
240 # testing branch_empty might not always give the right answer.
241 # It can happen that the patch is non-empty but still after
242 # linearizing there is no change. So compare the trees.
243 if test "x$result_tree" = "x$(git rev-parse $head^{tree})"; then
244 echo "skip empty commit $_dep";
246 newcommit=$(create_tg_commit "$_dep" "$result_tree" HEAD)
247 git update-ref HEAD $newcommit $head
248 echo "exported commit $_dep";
255 if [ "$driver" = "collapse" ] || [ "$driver" = "linearize" ]; then
257 die "no target branch specified"
258 ! ref_exists "$output" ||
259 die "target branch '$output' already exists; first run: git branch -D $output"
261 elif [ "$driver" = "quilt" ]; then
263 die "no target directory specified"
264 [ ! -e "$output" ] ||
265 die "target directory already exists: $output"
273 case $_dep in refs/remotes/*) return;; esac
274 branch_needs_update >/dev/null
276 die "cancelling export of $_dep (-> $_name): branch not up-to-date"
281 # Call driver on all the branches - this will happen
282 # in topological order.
283 if [ -z "$branches" ]; then
284 recurse_deps driver "$name"
285 (_ret=0; _dep="$name"; _name=""; _dep_is_tgish=1; driver)
287 echo "$branches" | tr ',' '\n' | while read _dep; do
291 name="$(echo "$branches" | sed 's/.*,//')"
295 if [ "$driver" = "collapse" ]; then
296 git update-ref "refs/heads/$output" "$(cat "$playground/$name")" ""
298 depcount="$(cat "$playground/^ticker" | wc -l)"
299 echo "Exported topic branch $name (total $depcount topics) to branch $output"
301 elif [ "$driver" = "quilt" ]; then
302 depcount="$(cat "$output/series" | wc -l)"
303 echo "Exported topic branch $name (total $depcount topics) to directory $output"
305 elif [ "$driver" = "linearize" ]; then
306 git checkout -q -b $output
309 if test $(git rev-parse "$(pretty_tree $name)^{tree}") != $(git rev-parse "HEAD^{tree}"); then
310 echo "Warning: Exported result doesn't match";
311 echo "tg-head=$(git rev-parse "$name"), exported=$(git rev-parse "HEAD")";
312 #git diff $head HEAD;