2 # TopGit - A different patch queue manager
3 # (c) Petr Baudis <pasky@suse.cz> 2008
12 echo "${TG_RECURSIVE}tg: $*"
21 # Make sure we are in the worktree, not under .git; die otherwise
22 ensure_git_repo_or_die()
24 local is_inside_repo is_inside_git_dir
26 is_inside_git_dir=$(git rev-parse --is-inside-git-dir 2>/dev/null) ||
29 case "$is_inside_repo/$is_inside_git_dir" in
30 0*) die "Cannot run outside of a Git repository.";;
31 1/true) die "Cannot run from inside \`.git\` hierarchy, please switch to work-tree.";;
35 # cat_file "topic:file"
36 # Like `git cat-file blob $1`, but topics '(i)' and '(w)' means index and worktree
42 arg=$(echo "$arg" | tail --bytes=+5)
47 # ':file' means cat from index
48 arg=$(echo "$arg" | tail --bytes=+5)
49 git cat-file blob ":$arg"
52 git cat-file blob "$arg"
59 hook_call="\"\$($tg --hooks-path)\"/$1 \"\$@\""
60 if [ -f "$git_dir/hooks/$1" ] &&
61 fgrep -q "$hook_call" "$git_dir/hooks/$1"; then
62 # Another job well done!
66 if [ -x "$git_dir/hooks/$1" ]; then
67 hook_call="$hook_call"' || exit $?'
69 hook_call="exec $hook_call"
71 # Don't call hook if tg is not installed
72 hook_call="if which \"$tg\" > /dev/null; then $hook_call; fi"
73 # Insert call into the hook
77 [ ! -s "$git_dir/hooks/$1" ] || cat "$git_dir/hooks/$1"
78 } >"$git_dir/hooks/$1+"
79 chmod a+x "$git_dir/hooks/$1+"
80 mv "$git_dir/hooks/$1+" "$git_dir/hooks/$1"
83 # setup_ours (no arguments)
86 if [ ! -s "$git_dir/info/attributes" ] || ! grep -q topmsg "$git_dir/info/attributes"; then
88 echo ".topmsg merge=ours"
89 echo ".topdeps merge=ours"
90 } >>"$git_dir/info/attributes"
92 if ! git config merge.ours.driver >/dev/null; then
93 git config merge.ours.name '"always keep ours" merge driver'
94 git config merge.ours.driver 'touch %A'
98 # measure_branch NAME [BASE]
101 _bname="$1"; _base="$2"
102 [ -n "$_base" ] || _base="refs/top-bases/$_bname"
103 # The caller should've verified $name is valid
104 _commits="$(git rev-list "$_bname" ^"$_base" -- | wc -l)"
105 _nmcommits="$(git rev-list --no-merges "$_bname" ^"$_base" -- | wc -l)"
106 if [ $_commits -gt 1 ]; then
111 echo "$_commits/$_nmcommits $_suffix"
114 # branch_contains B1 B2
115 # Whether B1 is a superset of B2.
118 [ -z "$(git rev-list --max-count=1 ^"$1" "$2" --)" ]
122 # Whether REF is a valid ref name
125 git rev-parse --verify "$@" >/dev/null 2>&1
129 # Whether BRANCH has a remote equivalent (accepts top-bases/ too)
132 [ -n "$base_remote" ] && ref_exists "remotes/$base_remote/$1"
139 # use the merge base in case the base is ahead.
140 mb="$(git merge-base "refs/top-bases/$_name" "$_name")";
142 test "$(git rev-parse "$mb^{tree}")" = "$(git rev-parse "$_name^{tree}")";
146 # Whether REF is a SHA1 (compared to a symbolic name).
149 [ "$(git rev-parse "$1")" = "$1" ]
152 # recurse_deps CMD NAME [BRANCHPATH...]
153 # Recursively eval CMD on all dependencies of NAME.
154 # CMD can refer to $_name for queried branch name,
155 # $_dep for dependency name,
156 # $_depchain for space-seperated branch backtrace,
157 # and the $_dep_is_tgish boolean.
158 # It can modify $_ret to affect the return value
159 # of the whole function.
160 # If recurse_deps() hits missing dependencies, it will append
161 # them to space-separated $missing_deps list and skip them.
162 # remote dependencies are processed if no_remotes is unset.
166 _name="$1"; # no shift
169 _depsfile="$(mktemp -t tg-depsfile.XXXXXX)"
170 # If no_remotes is unset check also our base against remote base.
171 # Checking our head against remote head has to be done in the helper.
172 if test -z "$no_remotes" && has_remote "top-bases/$_name"; then
173 echo "refs/remotes/$base_remote/top-bases/$_name" >>"$_depsfile"
176 # if the branch was annihilated, there exists no .topdeps file
177 if ! branch_annihilated "$_name"; then
178 #TODO: handle nonexisting .topdeps?
179 git cat-file blob "$_name:.topdeps" >>"$_depsfile";
184 if ! ref_exists "$_dep" ; then
186 missing_deps="$missing_deps $_dep"
191 ref_exists "refs/top-bases/$_dep" ||
194 # Shoo shoo, keep our environment alone!
195 [ -z "$_dep_is_tgish" ] ||
196 (recurse_deps "$_cmd" "$_dep" "$@") ||
201 missing_deps="${missing_deps# }"
206 # branch_needs_update
207 # This is a helper function for determining whether given branch
208 # is up-to-date wrt. its dependencies. It expects input as if it
209 # is called as a recurse_deps() helper.
210 # In case the branch does need update, it will echo it together
211 # with the branch backtrace on the output (see needs_update()
212 # description for details) and set $_ret to non-zero.
213 branch_needs_update()
216 if [ -n "$_dep_is_tgish" ]; then
217 if has_remote "$_dep"; then
218 branch_contains "$_dep" "refs/remotes/$base_remote/$_dep" || _dep_base_update=%
220 # This can possibly override the remote check result;
221 # we want to sync with our base first
222 branch_contains "$_dep" "refs/top-bases/$_dep" || _dep_base_update=:
225 if [ -n "$_dep_base_update" ]; then
226 # _dep needs to be synced with its base/remote
227 echo "$_dep_base_update $_dep $_depchain"
229 elif [ -n "$_name" ] && ! branch_contains "refs/top-bases/$_name" "$_dep"; then
230 # Some new commits in _dep
231 echo "$_dep $_depchain"
237 # This function is recursive; it outputs reverse path from NAME
238 # to the branch (e.g. B_DIRTY B1 B2 NAME), one path per line,
239 # inner paths first. Innermost name can be ':' if the head is
240 # not in sync with the base or '%' if the head is not in sync
241 # with the remote (in this order of priority).
242 # It will also return non-zero status if NAME needs update.
243 # If needs_update() hits missing dependencies, it will append
244 # them to space-separated $missing_deps list and skip them.
247 recurse_deps branch_needs_update "$@"
253 [ -z "$(git diff-tree "refs/top-bases/$1" "$1" -- | fgrep -v " .top")" ]
256 # switch_to_base NAME [SEED]
259 _base="refs/top-bases/$1"; _seed="$2"
260 # We have to do all the hard work ourselves :/
261 # This is like git checkout -b "$_base" "$_seed"
262 # (or just git checkout "$_base"),
263 # but does not create a detached HEAD.
264 git read-tree -u -m HEAD "${_seed:-$_base}"
265 [ -z "$_seed" ] || git update-ref "$_base" "$_seed"
266 git symbolic-ref HEAD "$_base"
269 # Show the help messages.
272 if [ -z "$1" ] ; then
273 # This is currently invoked in all kinds of circumstances,
274 # including when the user made a usage error. Should we end up
275 # providing more than a short help message, then we should
277 # Petr's comment: http://marc.info/?l=git&m=122718711327376&w=2
279 ## Build available commands list for help output
283 for cmd in "@cmddir@"/tg-*; do
284 ! [ -r "$cmd" ] && continue
285 # strip directory part and "tg-" prefix
286 cmd="$(basename "$cmd")"
292 echo "TopGit v$TG_VERSION - A different patch queue manager"
293 echo "Usage: tg [-r REMOTE] ($cmds|help) ..."
294 elif [ -r "@cmddir@"/tg-$1 ] ; then
296 @cmddir@/tg-$1 -h 2>&1 || :
298 if [ -r "@sharedir@/tg-$1.txt" ] ; then
299 cat "@sharedir@/tg-$1.txt"
302 echo "`basename $0`: no help for $1" 1>&2
317 # Spawn pager process and redirect the rest of our output to it
322 # TG_PAGER = GIT_PAGER | PAGER | less
323 # NOTE: GIT_PAGER='' is significant
324 TG_PAGER=${GIT_PAGER-${PAGER-less}}
326 [ -z "$TG_PAGER" -o "$TG_PAGER" = "cat" ] && return 0
330 export LESS="${LESS:-FRSX}" # as in pager.c:pager_preexec()
332 _pager_fifo_dir="$(mktemp -t -d tg-pager-fifo.XXXXXX)"
333 _pager_fifo="$_pager_fifo_dir/0"
334 mkfifo -m 600 "$_pager_fifo"
336 "$TG_PAGER" < "$_pager_fifo" &
337 exec > "$_pager_fifo" # dup2(pager_fifo.in, 1)
339 # this is needed so e.g. `git diff` will still colorize it's output if
340 # requested in ~/.gitconfig with color.diff=auto
341 export GIT_PAGER_IN_USE=1
343 # atexit(close(1); wait pager)
344 trap "exec >&-; rm \"$_pager_fifo\"; rmdir \"$_pager_fifo_dir\"; wait" EXIT
350 die "No command directory: '@cmddir@'"
352 ensure_git_repo_or_die
357 git_dir="$(git rev-parse --git-dir)"
358 root_dir="$(git rev-parse --show-cdup)"; root_dir="${root_dir:-.}"
359 # Make sure root_dir doesn't end with a trailing slash.
360 root_dir="${root_dir%/}"
361 base_remote="$(git config topgit.remote 2>/dev/null)" || :
363 # make sure merging the .top* files will always behave sanely
365 setup_hook "pre-commit"
369 # We were sourced from another script for our utility functions;
370 # this is set by hooks. Skip the rest of the file. A simple return doesn't
371 # work as expected in every shell. See http://bugs.debian.org/516188
372 if [ -z "$tg__include" ]; then
374 if [ "$1" = "-r" ]; then
377 echo "Option -r requires an argument." >&2
381 base_remote="$1"; shift
382 tg="$tg -r $base_remote"
386 [ -n "$cmd" ] || { do_help; exit 1; }
397 [ -r "@cmddir@"/tg-$cmd ] || {
398 echo "Unknown subcommand: $cmd" >&2
402 . "@cmddir@"/tg-$cmd;;