This repository has been archived by the owner on Feb 17, 2018. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 4
/
tg.sh
410 lines (355 loc) · 9.69 KB
/
tg.sh
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
#!/bin/sh
# TopGit - A different patch queue manager
# (c) Petr Baudis <pasky@suse.cz> 2008
# GPLv2
TG_VERSION=0.8
## Auxiliary functions
info()
{
echo "${TG_RECURSIVE}tg: $*"
}
die()
{
info "fatal: $*" >&2
exit 1
}
# cat_file "topic:file"
# Like `git cat-file blob $1`, but topics '(i)' and '(w)' means index and worktree
cat_file()
{
arg="$1"
case "$arg" in
'(w):'*)
cat "${arg#(w):}"
;;
'(i):'*)
# ':file' means cat from index
git cat-file blob "${arg#(i)}"
;;
*)
git cat-file blob "$arg"
;;
esac
}
# setup_hook NAME
setup_hook()
{
hook_call="\"\$($tg --hooks-path)\"/$1 \"\$@\""
if [ -f "$git_dir/hooks/$1" ] &&
fgrep -q "$hook_call" "$git_dir/hooks/$1"; then
# Another job well done!
return
fi
# Prepare incantation
if [ -x "$git_dir/hooks/$1" ]; then
hook_call="$hook_call"' || exit $?'
else
hook_call="exec $hook_call"
fi
# Don't call hook if tg is not installed
hook_call="if which \"$tg\" > /dev/null; then $hook_call; fi"
# Insert call into the hook
{
echo "#!/bin/sh"
echo "$hook_call"
[ ! -s "$git_dir/hooks/$1" ] || cat "$git_dir/hooks/$1"
} >"$git_dir/hooks/$1+"
chmod a+x "$git_dir/hooks/$1+"
mv "$git_dir/hooks/$1+" "$git_dir/hooks/$1"
}
# setup_ours (no arguments)
setup_ours()
{
if [ ! -s "$git_dir/info/attributes" ] || ! grep -q topmsg "$git_dir/info/attributes"; then
{
echo ".topmsg merge=ours"
echo ".topdeps merge=ours"
} >>"$git_dir/info/attributes"
fi
if ! git config merge.ours.driver >/dev/null; then
git config merge.ours.name '"always keep ours" merge driver'
git config merge.ours.driver 'touch %A'
fi
}
# measure_branch NAME [BASE]
measure_branch()
{
_bname="$1"; _base="$2"
[ -n "$_base" ] || _base="refs/top-bases/$_bname"
# The caller should've verified $name is valid
_commits="$(git rev-list "$_bname" ^"$_base" -- | wc -l)"
_nmcommits="$(git rev-list --no-merges "$_bname" ^"$_base" -- | wc -l)"
if [ $_commits -gt 1 ]; then
_suffix="commits"
else
_suffix="commit"
fi
echo "$_commits/$_nmcommits $_suffix"
}
# branch_contains B1 B2
# Whether B1 is a superset of B2.
branch_contains()
{
[ -z "$(git rev-list --max-count=1 ^"$1" "$2" --)" ]
}
# ref_exists REF
# Whether REF is a valid ref name
ref_exists()
{
git rev-parse --verify "$@" >/dev/null 2>&1
}
# has_remote BRANCH
# Whether BRANCH has a remote equivalent (accepts top-bases/ too)
has_remote()
{
[ -n "$base_remote" ] && ref_exists "remotes/$base_remote/$1"
}
branch_annihilated()
{
_name="$1";
# use the merge base in case the base is ahead.
mb="$(git merge-base "refs/top-bases/$_name" "$_name")";
test "$(git rev-parse "$mb^{tree}")" = "$(git rev-parse "$_name^{tree}")";
}
# is_sha1 REF
# Whether REF is a SHA1 (compared to a symbolic name).
is_sha1()
{
[ "$(git rev-parse "$1")" = "$1" ]
}
# recurse_deps CMD NAME [BRANCHPATH...]
# Recursively eval CMD on all dependencies of NAME.
# CMD can refer to $_name for queried branch name,
# $_dep for dependency name,
# $_depchain for space-seperated branch backtrace,
# and the $_dep_is_tgish boolean.
# It can modify $_ret to affect the return value
# of the whole function.
# If recurse_deps() hits missing dependencies, it will append
# them to space-separated $missing_deps list and skip them.
# remote dependencies are processed if no_remotes is unset.
recurse_deps()
{
_cmd="$1"; shift
_name="$1"; # no shift
_depchain="$*"
_depsfile="$(mktemp -t tg-depsfile.XXXXXX)"
# If no_remotes is unset check also our base against remote base.
# Checking our head against remote head has to be done in the helper.
if test -z "$no_remotes" && has_remote "top-bases/$_name"; then
echo "refs/remotes/$base_remote/top-bases/$_name" >>"$_depsfile"
fi
# if the branch was annihilated, there exists no .topdeps file
if ! branch_annihilated "$_name"; then
#TODO: handle nonexisting .topdeps?
git cat-file blob "$_name:.topdeps" >>"$_depsfile";
fi;
_ret=0
while read _dep; do
if ! ref_exists "$_dep" ; then
# All hope is lost
missing_deps="$missing_deps $_dep"
continue
fi
_dep_is_tgish=1
ref_exists "refs/top-bases/$_dep" ||
_dep_is_tgish=
# Shoo shoo, keep our environment alone!
[ -z "$_dep_is_tgish" ] ||
(recurse_deps "$_cmd" "$_dep" "$@") ||
_ret=$?
eval "$_cmd"
done <"$_depsfile"
missing_deps="${missing_deps# }"
rm "$_depsfile"
return $_ret
}
# branch_needs_update
# This is a helper function for determining whether given branch
# is up-to-date wrt. its dependencies. It expects input as if it
# is called as a recurse_deps() helper.
# In case the branch does need update, it will echo it together
# with the branch backtrace on the output (see needs_update()
# description for details) and set $_ret to non-zero.
branch_needs_update()
{
_dep_base_update=
if [ -n "$_dep_is_tgish" ]; then
if has_remote "$_dep"; then
branch_contains "$_dep" "refs/remotes/$base_remote/$_dep" || _dep_base_update=%
fi
# This can possibly override the remote check result;
# we want to sync with our base first
branch_contains "$_dep" "refs/top-bases/$_dep" || _dep_base_update=:
fi
if [ -n "$_dep_base_update" ]; then
# _dep needs to be synced with its base/remote
echo "$_dep_base_update $_dep $_depchain"
_ret=1
elif [ -n "$_name" ] && ! branch_contains "refs/top-bases/$_name" "$_dep"; then
# Some new commits in _dep
echo "$_dep $_depchain"
_ret=1
fi
}
# needs_update NAME
# This function is recursive; it outputs reverse path from NAME
# to the branch (e.g. B_DIRTY B1 B2 NAME), one path per line,
# inner paths first. Innermost name can be ':' if the head is
# not in sync with the base or '%' if the head is not in sync
# with the remote (in this order of priority).
# It will also return non-zero status if NAME needs update.
# If needs_update() hits missing dependencies, it will append
# them to space-separated $missing_deps list and skip them.
needs_update()
{
recurse_deps branch_needs_update "$@"
}
# branch_empty NAME
branch_empty()
{
[ -z "$(git diff-tree "refs/top-bases/$1" "$1" -- | fgrep -v " .top")" ]
}
# list_deps
list_deps()
{
git for-each-ref refs/top-bases |
while read rev type ref; do
name="${ref#refs/top-bases/}"
if branch_annihilated "$name"; then
continue;
fi
git cat-file blob "$name:.topdeps" | while read dep; do
dep_is_tgish=true
ref_exists "refs/top-bases/$dep" ||
dep_is_tgish=false
if ! "$dep_is_tgish" || ! branch_annihilated $dep; then
echo "$name $dep"
fi
done
done
}
# switch_to_base NAME [SEED]
switch_to_base()
{
_base="refs/top-bases/$1"; _seed="$2"
# We have to do all the hard work ourselves :/
# This is like git checkout -b "$_base" "$_seed"
# (or just git checkout "$_base"),
# but does not create a detached HEAD.
git read-tree -u -m HEAD "${_seed:-$_base}"
[ -z "$_seed" ] || git update-ref "$_base" "$_seed"
git symbolic-ref HEAD "$_base"
}
# Show the help messages.
do_help()
{
if [ -z "$1" ] ; then
# This is currently invoked in all kinds of circumstances,
# including when the user made a usage error. Should we end up
# providing more than a short help message, then we should
# differentiate.
# Petr's comment: http://marc.info/?l=git&m=122718711327376&w=2
## Build available commands list for help output
cmds=
sep=
for cmd in "@cmddir@"/tg-*; do
! [ -r "$cmd" ] && continue
# strip directory part and "tg-" prefix
cmd="$(basename "$cmd")"
cmd="${cmd#tg-}"
cmds="$cmds$sep$cmd"
sep="|"
done
echo "TopGit v$TG_VERSION - A different patch queue manager"
echo "Usage: tg [-r REMOTE] ($cmds|help) ..."
elif [ -r "@cmddir@"/tg-$1 ] ; then
setup_pager
@cmddir@/tg-$1 -h 2>&1 || :
echo
if [ -r "@sharedir@/tg-$1.txt" ] ; then
cat "@sharedir@/tg-$1.txt"
fi
else
echo "`basename $0`: no help for $1" 1>&2
do_help
exit 1
fi
}
## Pager stuff
# isatty FD
isatty()
{
test -t $1
}
# setup_pager
# Spawn pager process and redirect the rest of our output to it
setup_pager()
{
isatty 1 || return 0
# TG_PAGER = GIT_PAGER | PAGER | less
# NOTE: GIT_PAGER='' is significant
TG_PAGER=${GIT_PAGER-${PAGER-less}}
[ -z "$TG_PAGER" -o "$TG_PAGER" = "cat" ] && return 0
# now spawn pager
export LESS="${LESS:-FRSX}" # as in pager.c:pager_preexec()
_pager_fifo_dir="$(mktemp -t -d tg-pager-fifo.XXXXXX)"
_pager_fifo="$_pager_fifo_dir/0"
mkfifo -m 600 "$_pager_fifo"
"$TG_PAGER" < "$_pager_fifo" &
exec > "$_pager_fifo" # dup2(pager_fifo.in, 1)
# this is needed so e.g. `git diff` will still colorize it's output if
# requested in ~/.gitconfig with color.diff=auto
export GIT_PAGER_IN_USE=1
# atexit(close(1); wait pager)
trap "exec >&-; rm \"$_pager_fifo\"; rmdir \"$_pager_fifo_dir\"; wait" EXIT
}
## Startup
[ -d "@cmddir@" ] ||
die "No command directory: '@cmddir@'"
## Initial setup
set -e
git_dir="$(git rev-parse --git-dir)"
root_dir="$(git rev-parse --show-cdup)"; root_dir="${root_dir:-.}"
# Make sure root_dir doesn't end with a trailing slash.
root_dir="${root_dir%/}"
base_remote="$(git config topgit.remote 2>/dev/null)" || :
tg="tg"
# make sure merging the .top* files will always behave sanely
setup_ours
setup_hook "pre-commit"
## Dispatch
# We were sourced from another script for our utility functions;
# this is set by hooks. Skip the rest of the file. A simple return doesn't
# work as expected in every shell. See http://bugs.debian.org/516188
if [ -z "$tg__include" ]; then
if [ "$1" = "-r" ]; then
shift
if [ -z "$1" ]; then
echo "Option -r requires an argument." >&2
do_help
exit 1
fi
base_remote="$1"; shift
tg="$tg -r $base_remote"
fi
cmd="$1"
[ -n "$cmd" ] || { do_help; exit 1; }
shift
case "$cmd" in
help|--help|-h)
do_help "$1"
exit 0;;
--hooks-path)
# Internal command
echo "@hooksdir@";;
*)
[ -r "@cmddir@"/tg-$cmd ] || {
echo "Unknown subcommand: $cmd" >&2
do_help
exit 1
}
. "@cmddir@"/tg-$cmd;;
esac
fi
# vim:noet