blob: 0d808071a6f470855ee21203b5727a7eb8784654 (
plain)
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
|
#!/bin/sh
# Copyright (C) 2013 Codethink Limited
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along
# with this program; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
usage() {
echo "Usage: all-update your-system"
echo
echo "This attempts to merge up to the latest tag for all the chunks in your-system"
echo "It's re-runnable, and does morph edit to get each chunk."
echo "The process can take a while."
}
if [ -z "$1" ]; then
usage
exit 1
fi
workspace="$PWD"/../..
system="$1"
strata=`grep "morph.*: *" "$system.morph" | cut -d: -f2-`
branch=`git rev-parse --abbrev-ref HEAD`
if [ -z "$2" ]; then
for stratum in $strata; do
chunks=`grep "name.*: *" "$stratum.morph" | cut -d: -f2-`
for chunk in $chunks; do
if [ "$chunk" != "$stratum" ]; then
echo morph edit $system $stratum $chunk
morph edit $system $stratum $chunk 1>&2
fi
done
done
fi
repos=`for stratum in $strata; do
grep "repo.*: *" "$stratum.morph" | cut -d: -f3-
done | sort -u`
for repo in $repos; do
cd $workspace/*:$repo
echo merging master into $repo
git checkout origin/master
startpoint=`git rev-parse HEAD`
git merge $branch
if [ $? != "0" ]; then
git reset --hard $startpoint
git checkout $branch
echo $repo merge failed
else
echo $repo merge successful
git branch -D $branch
git branch $branch
git checkout $branch
fi
done
|
