2 # TopGit - A different patch queue manager
3 # (c) Petr Baudis <pasky@suse.cz> 2008
12 echo "${TG_RECURSIVE}tg: $*"
21 # cat_file TOPIC:PATH [FROM]
22 # cat the file PATH from branch TOPIC when FROM is empty.
23 # FROM can be -i or -w, than the file will be from the index or worktree,
24 # respectively. The caller should than ensure that HEAD is TOPIC, to make sense.
30 cat "$root_dir/${path#*:}"
33 # ':file' means cat from index
34 git cat-file blob
":${path#*:}"
37 git cat-file blob
"$path"
40 die
"Wrong argument to cat_file: '$2'"
45 # get tree for the committed topic
51 # get tree for the base
54 echo "refs/top-bases/$1"
57 # get tree for the index
63 # get tree for the worktree
66 i_tree
=$
(git write-tree
)
68 # the file for --index-output needs to sit next to the
70 : ${GIT_INDEX_FILE:="$git_dir/index"}
71 TMP_INDEX
="$(mktemp "${GIT_INDEX_FILE}-tg.XXXXXX
")"
72 git read-tree
-m $i_tree --index-output="$TMP_INDEX" &&
73 GIT_INDEX_FILE
="$TMP_INDEX" &&
74 export GIT_INDEX_FILE
&&
75 git
diff --name-only -z HEAD |
76 git update-index
-z --add --remove --stdin &&
82 # pretty_tree NAME [-b | -i | -w]
83 # Output tree ID of a cleaned-up tree without tg's artifacts.
84 # NAME will be ignored for -i and -w, but needs to be present
89 git ls-tree
--full-tree "$(get_tree_$source "$name")" |
90 awk -F ' ' '$2 !~ /^.top/' |
97 hook_call
="\"\$($tg --hooks-path)\"/$1 \"\$@\""
98 if [ -f "$git_dir/hooks/$1" ] &&
99 fgrep
-q "$hook_call" "$git_dir/hooks/$1"; then
100 # Another job well done!
103 # Prepare incantation
104 if [ -x "$git_dir/hooks/$1" ]; then
105 hook_call
="$hook_call"' || exit $?'
107 hook_call
="exec $hook_call"
109 # Don't call hook if tg is not installed
110 hook_call
="if which \"$tg\" > /dev/null; then $hook_call; fi"
111 # Insert call into the hook
115 [ ! -s "$git_dir/hooks/$1" ] ||
cat "$git_dir/hooks/$1"
116 } >"$git_dir/hooks/$1+"
117 chmod a
+x
"$git_dir/hooks/$1+"
118 mv "$git_dir/hooks/$1+" "$git_dir/hooks/$1"
121 # setup_ours (no arguments)
124 if [ ! -s "$git_dir/info/attributes" ] ||
! grep -q topmsg
"$git_dir/info/attributes"; then
126 echo ".topmsg merge=ours"
127 echo ".topdeps merge=ours"
128 } >>"$git_dir/info/attributes"
130 if ! git config merge.ours.driver
>/dev
/null
; then
131 git config merge.ours.name
'"always keep ours" merge driver'
132 git config merge.ours.driver
'touch %A'
136 # measure_branch NAME [BASE]
139 _bname
="$1"; _base
="$2"
140 [ -n "$_base" ] || _base
="refs/top-bases/$_bname"
141 # The caller should've verified $name is valid
142 _commits
="$(git rev-list "$_bname" ^"$_base" -- | wc -l)"
143 _nmcommits
="$(git rev-list --no-merges "$_bname" ^"$_base" -- | wc -l)"
144 if [ $_commits -gt 1 ]; then
149 echo "$_commits/$_nmcommits $_suffix"
152 # branch_contains B1 B2
153 # Whether B1 is a superset of B2.
156 [ -z "$(git rev-list --max-count=1 ^"$1" "$2" --)" ]
160 # Whether REF is a valid ref name
163 git rev-parse
--verify "$@" >/dev
/null
2>&1
167 # Whether BRANCH has a remote equivalent (accepts top-bases/ too)
170 [ -n "$base_remote" ] && ref_exists
"remotes/$base_remote/$1"
177 # use the merge base in case the base is ahead.
178 mb
="$(git merge-base "refs
/top-bases
/$_name" "$_name" 2> /dev/null)";
180 test -z "$mb" ||
test "$(git rev-parse "$mb^
{tree
}")" = "$(git rev-parse "$_name^
{tree
}")";
184 # Whether REF is a SHA1 (compared to a symbolic name).
187 [ "$(git rev-parse "$1")" = "$1" ]
190 # recurse_deps CMD NAME [BRANCHPATH...]
191 # Recursively eval CMD on all dependencies of NAME.
192 # CMD can refer to $_name for queried branch name,
193 # $_dep for dependency name,
194 # $_depchain for space-seperated branch backtrace,
195 # $_dep_missing boolean to check whether $_dep is present
196 # and the $_dep_is_tgish boolean.
197 # It can modify $_ret to affect the return value
198 # of the whole function.
199 # If recurse_deps() hits missing dependencies, it will append
200 # them to space-separated $missing_deps list and skip them
201 # affter calling CMD with _dep_missing set.
202 # remote dependencies are processed if no_remotes is unset.
206 _name
="$1"; # no shift
209 _depsfile
="$(get_temp tg-depsfile)"
210 # If no_remotes is unset check also our base against remote base.
211 # Checking our head against remote head has to be done in the helper.
212 if test -z "$no_remotes" && has_remote
"top-bases/$_name"; then
213 echo "refs/remotes/$base_remote/top-bases/$_name" >>"$_depsfile"
216 # if the branch was annihilated, there exists no .topdeps file
217 if ! branch_annihilated
"$_name"; then
218 #TODO: handle nonexisting .topdeps?
219 git cat-file blob
"$_name:.topdeps" >>"$_depsfile";
225 if ! ref_exists
"$_dep" ; then
226 # All hope is lost. Inform driver and continue
227 missing_deps
="$missing_deps $_dep"
234 ref_exists
"refs/top-bases/$_dep" ||
237 # Shoo shoo, keep our environment alone!
238 [ -z "$_dep_is_tgish" ] ||
239 (recurse_deps
"$_cmd" "$_dep" "$@") ||
244 missing_deps
="${missing_deps# }"
248 # branch_needs_update
249 # This is a helper function for determining whether given branch
250 # is up-to-date wrt. its dependencies. It expects input as if it
251 # is called as a recurse_deps() helper.
252 # In case the branch does need update, it will echo it together
253 # with the branch backtrace on the output (see needs_update()
254 # description for details) and set $_ret to non-zero.
255 branch_needs_update
()
257 if [ -n "$_dep_missing" ]; then
263 if [ -n "$_dep_is_tgish" ]; then
264 if has_remote
"$_dep"; then
265 branch_contains
"$_dep" "refs/remotes/$base_remote/$_dep" || _dep_base_update
=%
267 # This can possibly override the remote check result;
268 # we want to sync with our base first
269 branch_contains
"$_dep" "refs/top-bases/$_dep" || _dep_base_update
=:
272 if [ -n "$_dep_base_update" ]; then
273 # _dep needs to be synced with its base/remote
274 echo "$_dep_base_update $_dep $_depchain"
276 elif [ -n "$_name" ] && ! branch_contains
"refs/top-bases/$_name" "$_dep"; then
277 # Some new commits in _dep
278 echo "$_dep $_depchain"
284 # This function is recursive; it outputs reverse path from NAME
285 # to the branch (e.g. B_DIRTY B1 B2 NAME), one path per line,
286 # inner paths first. Innermost name can be ':' if the head is
287 # not in sync with the base, '%' if the head is not in sync
288 # with the remote (in this order of priority) or '!' if depednecy
290 # It will also return non-zero status if NAME needs update.
291 # If needs_update() hits missing dependencies, it will append
292 # them to space-separated $missing_deps list and skip them.
295 recurse_deps branch_needs_update
"$@"
298 # branch_empty NAME [-i | -w]
301 [ "$(pretty_tree "$1" -b)" = "$(pretty_tree "$1" ${2-})" ]
304 # list_deps [-i | -w]
305 # -i/-w apply only to HEAD
312 head="$(git symbolic-ref -q HEAD)" ||
315 git for-each-ref refs
/top-bases |
316 while read rev type ref
; do
317 name
="${ref#refs/top-bases/}"
318 if branch_annihilated
"$name"; then
323 [ "refs/heads/$name" = "$head" ] ||
325 cat_file
"$name:.topdeps" $from |
while read dep
; do
327 ref_exists
"refs/top-bases/$dep" ||
329 if ! "$dep_is_tgish" ||
! branch_annihilated
$dep; then
336 # switch_to_base NAME [SEED]
339 _base
="refs/top-bases/$1"; _seed
="$2"
340 # We have to do all the hard work ourselves :/
341 # This is like git checkout -b "$_base" "$_seed"
342 # (or just git checkout "$_base"),
343 # but does not create a detached HEAD.
344 git read-tree
-u -m HEAD
"${_seed:-$_base}"
345 [ -z "$_seed" ] || git update-ref
"$_base" "$_seed"
346 git symbolic-ref HEAD
"$_base"
349 # Show the help messages.
352 if [ -z "$1" ] ; then
353 # This is currently invoked in all kinds of circumstances,
354 # including when the user made a usage error. Should we end up
355 # providing more than a short help message, then we should
357 # Petr's comment: http://marc.info/?l=git&m=122718711327376&w=2
359 ## Build available commands list for help output
363 for cmd
in "@cmddir@"/tg-
*; do
364 ! [ -r "$cmd" ] && continue
365 # strip directory part and "tg-" prefix
366 cmd
="$(basename "$cmd")"
372 echo "TopGit v$TG_VERSION - A different patch queue manager"
373 echo "Usage: tg [-r REMOTE] ($cmds|help) ..."
374 elif [ -r "@cmddir@"/tg-
$1 ] ; then
376 @cmddir@
/tg-
$1 -h 2>&1 ||
:
378 if [ -r "@sharedir@/tg-$1.txt" ] ; then
379 cat "@sharedir@/tg-$1.txt"
382 echo "`basename $0`: no help for $1" 1>&2
397 # Spawn pager process and redirect the rest of our output to it
402 # TG_PAGER = GIT_PAGER | PAGER | less
403 # NOTE: GIT_PAGER='' is significant
404 TG_PAGER
=${GIT_PAGER-${PAGER-less}}
406 [ -z "$TG_PAGER" -o "$TG_PAGER" = "cat" ] && return 0
410 export LESS
="${LESS:-FRSX}" # as in pager.c:pager_preexec()
412 # setup_pager should be called only once per command
413 pager_fifo
="$tg_tmp_dir/pager"
414 mkfifo -m 600 "$pager_fifo"
416 "$TG_PAGER" < "$pager_fifo" &
417 exec > "$pager_fifo" # dup2(pager_fifo.in, 1)
419 # this is needed so e.g. `git diff` will still colorize it's output if
420 # requested in ~/.gitconfig with color.diff=auto
421 export GIT_PAGER_IN_USE
=1
423 # atexit(close(1); wait pager)
424 # deliberately overwrites the global EXIT trap
425 trap "exec >&-; rm -rf \"$tg_tmp_dir\"; wait" EXIT
429 # creates a new temporary file (or directory with -d) in the global
430 # temporary directory $tg_tmp_dir with pattern prefix NAME
433 mktemp
${2-} "$tg_tmp_dir/$1.XXXXXX"
439 die
"No command directory: '@cmddir@'"
444 git_dir
="$(git rev-parse --git-dir)"
445 root_dir
="$(git rev-parse --show-cdup)"; root_dir
="${root_dir:-.}"
446 # Make sure root_dir doesn't end with a trailing slash.
447 root_dir
="${root_dir%/}"
448 base_remote
="$(git config topgit.remote 2>/dev/null)" ||
:
450 # make sure merging the .top* files will always behave sanely
452 setup_hook
"pre-commit"
453 # create global temporary directories, inside GIT_DIR
454 tg_tmp_dir
="$(mktemp -d "$git_dir/tg-tmp.XXXXXX
")"
455 trap "rm -rf \"$tg_tmp_dir\"" EXIT
459 # We were sourced from another script for our utility functions;
460 # this is set by hooks. Skip the rest of the file. A simple return doesn't
461 # work as expected in every shell. See http://bugs.debian.org/516188
462 if [ -z "$tg__include" ]; then
464 if [ "$1" = "-r" ]; then
467 echo "Option -r requires an argument." >&2
471 base_remote
="$1"; shift
472 tg
="$tg -r $base_remote"
476 [ -n "$cmd" ] ||
{ do_help
; exit 1; }
487 [ -r "@cmddir@"/tg-
$cmd ] ||
{
488 echo "Unknown subcommand: $cmd" >&2
492 .
"@cmddir@"/tg-
$cmd;;