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
|
#!/bin/sh
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
[ -n "$push_username" ] || exit 102
[ -n "$push_password" ] || exit 103
[ -n "$push_repo" ] || exit 104
rollback() {
EXIT="$?"
if [ -n "$BASETIP" ]; then
echo "Script failed for these heads"
hg heads
echo "Script failed with exitcode $EXIT rolling back to $BASETIP"
hg update -C
hg --config extensions.mq= strip -n "$BASETIP"
hg pull -r "$BASETIP"
else
echo "No rollback, exitcode $EXIT"
fi
}
BASETIP=`hg log -r . --template '{node}'`
trap rollback EXIT
hg pull -r default -u http://hg.netbeans.org/"$push_repo"
hg heads
HEADS=`hg heads --template "{branches}\n" | grep "^$" | wc -l`
if [ $HEADS = 2 ]; then
echo "2 heads, Need to merge"
hg --config ui.merge=internal:merge --config ui.interactive=1 merge < /dev/null || exit 8
hg ci -u "$push_username"@netbeans.org -m "Automated merge with main-silver"
else
if [ $HEADS -gt 2 ]; then
echo "$HEADS heads, here is some diagnostic"
hg heads
fi
fi
TIP=`hg log -r . --template '{node}'`
if hg push -f -r $TIP https://"$push_username":"$push_password"@hg.netbeans.org/"$push_repo"; then
echo Push OK.
else
hg heads
hg incoming -r default http://hg.netbeans.org/"$push_repo"
echo Too many heads in default branch or there are some incoming changesets
exit 9
fi
unset BASETIP
exit 0
|
