2 # TopGit - A different patch queue manager
3 # Copyright (C) Petr Baudis <pasky@suse.cz> 2008
4 # Copyright (C) Kyle J. McKay <mackyle@gmail.com> 2015,2016,2017
8 deps
= # List of dependent branches
9 merge
= # List of branches to be merged; subset of $deps
11 rname
= # Remote branch to base this one on
27 USAGE
="Usage: ${tgname:-tg} [... -r remote] create [-q] [-m <msg> | -F <file>] [--topmsg <msg> | --topmsg-file <file>] [-n] [--no-commit] [--base] [<name> [<dep>...|-r [<rname>]] ]"
31 if [ "${1:-0}" != 0 ]; then
32 printf '%s\n' "$USAGE" >&2
34 printf '%s\n' "$USAGE"
41 [ -n "$quiet" ] || info
"$@"
46 while [ $# -gt 0 ]; do case "$1" in
68 -m|
--message|
--message=*)
69 case "$1" in --message=*)
72 set -- --message "${x#--message=}" "$@"
75 echo "The $1 option requires an argument" >&2
81 --tm|
--tm=*|
--topmsg|
--topmsg=*)
86 set -- --tm "${x#--tm=}" "$@";;
90 set -- --topmsg "${x#--topmsg=}" "$@";;
93 echo "The $1 option requires an argument" >&2
100 case "$1" in --file=*)
103 set -- --file "${x#--file=}" "$@"
105 if [ $# -lt 2 ]; then
106 echo "The $1 option requires an argument" >&2
112 --tF|
--tF=*|
--topmsg-file|
--topmsg-file=*)
117 set -- --tF "${x#--tF=}" "$@";;
121 set -- --topmsg-file "${x#--topmsg-file=}" "$@";;
123 if [ $# -lt 2 ]; then
124 echo "The $1 option requires an argument" >&2
132 rname
="$2"; [ $# -eq 0 ] ||
shift
139 echo "Unknown option: $1" >&2
147 [ $# -gt 0 -o -z "$rname" ] ||
set -- "$rname"
148 if [ $# -gt 0 ]; then
151 if [ -z "$remote" -a "$1" = "-r" ]; then
155 [ $# -eq 0 ] ||
shift
158 [ -n "$name" ] ||
{ err
"no branch name given"; usage
1; }
159 [ -z "$remote" -o -n "$rname" ] || rname
="$name"
160 [ -z "$remote" -o -z "$msg$msgfile$topmsg$topmsgfile$nocommit$nodeps" ] ||
{ err
"-r may not be combined with other options"; usage
1; }
161 [ $# -eq 0 -o -z "$remote" ] ||
{ err
"deps not allowed with -r"; usage
1; }
162 [ $# -le 1 -o -z "$nodeps" ] ||
{ err
"--base (aka --no-deps) allows at most one <dep>"; usage
1; }
163 [ -z "$msg" -o -z "$msgfile" ] || die
"only one -F or -m option is allowed"
164 [ "$msgfile" != "-" -o "$topmsgfile" != "-" ] ||
{ err
"--message-file and --topmsg-file may not both be '-'"; usage
1; }
166 ## Fast-track creating branches based on remote ones
168 if [ -n "$rname" ]; then
169 [ -n "$name" ] || die
"no branch name given"
170 ! ref_exists
"refs/heads/$name" || die
"branch '$name' already exists"
171 ! ref_exists
"refs/$topbases/$name" || die
"'$topbases/$name' already exists"
172 if [ -z "$base_remote" ]; then
173 die
"no remote location given. Either use -r remote argument or set topgit.remote"
175 has_remote
"$rname" || die
"no branch $rname in remote $base_remote"
176 init_reflog
"refs/$topases/$name"
177 msg
="tgcreate: $name -r $rname"
178 tbrv
="$(ref_exists_rev "refs
/remotes
/$base_remote/${topbases#heads/}/$rname")" ||
179 tbrv
="$(ref_exists_rev "refs
/remotes
/$base_remote/${oldbases#heads/}/$rname")" ||
180 die
"no branch $rname in remote $base_remote"
181 git update-ref
-m "$msg" "refs/$topbases/$name" "$tbrv" ""
182 git update-ref
-m "$msg" "refs/heads/$name" "refs/remotes/$base_remote/$rname" ""
183 quiet_info
"Topic branch $name based on $base_remote : $rname set up."
187 ## Auto-guess dependencies
189 [ "$name" != "@" ] || name
="HEAD"
192 [ -n "$name" ] || die
"no branch name given"
193 if [ -n "$nodeps" ]; then
196 head="$(git symbolic-ref --quiet HEAD)" ||
:
197 [ -z "$head" ] || git rev-parse
--verify --quiet "$head" -- >/dev
/null ||
198 die
"refusing to auto-depend on unborn branch (use --base aka --no-deps)"
199 deps
="${head#refs/heads/}"
200 [ "$deps" != "$head" ] || die
"refusing to auto-depend on non-branch ref (${head:-detached HEAD})"
201 quiet_info
"automatically marking dependency on $deps"
204 # verify each dep is valid and expand "@" to "HEAD" and "HEAD" to it's symref (unless detached)
206 head="$(git symbolic-ref --quiet HEAD)" ||
:
208 [ "$d" != "@" ] || d
="HEAD"
209 [ "$d" != "HEAD" ] ||
[ -z "$head" ] || d
="$head"
212 die
"cannot depend on detached HEAD"
218 die
"cannot depend on non-branch ref '$d'"
221 ref_exists
"refs/heads/$d" ||
{
223 case "refs/$d" in refs
/heads
/?
*)
225 ! ref_exists
"refs/heads/$d" || ok
=1
228 [ -n "$ok" ] || die
"unknown branch dependency '$d'"
230 deps
="${deps:+$deps }$d"
235 if [ -n "$nodeps" ]; then
236 # there can be only one dep and it need only be a committish
237 # however, if it's HEAD and HEAD is an unborn branch that's okay too
238 if [ "$deps" = "HEAD" ] && unborn
="$(git symbolic-ref --quiet HEAD --)" && ! git rev-parse
--verify --quiet HEAD
-- >/dev
/null
; then
243 git rev-parse
--quiet --verify "$deps^0" -- >/dev
/null ||
244 die
"unknown committish \"$deps\""
248 # Non-remote branch set up requires a clean tree unless the single dep is the same tree as a not unborn HEAD
249 # Also the .topdeps and .topmsg files, if they exist, may not be overwriten unless they are "clean"
252 [ -z "$nodeps" ] || prefix
=
253 ensure_cmd
=ensure_clean_tree
254 if [ -n "$unborn" ]; then
256 elif [ $# -eq 1 ] && { [ "$deps" = "HEAD" ] ||
257 [ "$(git rev-parse --quiet --verify "$prefix$deps^
{tree
}" --)" = "$(git rev-parse --quiet --verify HEAD^{tree} --)" ]; }; then
260 ($ensure_cmd && ensure_clean_topfiles
${unborn:+-u}) ||
{
261 [ $# -ne 1 ] ||
[ "$deps" = "HEAD" ] || info
"use \`git checkout $deps\` first and then try again"
265 [ -n "$merge" ] || merge
="$deps "
267 if [ -z "$nodeps" ]; then
270 while read d
&& [ -n "$d" ]; do
271 if [ "$d" = "HEAD" ]; then
272 sr
="$(git symbolic-ref --quiet HEAD)" ||
:
273 [ -z "$sr" ] || git rev-parse
--verify --quiet "$sr" -- >/dev
/null ||
274 die
"refusing to depend on unborn branch (use --base aka --no-deps)"
275 [ -n "$sr" ] || die
"cannot depend on a detached HEAD"
276 case "$sr" in refs
/heads
/*);;*)
277 die
"HEAD is a symref to other than refs/heads/..."
279 d
="${sr#refs/heads/}"
281 ref_exists
"refs/heads/$d" || die
"unknown branch dependency '$d'"
285 warn
"ignoring duplicate depedency $d"
288 deps
="${deps:+$deps }$d"
292 $(sed 'y/ /\n/' <<-LIST
299 if test="$(git symbolic-ref --quiet "$name" --)"; then case "$test" in
301 name
="${test#refs/$topbases/}"
304 name
="${test#refs/heads/}"
307 ! ref_exists
"refs/heads/$name" ||
308 die
"branch '$name' already exists"
309 ! ref_exists
"refs/$topbases/$name" ||
310 die
"'$topbases/$name' already exists"
311 [ -n "$force" ] ||
! ref_exists
"refs/tags/$name" ||
312 die
"refusing to create branch with same name as existing tag '$name' without --force"
314 # Barf now rather than later if missing ident
315 ensure_ident_available
317 if [ -n "$merge" ] && [ -z "$unborn" ]; then
318 # make sure the checkout won't fail
319 branch
="${merge%% *}"
321 [ -z "$nodeps" ] || prefix
=
322 git rev-parse
--quiet --verify "$prefix$branch^0" >/dev
/null ||
323 die
"invalid dependency: $branch"
324 git read-tree
-n -u -m "$prefix$branch^0" ||
325 die
"git checkout \"$branch\" would fail"
330 tab
="$(printf '\t.')" && tab
="${tab%?}"
334 grep -i "^Subject[ $tab]*:" |
335 sed -n "s/^[^: $tab][^: $tab]*[ $tab]*:[ $tab]*//; s/[ $tab][ $tab]*\$//; 1p" ||
339 >"$git_dir/TG_EDITMSG"
340 if [ -n "$msgfile" ]; then
341 if [ "$msgfile" = "-" ]; then
342 git stripspace
>"$git_dir/TG_EDITMSG"
344 git stripspace
<"$msgfile" >"$git_dir/TG_EDITMSG"
346 elif [ -n "$msg" ]; then
347 printf '%s\n' "$msg" | git stripspace
>"$git_dir/TG_EDITMSG"
349 if [ ! -s "$git_dir/TG_EDITMSG" ]; then
350 printf '%s\n' "tg create $name" | git stripspace
>"$git_dir/TG_EDITMSG"
352 msg
="$(cat "$git_dir/TG_EDITMSG
")"
353 rm -f "$git_dir/TG_EDITMSG"
355 >"$git_dir/TG_EDITMSG"
356 if [ -n "$topmsgfile" ]; then
357 if [ "$topmsgfile" = "-" ]; then
358 git stripspace
>"$git_dir/TG_EDITMSG"
360 git stripspace
<"$topmsgfile" >"$git_dir/TG_EDITMSG"
362 elif [ -n "$topmsg" ]; then
363 printf '%s\n' "$topmsg" | git stripspace
>"$git_dir/TG_EDITMSG"
365 if [ -s "$git_dir/TG_EDITMSG" ]; then
368 author
="$(git var GIT_AUTHOR_IDENT)"
369 author_addr
="${author%> *}>"
371 echo "From: $author_addr"
372 ! header
="$(git config topgit.to)" ||
echo "To: $header"
373 ! header
="$(git config topgit.cc)" ||
echo "Cc: $header"
374 ! header
="$(git config topgit.bcc)" ||
echo "Bcc: $header"
375 ! subject_prefix
="$(git config topgit.subjectprefix)" || subject_prefix
="$subject_prefix "
376 echo "Subject: [${subject_prefix}$branchtype] $name"
378 echo "<$branchdesc description>"
381 [ z
"$(git config --bool format.signoff 2>/dev/null)" != z
"true" ] || sobpfx
=
382 echo "${sobpfx}Signed-off-by: $author_addr"
383 } | git stripspace
>"$git_dir/TG_EDITMSG"
385 if [ -z "$noedit" ]; then
386 cat <<EOT >>"$git_dir/TG_EDITMSG"
388 # Please enter the patch message for the new TopGit branch $name.
389 # It will be stored in the .topmsg file and used to create the
390 # patch header when \`tg patch\` is run on branch $name.
391 # The "Subject:" line will appear in \`tg summary\` and \`tg info\` output.
393 # Lines starting with '#' will be ignored, and an empty patch
394 # message aborts the \`tg create\` operation entirely.
396 # tg create ${nodeps:+--base }$name $deps
398 run_editor
"$git_dir/TG_EDITMSG" ||
399 die
"there was a problem with the editor '$tg_editor'"
400 git stripspace
-s <"$git_dir/TG_EDITMSG" >"$git_dir/TG_EDITMSG"+
401 mv -f "$git_dir/TG_EDITMSG"+ "$git_dir/TG_EDITMSG"
402 [ -s "$git_dir/TG_EDITMSG" ] || die
"nothing to do"
404 subj
="$(get_subject <"$git_dir/TG_EDITMSG
")"
405 if [ -z "$subj" ]; then
406 subj
="$(sed -n "s
/^
[ $tab][ $tab]*//; 1p
" <"$git_dir/TG_EDITMSG
")";
407 case "$subj" in "["*);;*) subj
="[$branchtype] $subj"; esac
408 printf '%s\n' "Subject: $subj" "" >"$git_dir/TG_EDITMSG"+
409 sed -n '2,$p' <"$git_dir/TG_EDITMSG" | git stripspace
>>"$git_dir/TG_EDITMSG"+
410 mv -f "$git_dir/TG_EDITMSG"+ "$git_dir/TG_EDITMSG"
413 topmsg
="$(cat "$git_dir/TG_EDITMSG
")"
414 rm -f "$git_dir/TG_EDITMSG"
416 ## Find starting commit to create the base
418 if [ -n "$merge" ]; then
419 # Unshift the first item from the to-merge list
420 branch
="${merge%% *}"
422 # We create a detached head so that we can abort this operation
424 [ -z "$nodeps" ] || prefix
=
425 if [ -n "$unborn" ]; then
426 quiet_info
"creating $name base with empty tree..."
428 quiet_info
"creating $name base from $branch..."
429 git checkout
-q $iowopt "$(git rev-parse --verify "$prefix$branch^
0" --)"
433 ## Set up the topic branch
435 git update-index
--index-info <<EOT || die "git update-index failed"
436 0 $nullsha$tab.topdeps
437 0 $nullsha$tab.topmsg
439 rm -rf "$root_dir/.topdeps" "$root_dir/.topmsg"
440 init_reflog
"refs/$topbases/$name"
441 if [ -n "$unborn" ]; then
442 mttree
="$(git mktree </dev/null)"
443 emsg
="tg create empty $name base"
444 [ "refs/heads/$name" = "$unborn" ] || emsg
="Initial empty commit"
445 mtcommit
="$(git commit-tree -m "$emsg" "$mttree")" || die
"git commit-tree failed"
446 git update-ref
-m "tgcreate: create ${unborn#refs/heads/}" "HEAD" "$mtcommit" ""
447 [ "refs/heads/$name" = "$unborn" ] || warn
"branch ${unborn#refs/heads/} created with empty commit"
448 git update-ref
-m "tgcreate: set $name base" "refs/$topbases/$name" "HEAD" ""
449 [ "refs/heads/$name" = "$unborn" ] || git checkout
$iowopt -b "$name"
451 basetree
="$(git rev-parse --verify "HEAD^
{tree
}" --)" && [ -n "$basetree" ] || die
"HEAD disappeared"
452 baseptree
="$(pretty_tree "HEAD
" -r)" || die
"pretty_tree HEAD -r (via git mktree) failed"
453 if [ "$basetree" != "$baseptree" ]; then
454 bmsg
="tg create $name base"
455 basecommit
="$(git commit-tree -p "HEAD
" -m "$bmsg" "$baseptree")" || die
"git commit-tree failed"
459 git update-ref
-m "tgcreate: set $name base" "refs/$topbases/$name" "$basecommit" ""
460 [ "$basecommit" = "HEAD" ] || git update-ref
-m "tgcreate: set $name base" "HEAD" "$basecommit"
461 git checkout
$iowopt -b "$name"
464 if [ -n "$nodeps" ] ||
[ -z "$deps" ]; then
465 >"$root_dir/.topdeps"
467 sed 'y/ /\n/' <<-EOT >"$root_dir/.topdeps"
471 git add
-f "$root_dir/.topdeps"
472 printf '%s\n' "$topmsg" >"$root_dir/.topmsg"
473 git add
-f "$root_dir/.topmsg"
474 rm -f "$git_dir/TGMERGE_MSG"
476 [ -z "$warntop" ] || warn
".topmsg content was reformatted into patch header"
477 if [ -n "$nocommit" ]; then
478 printf '%s\n' "$msg" >"$git_dir/MERGE_MSG"
479 quiet_info
"Topic branch $name set up."
480 if [ -n "$noedit" ]; then
481 quiet_info
"Please fill in .topmsg now and make the initial commit."
483 quiet_info
"Please make the initial commit."
485 quiet_info
"Remember to run $tgdisplay update afterwards."
486 quiet_info
"To abort:"
487 quiet_info
" git$gitcdopt rm -f .top* && git$gitcdopt checkout ${deps%% *} && $tgdisplay delete $name"
491 git commit
-m "$msg" "$root_dir/.topdeps" "$root_dir/.topmsg" || die
"git commit failed"
492 rawsubj
="$(get_subject <"$root_dir/.topmsg
")"
494 case "$rawsubj" in *"["[Pp
][Aa
][Tt
][Cc
][Hh
]"]"*)
496 subj
="$(sed "s
/^
[^
]]*]//; s
/^
[ $tab][ $tab]*//; s
/[ $tab][ $tab]*\$
//" <<-EOT
501 [ -z "$subj" ] ||
printf '%s\n' "$subj" ""
502 sed -e '1,/^$/d' <"$root_dir/.topmsg"
503 } >"$git_dir/MERGE_MSG"
505 quiet_info
"Topic branch $name created."
506 [ -n "$merge" ] ||
exit 0
507 ## Merge other dependencies into the base
508 quiet_info
"Running $tgname update to merge in dependencies."
509 [ -n "$nommsg" ] ||
! [ -f "$git_dir/MERGE_MSG" ] ||
mv -f "$git_dir/MERGE_MSG" "$git_dir/TGMERGE_MSG" ||
:
511 .
"$TG_INST_CMDDIR"/tg-update