blob: 20e6bf2f8a45268a07e9a85010c1310edb8d36eb (
plain) (
blame)
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
122
123
|
#! @BASH@
# This script is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License version 2 as
# published by the Free Software Foundation.
#
# See the COPYING and AUTHORS files for more details.
# Read in library functions
if [ "$(type -t patch_file_name)" != function ]
then
if ! [ -r @SCRIPTS@/patchfns ]
then
echo "Cannot read library @SCRIPTS@/patchfns" >&2
exit 1
fi
. @SCRIPTS@/patchfns
fi
usage()
{
echo "Usage: quilt remove [-p patch] {file} ..."
if [ x$1 = x-h ]
then
cat <<EOF
Remove one or more files from the topmost or named patch.
Files that are modified by patches on top of the specified
patch cannot be removed.
-p patch
Patch to add files to.
EOF
exit 0
else
exit 1
fi
}
options=`getopt -o p:h -- "$@"`
if [ $? -ne 0 ]
then
usage
fi
eval set -- "$options"
while true
do
case "$1" in
-p)
opt_patch=$2
shift 2 ;;
-h)
usage -h ;;
--)
shift
break ;;
esac
done
if [ $# -lt 1 ]
then
usage
fi
patch=$(stripit $opt_patch)
if [ -z "$patch" ]
then
patch=$(top_patch)
fi
if [ -z "$patch" ]
then
echo "No patches applied"
fi
if ! is_applied $patch
then
echo "Patch $patch is not applied"
exit 1
fi
status=0
for file in $*
do
if ! file_in_patch $file $patch
then
echo "File $file is not in patch $patch"
status=1
continue
fi
next_patch=$(next_patch_for_file $patch $file)
if [ -n "$next_patch" ]
then
echo "File $file modified by patch $next_patch"
status=1
continue
fi
# Restore file from backup
if ! @LIB@/backup-files -s -B .pc/$patch/ -r $file
then
echo "Failed to remove file $file from patch $patch"
status=1
continue
fi
pc_file=$(pc_file_name $patch)
tmpfile=$(@MKTEMP@ /tmp/patch-scripts.XXXXXX)
grep -v -E '^'"$(quote_re $file)"'$' $pc_file > $tmpfile
mv -f $tmpfile $pc_file
rm -f $tmpfile
echo "File $file removed from patch $patch"
done
exit $status
### Local Variables:
### mode: shell-script
### End:
# vim:filetype=sh
|
