chiark / gitweb /
README: TODO tg tidy -> tg collapse
[topgit.git] / tg-update.sh
1 #!/bin/sh
2 # TopGit - A different patch queue manager
3 # (c) Petr Baudis <pasky@suse.cz>  2008
4 # GPLv2
5
6 name=
7
8
9 ## Parse options
10
11 if [ -n "$1" ]; then
12         echo "Usage: tg update" >&2
13         exit 1
14 fi
15
16
17 name="$(git symbolic-ref HEAD | sed 's#^refs/\(heads\|top-bases\)/##')"
18 base_rev="$(git rev-parse --short --verify "refs/top-bases/$name" 2>/dev/null)" ||
19         die "not a TopGit-controlled branch"
20
21
22 ## First, take care of our base
23
24 depcheck="$(mktemp)"
25 missing_deps=
26 needs_update "$name" >"$depcheck" || :
27 [ -z "$missing_deps" ] || die "some dependencies are missing: $missing_deps"
28 if [ -s "$depcheck" ]; then
29         # We need to switch to the base branch
30         # ...but only if we aren't there yet (from failed previous merge)
31         HEAD="$(git symbolic-ref HEAD)"
32         if [ "$HEAD" = "${HEAD#refs/top-bases/}" ]; then
33                 switch_to_base "$name"
34         fi
35
36         cat "$depcheck" |
37                 sed 's/ [^ ]* *$//' | # last is $name
38                 sed 's/.* \([^ ]*\)$/+\1/' | # only immediate dependencies
39                 sed 's/^\([^+]\)/-\1/' | # now each line is +branch or -branch (+ == recurse)
40                 uniq -s 1 | # fold branch lines; + always comes before - and thus wins within uniq
41                 while read depline; do
42                         action="${depline:0:1}"
43                         dep="${depline:1}"
44
45                         # We do not distinguish between dependencies out-of-date
46                         # and base out-of-date cases for $dep here, but thanks
47                         # to needs_update returning : for the latter, we do
48                         # correctly recurse here in both cases.
49
50                         if [ x"$action" = x+ ]; then
51                                 info "Recursing to $dep..."
52                                 git checkout -q "$dep"
53                                 (
54                                 export TG_RECURSIVE="[$dep] $TG_RECURSIVE"
55                                 export PS1="[$dep] $PS1"
56                                 while ! tg update; do
57                                         # The merge got stuck! Let the user fix it up.
58                                         info "You are in a subshell. If you abort the merge,"
59                                         info "use \`exit 1\` to abort the recursive update altogether."
60                                         if ! sh -i </dev/tty; then
61                                                 info "Ok, you aborated the merge. Now, you just need to"
62                                                 info "switch back to some sane branch using \`git checkout\`."
63                                                 exit 3
64                                         fi
65                                 done
66                                 )
67                                 switch_to_base "$name"
68                         fi
69
70                         info "Updating base with $dep changes..."
71                         if ! git merge "$dep"; then
72                                 if [ -z "$TG_RECURSIVE" ]; then
73                                         resume='`tg update` again'
74                                 else # subshell
75                                         resume='exit'
76                                 fi
77                                 info "Please commit merge resolution and call $resume."
78                                 info "It is also safe to abort this operation using \`git reset --hard\`,"
79                                 info "but please remember that you are on the base branch now;"
80                                 info "you will want to switch to some normal branch afterwards."
81                                 rm "$depcheck"
82                                 exit 2
83                         fi
84                 done
85
86         # Home, sweet home...
87         git checkout -q "$name"
88 else
89         info "The base is up-to-date."
90 fi
91 rm "$depcheck"
92
93
94 ## Second, update our head with the base
95
96 if branch_contains "$name" "refs/top-bases/$name"; then
97         info "The $name head is up-to-date wrt. the base."
98         exit 0
99 fi
100 info "Updating $name against new base..."
101 if ! git merge "refs/top-bases/$name"; then
102         if [ -z "$TG_RECURSIVE" ]; then
103                 info "Please commit merge resolution. No need to do anything else"
104                 info "You can abort this operation using \`git reset --hard\` now"
105                 info "and retry this merge later using \`tg update\`."
106         else # subshell
107                 info "Please commit merge resolution and call exit."
108                 info "You can abort this operation using \`git reset --hard\`."
109         fi
110         exit 3
111 fi