blob: 6626834ffd69ca0147e5629e8e0de24edc378214 (
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
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
|
#!/bin/bash
#
# Copyrev - copies a revision from the Wireshark trunk to the current
# directory.
#
# Usage: backport-rev <svn revision>
#
# $Id$
#
# Copyright 2013 Gerald Combs
#
# 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; either version 2
# of the License, or (at your option) any later version.
#
# 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.
#
if [ -z "$VISUAL" ] ; then
VISUAL=$EDITOR
fi
function exit_err
{
if [ -n "$*" ] ; then
echo "$*"
fi
echo -n $patchfile | pbcopy
echo "Patch saved to $patchfile and copied to pasteboard"
if [ -n "$VISUAL" ] ; then
"$VISUAL" $patchfile $logfile
else
echo "Can't find an editor. You'll have to open $patchfile and $logfile yourself."
fi
exit 1
}
subdir=""
trunk="trunk"
while getopts "at:" opt ; do
case $opt in
a)
subdir="/asn1"
;;
t)
trunk="trunk-$OPTARG"
;;
\?)
echo "Unknown option -$OPTARG"
;;
esac
done
shift $((OPTIND-1))
svninfo="`svn info | grep ^URL: | cut -f2 -d' '`"
if [ -z "$svninfo" ] ; then
exit_err "Can't find repository information. Are you running this from a Wireshark SVN directory?"
fi
svnurl=`dirname $svninfo`
svnurl="$svnurl/$trunk"
#svnurl="$HOME/Development/wireshark"
rev="$1"
patchfile="/tmp/copyrev-$rev.patch"
logfile="/tmp/copyrev-$rev.log"
oldrev=$(( $rev - 1 ))
echo "Working on r$rev ($oldrev)"
echo -n "Attempting 'svn merge' dry run. "
if [ -n "$subdir" ] ; then
cd .$subdir
fi
svn diff --diff-cmd /usr/bin/diff -x "-w -b -U 5" -c $rev $svnurl$subdir \
> $patchfile || exit_err "Error"
svn log -v -r $rev $svnurl | sed -e 's/^..*/ &/' > $logfile || exit 1
merge_ok="Giving up. You'll have to merge the patch yourself."
svn merge --dry-run -c$rev $svnurl | grep '^Summary' \
> /dev/null 2>&1 || merge_ok="OK"
if [ "$merge_ok" != "OK" ] ; then
dry_run_cmd="patch --batch --ignore-whitespace --strip=0 --dry-run"
echo "Failed. Trying 'patch' dry run:"
echo " $dry_run_cmd < $patchfile"
echo ""
$dry_run_cmd < $patchfile
echo ""
exit_err "$merge_ok"
fi
echo "$merge_ok"
echo "Attempting 'svn merge' live run:"
svn merge -c$rev $svnurl
if [ -n "$subdir" ] ; then
cd ..
fi
echo Done with r$rev
echo "Copy over revisions from the trunk:"
echo ""
uniq < $logfile
rm -v $patchfile $logfile
|
