2 # TopGit - A different patch queue manager
3 # (c) Petr Baudis <pasky@suse.cz> 2008
12 echo "${TG_RECURSIVE}tg: $*"
21 # cat_file "topic:file"
22 # Like `git cat-file blob $1`, but topics '(i)' and '(w)' means index and worktree
31 # ':file' means cat from index
32 git cat-file blob
"${arg#(i)}"
35 git cat-file blob
"$arg"
43 hook_call
="\"\$($tg --hooks-path)\"/$1 \"\$@\""
44 if [ -f "$git_dir/hooks/$1" ] &&
45 fgrep
-q "$hook_call" "$git_dir/hooks/$1"; then
46 # Another job well done!
50 if [ -x "$git_dir/hooks/$1" ]; then
51 hook_call
="$hook_call"' || exit $?'
53 hook_call
="exec $hook_call"
55 # Don't call hook if tg is not installed
56 hook_call
="if which \"$tg\" > /dev/null; then $hook_call; fi"
57 # Insert call into the hook
61 [ ! -s "$git_dir/hooks/$1" ] ||
cat "$git_dir/hooks/$1"
62 } >"$git_dir/hooks/$1+"
63 chmod a
+x
"$git_dir/hooks/$1+"
64 mv "$git_dir/hooks/$1+" "$git_dir/hooks/$1"
67 # setup_ours (no arguments)
70 if [ ! -s "$git_dir/info/attributes" ] ||
! grep -q topmsg
"$git_dir/info/attributes"; then
72 echo ".topmsg merge=ours"
73 echo ".topdeps merge=ours"
74 } >>"$git_dir/info/attributes"
76 if ! git config merge.ours.driver
>/dev
/null
; then
77 git config merge.ours.name
'"always keep ours" merge driver'
78 git config merge.ours.driver
'touch %A'
82 # measure_branch NAME [BASE]
85 _bname
="$1"; _base
="$2"
86 [ -n "$_base" ] || _base
="refs/top-bases/$_bname"
87 # The caller should've verified $name is valid
88 _commits
="$(git rev-list "$_bname" ^"$_base" -- | wc -l)"
89 _nmcommits
="$(git rev-list --no-merges "$_bname" ^"$_base" -- | wc -l)"
90 if [ $_commits -gt 1 ]; then
95 echo "$_commits/$_nmcommits $_suffix"
98 # branch_contains B1 B2
99 # Whether B1 is a superset of B2.
102 [ -z "$(git rev-list --max-count=1 ^"$1" "$2" --)" ]
106 # Whether REF is a valid ref name
109 git rev-parse
--verify "$@" >/dev
/null
2>&1
113 # Whether BRANCH has a remote equivalent (accepts top-bases/ too)
116 [ -n "$base_remote" ] && ref_exists
"remotes/$base_remote/$1"
123 # use the merge base in case the base is ahead.
124 mb
="$(git merge-base "refs
/top-bases
/$_name" "$_name")";
126 test "$(git rev-parse "$mb^
{tree
}")" = "$(git rev-parse "$_name^
{tree
}")";
130 # Whether REF is a SHA1 (compared to a symbolic name).
133 [ "$(git rev-parse "$1")" = "$1" ]
136 # recurse_deps CMD NAME [BRANCHPATH...]
137 # Recursively eval CMD on all dependencies of NAME.
138 # CMD can refer to $_name for queried branch name,
139 # $_dep for dependency name,
140 # $_depchain for space-seperated branch backtrace,
141 # and the $_dep_is_tgish boolean.
142 # It can modify $_ret to affect the return value
143 # of the whole function.
144 # If recurse_deps() hits missing dependencies, it will append
145 # them to space-separated $missing_deps list and skip them.
146 # remote dependencies are processed if no_remotes is unset.
150 _name
="$1"; # no shift
153 _depsfile
="$(mktemp -t tg-depsfile.XXXXXX)"
154 # If no_remotes is unset check also our base against remote base.
155 # Checking our head against remote head has to be done in the helper.
156 if test -z "$no_remotes" && has_remote
"top-bases/$_name"; then
157 echo "refs/remotes/$base_remote/top-bases/$_name" >>"$_depsfile"
160 # if the branch was annihilated, there exists no .topdeps file
161 if ! branch_annihilated
"$_name"; then
162 #TODO: handle nonexisting .topdeps?
163 git cat-file blob
"$_name:.topdeps" >>"$_depsfile";
168 if ! ref_exists
"$_dep" ; then
170 missing_deps
="$missing_deps $_dep"
175 ref_exists
"refs/top-bases/$_dep" ||
178 # Shoo shoo, keep our environment alone!
179 [ -z "$_dep_is_tgish" ] ||
180 (recurse_deps
"$_cmd" "$_dep" "$@") ||
185 missing_deps
="${missing_deps# }"
190 # branch_needs_update
191 # This is a helper function for determining whether given branch
192 # is up-to-date wrt. its dependencies. It expects input as if it
193 # is called as a recurse_deps() helper.
194 # In case the branch does need update, it will echo it together
195 # with the branch backtrace on the output (see needs_update()
196 # description for details) and set $_ret to non-zero.
197 branch_needs_update
()
200 if [ -n "$_dep_is_tgish" ]; then
201 if has_remote
"$_dep"; then
202 branch_contains
"$_dep" "refs/remotes/$base_remote/$_dep" || _dep_base_update
=%
204 # This can possibly override the remote check result;
205 # we want to sync with our base first
206 branch_contains
"$_dep" "refs/top-bases/$_dep" || _dep_base_update
=:
209 if [ -n "$_dep_base_update" ]; then
210 # _dep needs to be synced with its base/remote
211 echo "$_dep_base_update $_dep $_depchain"
213 elif [ -n "$_name" ] && ! branch_contains
"refs/top-bases/$_name" "$_dep"; then
214 # Some new commits in _dep
215 echo "$_dep $_depchain"
221 # This function is recursive; it outputs reverse path from NAME
222 # to the branch (e.g. B_DIRTY B1 B2 NAME), one path per line,
223 # inner paths first. Innermost name can be ':' if the head is
224 # not in sync with the base or '%' if the head is not in sync
225 # with the remote (in this order of priority).
226 # It will also return non-zero status if NAME needs update.
227 # If needs_update() hits missing dependencies, it will append
228 # them to space-separated $missing_deps list and skip them.
231 recurse_deps branch_needs_update
"$@"
237 [ -z "$(git diff-tree "refs
/top-bases
/$1" "$1" -- | fgrep -v " .top
")" ]
243 git for-each-ref refs
/top-bases |
244 while read rev type ref
; do
245 name
="${ref#refs/top-bases/}"
246 if branch_annihilated
"$name"; then
250 git cat-file blob
"$name:.topdeps" |
while read dep
; do
252 ref_exists
"refs/top-bases/$dep" ||
254 if ! "$dep_is_tgish" ||
! branch_annihilated
$dep; then
261 # switch_to_base NAME [SEED]
264 _base
="refs/top-bases/$1"; _seed
="$2"
265 # We have to do all the hard work ourselves :/
266 # This is like git checkout -b "$_base" "$_seed"
267 # (or just git checkout "$_base"),
268 # but does not create a detached HEAD.
269 git read-tree
-u -m HEAD
"${_seed:-$_base}"
270 [ -z "$_seed" ] || git update-ref
"$_base" "$_seed"
271 git symbolic-ref HEAD
"$_base"
274 # Show the help messages.
277 if [ -z "$1" ] ; then
278 # This is currently invoked in all kinds of circumstances,
279 # including when the user made a usage error. Should we end up
280 # providing more than a short help message, then we should
282 # Petr's comment: http://marc.info/?l=git&m=122718711327376&w=2
284 ## Build available commands list for help output
288 for cmd
in "@cmddir@"/tg-
*; do
289 ! [ -r "$cmd" ] && continue
290 # strip directory part and "tg-" prefix
291 cmd
="$(basename "$cmd")"
297 echo "TopGit v$TG_VERSION - A different patch queue manager"
298 echo "Usage: tg [-r REMOTE] ($cmds|help) ..."
299 elif [ -r "@cmddir@"/tg-
$1 ] ; then
301 @cmddir@
/tg-
$1 -h 2>&1 ||
:
303 if [ -r "@sharedir@/tg-$1.txt" ] ; then
304 cat "@sharedir@/tg-$1.txt"
307 echo "`basename $0`: no help for $1" 1>&2
322 # Spawn pager process and redirect the rest of our output to it
327 # TG_PAGER = GIT_PAGER | PAGER | less
328 # NOTE: GIT_PAGER='' is significant
329 TG_PAGER
=${GIT_PAGER-${PAGER-less}}
331 [ -z "$TG_PAGER" -o "$TG_PAGER" = "cat" ] && return 0
335 export LESS
="${LESS:-FRSX}" # as in pager.c:pager_preexec()
337 _pager_fifo_dir
="$(mktemp -t -d tg-pager-fifo.XXXXXX)"
338 _pager_fifo
="$_pager_fifo_dir/0"
339 mkfifo -m 600 "$_pager_fifo"
341 "$TG_PAGER" < "$_pager_fifo" &
342 exec > "$_pager_fifo" # dup2(pager_fifo.in, 1)
344 # this is needed so e.g. `git diff` will still colorize it's output if
345 # requested in ~/.gitconfig with color.diff=auto
346 export GIT_PAGER_IN_USE
=1
348 # atexit(close(1); wait pager)
349 trap "exec >&-; rm \"$_pager_fifo\"; rmdir \"$_pager_fifo_dir\"; wait" EXIT
355 die
"No command directory: '@cmddir@'"
360 git_dir
="$(git rev-parse --git-dir)"
361 root_dir
="$(git rev-parse --show-cdup)"; root_dir
="${root_dir:-.}"
362 # Make sure root_dir doesn't end with a trailing slash.
363 root_dir
="${root_dir%/}"
364 base_remote
="$(git config topgit.remote 2>/dev/null)" ||
:
366 # make sure merging the .top* files will always behave sanely
368 setup_hook
"pre-commit"
372 # We were sourced from another script for our utility functions;
373 # this is set by hooks. Skip the rest of the file. A simple return doesn't
374 # work as expected in every shell. See http://bugs.debian.org/516188
375 if [ -z "$tg__include" ]; then
377 if [ "$1" = "-r" ]; then
380 echo "Option -r requires an argument." >&2
384 base_remote
="$1"; shift
385 tg
="$tg -r $base_remote"
389 [ -n "$cmd" ] ||
{ do_help
; exit 1; }
400 [ -r "@cmddir@"/tg-
$cmd ] ||
{
401 echo "Unknown subcommand: $cmd" >&2
405 .
"@cmddir@"/tg-
$cmd;;