forked from cms-sw/cms-bot
-
Notifications
You must be signed in to change notification settings - Fork 0
/
auto-update-git-branches
executable file
·121 lines (115 loc) · 4.08 KB
/
auto-update-git-branches
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
#!/bin/sh -ex
has_arg() {
[ "X$1" = "X" ] && echo "Error: Missing command-line arg value for $2" && exit 1
return 0
}
parseargs() {
set +x
while [ $# -gt 0 ]; do
arg=$1; shift
case $arg in
-* )
case $arg in
-r | --repository ) REPO_NAME=$1 && has_arg $1 $arg && shift ;;
-s | --src-branch ) SRC_BRANCH=$1 && has_arg $1 $arg && shift ;;
-d | --des-branch ) DES_BRANCH=$1 && has_arg $1 $arg && shift ;;
-c | --commits ) COMMITS="-c $1" && has_arg $1 $arg && shift ;;
-X | --strategy ) OVERRIDE_STRATEGY=$1 && has_arg $1 $arg && shift ;;
-p | --push ) PUSH_UPDATES="--push" ;;
-* )
echo -e "Usage: $0\n\t-r|--repository <repository>\n\t[-s|--src-branch <branch>]\n\t[-d|--des-branch <branch>]"
echo -e "\t[-c|--commits <comma-seperated-hashes>]\n\t[-X|--strategy <merge-strategy>]\n\t[-p|--push]\n\t[-h|--help]"
exit 0 ;;
esac ;;
* ) echo "Error: Invalid argument $arg."; exit 1;;
esac
done
for s in REPO_NAME#repository ; do
v=$(echo $s | sed 's|#.*||')
o=$(echo $s | sed 's|.*#||')
eval "vc=$(echo \$$v)"
err=0
if [ "X$vc" = "X" ] ; then
echo "Error: Missing required command-line option --$o <value>"
err=1
fi
[ $err -eq 0 ] || exit 1
done
set -x
}
#Some helper functions
#Return auto forward port branches.
function getBranches()
{
#If only repo is known then return space seperated list of all source branches which should be forward ported
#If repo and source branch are known then return space seperated list of all target branches
if [ "X$2" = "X" ] ; then
(export PYTHONPATH=$SCRIPT_PATH; echo -e "from forward_ports_map import GIT_REPO_FWPORTS as p\nif '$1' in p:\n x=p['$1'].keys()\n x.sort()\n print ' '.join(x)" | python)
else
(export PYTHONPATH=$SCRIPT_PATH; echo -e "from forward_ports_map import GIT_REPO_FWPORTS as p\nif '$1' in p and '$2' in p['$1']:\n print ' '.join(p['$1']['$2'])" | python)
fi
}
GIT_USER="cms-sw"
SCRIPT_PATH="`dirname \"$0\"`"
SCRIPT_PATH="`(cd \"$SCRIPT_PATH\" && pwd)`"
WORKSPACE="${WORKSPACE-$PWD}"
HAS_ERRORS=0
parseargs $@
#make sure we have a full repo name i.e. git-user/git-repo
case $REPO_NAME in
*/*) ;;
*) REPO_NAME="${GIT_USER}/${REPO_NAME}" ;;
esac
repo=`echo $REPO_NAME |sed 's|.*/||'`
echo "Working on ${REPO_NAME} ..."
cd "$WORKSPACE"
REF_REPO=""
if [ -d /cvmfs/cms-ib.cern.ch/git/${REPO_NAME}.git ] ; then
REF_REPO="--reference /cvmfs/cms-ib.cern.ch/git/${REPO_NAME}.git"
fi
#Clone repo if not already done
if [ ! -d $repo ] ; then
git clone $REF_REPO [email protected]:${REPO_NAME} ${repo}
cd $repo
if [ X$HOME = X ]; then
git config user.email '[email protected]'
git config user.name 'CMS Build'
fi
else
cd $repo
fi
#Fetch updates from remote
git fetch -q --force origin
#If source branch was not provided via command-line then get it from GIT_REPO_FWPORTS and reset commits
if [ "X$SRC_BRANCH" = "X" ] ; then
SRC_BRANCH=`getBranches $repo`
COMMITS=""
fi
LOG_COMMANDS="$WORKSPACE/$repo.log"
for src in $SRC_BRANCH; do
echo "Forward porting branch $src"
if [ "X$DES_BRANCH" = "X" ] ; then DES_BRANCH=$(getBranches $repo $src) ; fi
for des in $DES_BRANCH; do
rm -f $LOG_COMMANDS
if [ "X$OVERRIDE_STRATEGY" != "X" ] ; then
merge_strategy=$OVERRIDE_STRATEGY
else
merge_strategy=$(echo $des | grep : | sed 's|^[^:]*:||')
fi
[ "X$merge_strategy" = "X" ] || merge_strategy="-X $merge_strategy"
des=$(echo $des | sed 's|:.*||')
echo ">git clone https://github.com/cms-sw/cms-bot.git cms-bot" > $LOG_COMMANDS
echo ">./cms-bot/$(basename $0) -r $REPO_NAME -s $src -d $des $COMMITS $merge_strategy" >> $LOG_COMMANDS
err=0
$SCRIPT_PATH/merge-git-branch -l $LOG_COMMANDS -s $src -d $des $COMMITS $merge_strategy $PUSH_UPDATES || err=1
if [ "X$err" = "X1" ] ; then
HAS_ERRORS=1
if [ ! "X$PUSH_UPDATES" = "X" ] ; then
cat $LOG_COMMANDS
cat $LOG_COMMANDS | mail -s "[$(echo $repo | tr '[a-z]' '[A-Z]')] Merge Conflict: $src -> $(echo $des | sed 's|:.*||')" [email protected]
fi
break
fi
done
done
exit $HAS_ERRORS