2 # TopGit - A different patch queue manager
3 # (c) Petr Baudis <pasky@suse.cz> 2008
11 echo "${TG_RECURSIVE}tg: $*"
23 hook_call="\"\$(tg --hooks-path)\"/$1 \"\$@\""
24 if [ -x "$git_dir/hooks/$1" ]; then
25 if fgrep -q "$hook_call" "$git_dir/hooks/$1"; then
26 # Another job well done!
31 if [ -x "$git_dir/hooks/$1" ]; then
32 hook_call="$hook_call"' || exit $?'
34 hook_call="exec $hook_call"
36 # Insert call into the hook
40 [ -x "$git_dir/hooks/$1" ] && cat "$git_dir/hooks/$1"
41 } >"$git_dir/hooks/$1+"
42 chmod a+x "$git_dir/hooks/$1+"
43 mv "$git_dir/hooks/$1+" "$git_dir/hooks/$1"
46 # setup_ours (no arguments)
49 if [ ! -s "$git_dir/info/gitattributes" ] || ! grep -q topmsg "$git_dir/info/gitattributes"; then
51 echo -e ".topmsg\tmerge=ours"
52 echo -e ".topdeps\tmerge=ours"
53 } >>"$git_dir/info/gitattributes"
55 if ! git config merge.ours.driver >/dev/null; then
56 git config merge.ours.name '"always keep ours" merge driver'
57 git config merge.ours.driver 'touch %A'
61 # measure_branch NAME [BASE]
64 _name="$1"; _base="$2"
65 [ -n "$_base" ] || _base="refs/top-bases/$_name"
66 # The caller should've verified $name is valid
67 _commits="$(git rev-list "$_name" ^"$_base" | wc -l)"
68 _nmcommits="$(git rev-list --no-merges "$_name" ^"$_base" | wc -l)"
69 if [ $_commits -gt 1 ]; then
74 echo "$_commits/$_nmcommits $_suffix"
77 # branch_contains B1 B2
78 # Whether B1 is a superset of B2.
81 [ -z "$(git rev-list ^"$1" "$2")" ]
84 # needs_update NAME [BRANCHPATH...]
85 # This function is recursive; it outputs reverse path from NAME
86 # to the branch (e.g. B_DIRTY B1 B2 NAME), one path per line,
87 # inner paths first. Innermost name can be ':' if the head is
88 # not in sync with the base.
92 git cat-file blob "$1:.topdeps" 2>/dev/null |
95 git rev-parse --verify "refs/top-bases/$_dep" >/dev/null 2>&1 ||
98 # Shoo shoo, keep our environment alone!
99 [ -z "$_dep_is_tgish" ] || (needs_update "$_dep" "$@")
102 if [ -n "$_dep_is_tgish" ]; then
103 branch_contains "$_dep" "refs/top-bases/$_dep" || _dep_base_uptodate=
106 if [ -z "$_dep_base_uptodate" ]; then
107 # _dep needs to be synced with its base
109 elif ! branch_contains "refs/top-bases/$1" "$_dep"; then
110 # Some new commits in _dep
114 } || : # $1 is not tracked by TopGit anymore
120 [ -z "$(git diff-tree "refs/top-bases/$1" "$1" | fgrep -v " .top")" ]
123 # switch_to_base NAME [SEED]
126 _base="refs/top-bases/$1"; _seed="$2"
127 # We have to do all the hard work ourselves :/
128 # This is like git checkout -b "$_base" "$_seed"
129 # (or just git checkout "$_base"),
130 # but does not create a detached HEAD.
131 git read-tree -u -m HEAD "${_seed:-$_base}"
132 [ -z "$_seed" ] || git update-ref "$_base" "$_seed"
133 git symbolic-ref HEAD "$_base"
140 git_dir="$(git rev-parse --git-dir)"
141 root_dir="$(git rev-parse --show-cdup)"; root_dir="${root_dir:-.}"
142 # make sure merging the .top* files will always behave sanely
144 setup_hook "pre-commit"
149 # We were sourced from another script for our utility functions;
150 # this is set by hooks.
151 [ -z "$tg__include" ] || return 0
154 [ -n "$cmd" ] || die "He took a duck in the face at two hundred and fifty knots"
159 echo "TopGit v0.1 - A different patch queue manager"
160 echo "Usage: tg (create|delete|info|patch|summary|update|help) ..."
162 create|delete|info|patch|summary|update)
163 . "@cmddir@"/tg-$cmd;;
168 echo "Unknown subcommand: $cmd" >&2