2 # TopGit - A different patch queue manager
3 # (c) Petr Baudis <pasky@suse.cz> 2008
11 echo "${TG_RECURSIVE}tg: $*"
20 # cat_file "topic:file"
21 # Like `git cat-file blob $1`, but topics '(i)' and '(w)' means index and worktree
27 arg=$(echo "$arg" | tail --bytes=+5)
32 # ':file' means cat from index
33 arg=$(echo "$arg" | tail --bytes=+5)
34 git cat-file blob ":$arg"
37 git cat-file blob "$arg"
44 hook_call="\"\$($tg --hooks-path)\"/$1 \"\$@\""
45 if [ -f "$git_dir/hooks/$1" ] &&
46 fgrep -q "$hook_call" "$git_dir/hooks/$1"; then
47 # Another job well done!
51 if [ -x "$git_dir/hooks/$1" ]; then
52 hook_call="$hook_call"' || exit $?'
54 hook_call="exec $hook_call"
56 # Insert call into the hook
60 [ ! -s "$git_dir/hooks/$1" ] || cat "$git_dir/hooks/$1"
61 } >"$git_dir/hooks/$1+"
62 chmod a+x "$git_dir/hooks/$1+"
63 mv "$git_dir/hooks/$1+" "$git_dir/hooks/$1"
66 # setup_ours (no arguments)
69 if [ ! -s "$git_dir/info/attributes" ] || ! grep -q topmsg "$git_dir/info/attributes"; then
71 echo ".topmsg merge=ours"
72 echo ".topdeps merge=ours"
73 } >>"$git_dir/info/attributes"
75 if ! git config merge.ours.driver >/dev/null; then
76 git config merge.ours.name '"always keep ours" merge driver'
77 git config merge.ours.driver 'touch %A'
81 # measure_branch NAME [BASE]
84 _bname="$1"; _base="$2"
85 [ -n "$_base" ] || _base="refs/top-bases/$_bname"
86 # The caller should've verified $name is valid
87 _commits="$(git rev-list "$_bname" ^"$_base" -- | wc -l)"
88 _nmcommits="$(git rev-list --no-merges "$_bname" ^"$_base" -- | wc -l)"
89 if [ $_commits -gt 1 ]; then
94 echo "$_commits/$_nmcommits $_suffix"
97 # branch_contains B1 B2
98 # Whether B1 is a superset of B2.
101 [ -z "$(git rev-list ^"$1" "$2" --)" ]
105 # Whether REF is a valid ref name
108 git rev-parse --verify "$@" >/dev/null 2>&1
112 # Whether BRANCH has a remote equivalent (accepts top-bases/ too)
115 [ -n "$base_remote" ] && ref_exists "remotes/$base_remote/$1"
118 # recurse_deps CMD NAME [BRANCHPATH...]
119 # Recursively eval CMD on all dependencies of NAME.
120 # CMD can refer to $_name for queried branch name,
121 # $_dep for dependency name,
122 # $_depchain for space-seperated branch backtrace,
123 # and the $_dep_is_tgish boolean.
124 # It can modify $_ret to affect the return value
125 # of the whole function.
126 # If recurse_deps() hits missing dependencies, it will append
127 # them to space-separated $missing_deps list and skip them.
131 _name="$1"; # no shift
134 _depsfile="$(mktemp -t tg-depsfile.XXXXXX)"
135 # Check also our base against remote base. Checking our head
136 # against remote head has to be done in the helper.
137 if has_remote "top-bases/$_name"; then
138 echo "refs/remotes/$base_remote/top-bases/$_name" >>"$_depsfile"
140 git cat-file blob "$_name:.topdeps" >>"$_depsfile"
144 if ! ref_exists "$_dep" ; then
146 missing_deps="$missing_deps $_dep"
151 ref_exists "refs/top-bases/$_dep" ||
154 # Shoo shoo, keep our environment alone!
155 [ -z "$_dep_is_tgish" ] ||
156 (recurse_deps "$_cmd" "$_dep" "$@") ||
161 missing_deps="${missing_deps# }"
166 # branch_needs_update
167 # This is a helper function for determining whether given branch
168 # is up-to-date wrt. its dependencies. It expects input as if it
169 # is called as a recurse_deps() helper.
170 # In case the branch does need update, it will echo it together
171 # with the branch backtrace on the output (see needs_update()
172 # description for details) and set $_ret to non-zero.
173 branch_needs_update()
176 if [ -n "$_dep_is_tgish" ]; then
177 if has_remote "$_dep"; then
178 branch_contains "$_dep" "refs/remotes/$base_remote/$_dep" || _dep_base_update=%
180 # This can possibly override the remote check result;
181 # we want to sync with our base first
182 branch_contains "$_dep" "refs/top-bases/$_dep" || _dep_base_update=:
185 if [ -n "$_dep_base_update" ]; then
186 # _dep needs to be synced with its base/remote
187 echo "$_dep_base_update $_dep $_depchain"
189 elif [ -n "$_name" ] && ! branch_contains "refs/top-bases/$_name" "$_dep"; then
190 # Some new commits in _dep
191 echo "$_dep $_depchain"
197 # This function is recursive; it outputs reverse path from NAME
198 # to the branch (e.g. B_DIRTY B1 B2 NAME), one path per line,
199 # inner paths first. Innermost name can be ':' if the head is
200 # not in sync with the base or '%' if the head is not in sync
201 # with the remote (in this order of priority).
202 # It will also return non-zero status if NAME needs update.
203 # If needs_update() hits missing dependencies, it will append
204 # them to space-separated $missing_deps list and skip them.
207 recurse_deps branch_needs_update "$@"
213 [ -z "$(git diff-tree "refs/top-bases/$1" "$1" | fgrep -v " .top")" ]
216 # switch_to_base NAME [SEED]
219 _base="refs/top-bases/$1"; _seed="$2"
220 # We have to do all the hard work ourselves :/
221 # This is like git checkout -b "$_base" "$_seed"
222 # (or just git checkout "$_base"),
223 # but does not create a detached HEAD.
224 git read-tree -u -m HEAD "${_seed:-$_base}"
225 [ -z "$_seed" ] || git update-ref "$_base" "$_seed"
226 git symbolic-ref HEAD "$_base"
229 # Show the help messages.
232 if [ -z "$1" ] ; then
233 # This is currently invoked in all kinds of circumstances,
234 # including when the user made a usage error. Should we end up
235 # providing more than a short help message, then we should
237 # Petr's comment: http://marc.info/?l=git&m=122718711327376&w=2
239 ## Build available commands list for help output
243 for cmd in "@cmddir@"/tg-*; do
244 ! [ -r "$cmd" ] && continue
245 # strip directory part and "tg-" prefix
246 cmd="$(basename "$cmd")"
252 echo "TopGit v0.5 - A different patch queue manager"
253 echo "Usage: tg [-r REMOTE] ($cmds|help) ..."
254 elif [ -r "@cmddir@"/tg-$1 ] ; then
255 @cmddir@/tg-$1 -h || :
257 if [ -r "@sharedir@/tg-$1.txt" ] ; then
258 cat "@sharedir@/tg-$1.txt"
261 echo "`basename $0`: no help for $1" 1>&2
276 # Spawn pager process and redirect the rest of our output to it
281 # TG_PAGER = GIT_PAGER | PAGER | less
282 # NOTE: GIT_PAGER='' is significant
283 TG_PAGER=${GIT_PAGER-${PAGER-less}}
285 [ -z "$TG_PAGER" -o "$TG_PAGER" = "cat" ] && return 0
289 export LESS=${LESS:-FRSX} # as in pager.c:pager_preexec()
291 _pager_fifo_dir="$(mktemp -t -d tg-pager-fifo.XXXXXX)"
292 _pager_fifo="$_pager_fifo_dir/0"
293 mkfifo -m 600 "$_pager_fifo"
295 "$TG_PAGER" < "$_pager_fifo" &
296 exec > "$_pager_fifo" # dup2(pager_fifo.in, 1)
298 # this is needed so e.g. `git diff` will still colorize it's output if
299 # requested in ~/.gitconfig with color.diff=auto
300 export GIT_PAGER_IN_USE=1
302 # atexit(close(1); wait pager)
303 trap "exec >&-; rm \"$_pager_fifo\"; rmdir \"$_pager_fifo_dir\"; wait" EXIT
309 die "No command directory: '@cmddir@'"
314 git_dir="$(git rev-parse --git-dir)"
315 root_dir="$(git rev-parse --show-cdup)"; root_dir="${root_dir:-.}"
316 # Make sure root_dir doesn't end with a trailing slash.
317 root_dir="${root_dir%/}"
318 base_remote="$(git config topgit.remote 2>/dev/null)" || :
320 # make sure merging the .top* files will always behave sanely
322 setup_hook "pre-commit"
326 # We were sourced from another script for our utility functions;
327 # this is set by hooks.
328 [ -z "$tg__include" ] || return 0
330 if [ "$1" = "-r" ]; then
333 echo "Option -r requires an argument." >&2
337 base_remote="$1"; shift
338 tg="$tg -r $base_remote"
342 [ -n "$cmd" ] || { do_help; exit 1; }
353 [ -r "@cmddir@"/tg-$cmd ] || {
354 echo "Unknown subcommand: $cmd" >&2
358 . "@cmddir@"/tg-$cmd;;