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
|
#!/bin/sh
#
# mfh - Merge from head to a given branch
# Copyright 2013 Baptiste Daroussin
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
#
# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
# MAINTAINER= portmgr@FreeBSD.org
set -eu
LF=$(printf '\nX')
LF=${LF%X}
IFS="${LF}"
err() {
echo "$@" >&2
exit 1
}
clean() {
rm -rf "${dir}"
exit 1
}
ask() {
question=${1}
answer=x
while [ "${answer}" != "y" -a "${answer}" != "n" ] ; do
read -p "${question} [y/n] " answer
done
[ "${answer}" = "y" ] && return 0
return 1
}
[ $# -ne 2 ] && err "$(basename $0) requires 2 arguments: <branch> <revnumber>"
branch=$1
rev=${2##r} # remove a leading "r"
case ${rev} in
''|*[!0-9]*) err "revision should be a number" ;;
esac
: ${svnserver:="svn.FreeBSD.org"}
if [ -n "$(type svn 2>/dev/null)" ]; then
svn=svn
elif [ -n "$(type svnlite 2>/dev/null)" ]; then
svn=svnlite
else
err "Neither svn(1) nor svnlite(1) found. Please install devel/subversion."
fi
trap "rc=\$? ; rm -rf \"\${dir}\" ; exit \$rc" EXIT
dir=$(mktemp -d /tmp/merge.XXXXXX)
cd "${dir}"
"${svn}" co --depth=empty svn+ssh://${svnserver}/ports/branches/"${branch}"
filelist=""
# svn:// is faster than svn+ssh://. Use it wherever it's possible.
for f in $("${svn}" diff --summarize -c ${rev} svn://${svnserver}/ports/head); do
case ${f} in
*/*) ;;
*)continue;;
esac
f=${f#*/ports/head/}
f=${f%/*}
filelist="${filelist}${LF}${f}"
done
filelist=$(printf '%s\n' "${filelist}" | sort -u)
echo "MFH: r${rev}" > commit.txt
"${svn}" log -r${rev} svn://${svnserver}/ports/head | sed '1,2d;$d;/^MFH:/d' \
| sed '$d' >> commit.txt
"${svn}" up --parents $(printf '%s\n' $filelist \
| sed "s}^}${branch}/}")
"${svn}" up --quiet "${branch}"
"${svn}" merge -c r${rev} ^/head/ "${branch}"
"${svn}" up --quiet "${branch}"
"${svn}" status "${branch}"
"${svn}" diff "${branch}"
ask "Do you want to commit? (no = start a shell)" || (
echo "Dropping you to a shell so you can investigate. Exit the shell to resume this script."
cd "${branch}"
pwd
su -m $(id -un) || :
ask "Do you want to commit now? (no = clean up and abort)" || clean
)
${EDITOR:-vi} commit.txt
"${svn}" ci -F commit.txt "${branch}"
rm -rf "${dir}"
trap - 0
|
