2 # TopGit - A different patch queue manager
3 # (c) Petr Baudis <pasky@suse.cz> 2008
11 echo "${TG_RECURSIVE}tg: $*"
20 # Make sure we are in the worktree, not under .git; die otherwise
21 ensure_git_repo_or_die()
23 local is_inside_repo is_inside_git_dir
25 is_inside_git_dir=$(git rev-parse --is-inside-git-dir 2>/dev/null) ||
28 case "$is_inside_repo/$is_inside_git_dir" in
29 0*) die "Cannot run outside of a Git repository.";;
30 1/true) die "Cannot run from inside \`.git\` hierarchy, please switch to work-tree.";;
37 hook_call="\"\$($tg --hooks-path)\"/$1 \"\$@\""
38 if [ -f "$git_dir/hooks/$1" ] &&
39 fgrep -q "$hook_call" "$git_dir/hooks/$1"; then
40 # Another job well done!
44 if [ -x "$git_dir/hooks/$1" ]; then
45 hook_call="$hook_call"' || exit $?'
47 hook_call="exec $hook_call"
49 # Insert call into the hook
53 [ ! -s "$git_dir/hooks/$1" ] || cat "$git_dir/hooks/$1"
54 } >"$git_dir/hooks/$1+"
55 chmod a+x "$git_dir/hooks/$1+"
56 mv "$git_dir/hooks/$1+" "$git_dir/hooks/$1"
59 # setup_ours (no arguments)
62 if [ ! -s "$git_dir/info/attributes" ] || ! grep -q topmsg "$git_dir/info/attributes"; then
64 echo ".topmsg merge=ours"
65 echo ".topdeps merge=ours"
66 } >>"$git_dir/info/attributes"
68 if ! git config merge.ours.driver >/dev/null; then
69 git config merge.ours.name '"always keep ours" merge driver'
70 git config merge.ours.driver 'touch %A'
74 # measure_branch NAME [BASE]
77 _bname="$1"; _base="$2"
78 [ -n "$_base" ] || _base="refs/top-bases/$_bname"
79 # The caller should've verified $name is valid
80 _commits="$(git rev-list "$_bname" ^"$_base" -- | wc -l)"
81 _nmcommits="$(git rev-list --no-merges "$_bname" ^"$_base" -- | wc -l)"
82 if [ $_commits -gt 1 ]; then
87 echo "$_commits/$_nmcommits $_suffix"
90 # branch_contains B1 B2
91 # Whether B1 is a superset of B2.
94 [ -z "$(git rev-list ^"$1" "$2" --)" ]
98 # Whether REF is a valid ref name
101 git rev-parse --verify "$@" >/dev/null 2>&1
105 # Whether BRANCH has a remote equivalent (accepts top-bases/ too)
108 [ -n "$base_remote" ] && ref_exists "remotes/$base_remote/$1"
111 # recurse_deps CMD NAME [BRANCHPATH...]
112 # Recursively eval CMD on all dependencies of NAME.
113 # CMD can refer to $_name for queried branch name,
114 # $_dep for dependency name,
115 # $_depchain for space-seperated branch backtrace,
116 # and the $_dep_is_tgish boolean.
117 # It can modify $_ret to affect the return value
118 # of the whole function.
119 # If recurse_deps() hits missing dependencies, it will append
120 # them to space-separated $missing_deps list and skip them.
124 _name="$1"; # no shift
127 _depsfile="$(mktemp -t tg-depsfile.XXXXXX)"
128 # Check also our base against remote base. Checking our head
129 # against remote head has to be done in the helper.
130 if has_remote "top-bases/$_name"; then
131 echo "refs/remotes/$base_remote/top-bases/$_name" >>"$_depsfile"
133 git cat-file blob "$_name:.topdeps" >>"$_depsfile"
137 if ! ref_exists "$_dep" ; then
139 missing_deps="$missing_deps $_dep"
144 ref_exists "refs/top-bases/$_dep" ||
147 # Shoo shoo, keep our environment alone!
148 [ -z "$_dep_is_tgish" ] ||
149 (recurse_deps "$_cmd" "$_dep" "$@") ||
154 missing_deps="${missing_deps# }"
159 # branch_needs_update
160 # This is a helper function for determining whether given branch
161 # is up-to-date wrt. its dependencies. It expects input as if it
162 # is called as a recurse_deps() helper.
163 # In case the branch does need update, it will echo it together
164 # with the branch backtrace on the output (see needs_update()
165 # description for details) and set $_ret to non-zero.
166 branch_needs_update()
169 if [ -n "$_dep_is_tgish" ]; then
170 if has_remote "$_dep"; then
171 branch_contains "$_dep" "refs/remotes/$base_remote/$_dep" || _dep_base_update=%
173 # This can possibly override the remote check result;
174 # we want to sync with our base first
175 branch_contains "$_dep" "refs/top-bases/$_dep" || _dep_base_update=:
178 if [ -n "$_dep_base_update" ]; then
179 # _dep needs to be synced with its base/remote
180 echo "$_dep_base_update $_dep $_depchain"
182 elif [ -n "$_name" ] && ! branch_contains "refs/top-bases/$_name" "$_dep"; then
183 # Some new commits in _dep
184 echo "$_dep $_depchain"
190 # This function is recursive; it outputs reverse path from NAME
191 # to the branch (e.g. B_DIRTY B1 B2 NAME), one path per line,
192 # inner paths first. Innermost name can be ':' if the head is
193 # not in sync with the base or '%' if the head is not in sync
194 # with the remote (in this order of priority).
195 # It will also return non-zero status if NAME needs update.
196 # If needs_update() hits missing dependencies, it will append
197 # them to space-separated $missing_deps list and skip them.
200 recurse_deps branch_needs_update "$@"
206 [ -z "$(git diff-tree "refs/top-bases/$1" "$1" | fgrep -v " .top")" ]
209 # switch_to_base NAME [SEED]
212 _base="refs/top-bases/$1"; _seed="$2"
213 # We have to do all the hard work ourselves :/
214 # This is like git checkout -b "$_base" "$_seed"
215 # (or just git checkout "$_base"),
216 # but does not create a detached HEAD.
217 git read-tree -u -m HEAD "${_seed:-$_base}"
218 [ -z "$_seed" ] || git update-ref "$_base" "$_seed"
219 git symbolic-ref HEAD "$_base"
222 # Show the help messages.
225 if [ -z "$1" ] ; then
226 # This is currently invoked in all kinds of circumstances,
227 # including when the user made a usage error. Should we end up
228 # providing more than a short help message, then we should
230 # Petr's comment: http://marc.info/?l=git&m=122718711327376&w=2
232 ## Build available commands list for help output
236 for cmd in "@cmddir@"/tg-*; do
237 ! [ -r "$cmd" ] && continue
238 # strip directory part and "tg-" prefix
239 cmd="$(basename "$cmd")"
245 echo "TopGit v0.5 - A different patch queue manager"
246 echo "Usage: tg [-r REMOTE] ($cmds|help) ..."
247 elif [ -r "@cmddir@"/tg-$1 ] ; then
248 @cmddir@/tg-$1 -h || :
250 if [ -r "@sharedir@/tg-$1.txt" ] ; then
251 cat "@sharedir@/tg-$1.txt"
254 echo "`basename $0`: no help for $1" 1>&2
264 die "No command directory: '@cmddir@'"
266 ensure_git_repo_or_die
271 git_dir="$(git rev-parse --git-dir)"
272 root_dir="$(git rev-parse --show-cdup)"; root_dir="${root_dir:-.}"
273 # Make sure root_dir doesn't end with a trailing slash.
274 root_dir="${root_dir%/}"
275 base_remote="$(git config topgit.remote 2>/dev/null)" || :
277 # make sure merging the .top* files will always behave sanely
279 setup_hook "pre-commit"
283 # We were sourced from another script for our utility functions;
284 # this is set by hooks.
285 [ -z "$tg__include" ] || return 0
287 if [ "$1" = "-r" ]; then
290 echo "Option -r requires an argument." >&2
294 base_remote="$1"; shift
295 tg="$tg -r $base_remote"
299 [ -n "$cmd" ] || { do_help; exit 1; }
310 [ -r "@cmddir@"/tg-$cmd ] || {
311 echo "Unknown subcommand: $cmd" >&2
315 . "@cmddir@"/tg-$cmd;;