blob: 24af309fab628f404de50e3fc4fc06197fe28beb (
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
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
|
#! @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 $QUILT_DIR/scripts/patchfns ]
then
echo "Cannot read library $QUILT_DIR/scripts/patchfns" >&2
exit 1
fi
. $QUILT_DIR/scripts/patchfns
fi
usage()
{
printf $"Usage: quilt pop [-afRqv] [num|patch]\n"
if [ x$1 = x-h ]
then
printf $"
Remove patch(es) from the stack of applied patches. Without options,
the topmost patch is removed. When a number is specified, remove the
specified number of patches. When a patch name is specified, remove
patches until the specified patch end up on top of the stack. Patch
names may include the patches/ prefix, which means that filename
completion can be used.
-a Remove all applied patches.
-f Force remove. The state before the patch(es) were applied will
be restored from backup files.
-R Always verify if the patch removes cleanly; don't rely on
timestamp checks.
-q Quiet operation.
-v Verbose operation.
"
exit 0
else
exit 1
fi
}
list_patches()
{
local n patches
patches=( $(applied_patches) )
for ((n=${#patches[@]}-1; n>=0; n--))
do
if [ -n "$number" ]
then
(( number-- > 0 )) || break
fi
[ "${patches[n]}" = "$stop_at_patch" ] && break
echo "${patches[n]}"
done
}
files_may_have_changed()
{
local patch=$1 file
local patch_file=$(patch_file_name "$patch")
if [ $? -ne 0 -o ! -e "$patch_file" \
-o ! -e "$QUILT_PC/$patch/.timestamp" \
-o ! "$QUILT_PC/$patch/.timestamp" -nt "$patch_file" ]
then
return 0
fi
for file in $(files_in_patch "$patch")
do
[ ! "$QUILT_PC/$patch/.timestamp" -nt "$file" ] && return 0
done
return 1
}
# Check if all changes have been folded back into the patch (quilt refresh),
# and report any pending changes.
check_for_pending_changes()
{
local patch=$1
local patch_file=$(patch_file_name "$patch")
local workdir=$(gen_tempfile -d quilt) status=0
if [ -d "$QUILT_PC/$patch" ]
then
local prefix=$QUILT_PC/$patch/
[ ${prefix:0:1} == / ] || prefix=$PWD/$prefix
if ! ( cd $workdir && \
$QUILT_DIR/scripts/backup-files -B "$prefix" -r -k -s - )
then
printf $"Failed to copy files to temporary directory\n" >&2
rm -rf $workdir
return 1
fi
fi
if [ -s "$patch_file" ]
then
cat_file "$patch_file" \
| patch -d $workdir $QUILT_PATCH_OPTS \
$(patch_args "$patch") --no-backup-if-mismatch \
-f >/dev/null 2>/dev/null
fi
local file file2 failed
for file2 in $(files_in_patch "$patch")
do
file=$workdir/$file2
[ -e "$file" ] || file=/dev/null
[ -e "$file2" ] || file2=/dev/null
diff -q "$file" "$file2" > /dev/null || failed=1
done
if [ -n "$failed" ]
then
printf $"Patch %s does not remove cleanly (refresh it or enforce with -f)\n" \
"$(print_patch "$patch")" >&2
status=1
fi
rm -rf $workdir
return $status
}
remove_patch()
{
local patch=$1 status=0
trap "status=1" SIGINT
if [ -z "$opt_force" ] && \
( [ -n "$opt_remove" ] || files_may_have_changed "$patch" )
then
check_for_pending_changes "$patch" || status=1
fi
if [ $status -eq 0 ]
then
rm -f "$QUILT_PC/$patch/.timestamp"
if [ -z "$(shopt -s nullglob ; echo "$QUILT_PC/$patch/"*)" ]
then
printf $"Patch %s appears to be empty, removing\n" \
"$(print_patch "$patch")"
rmdir "$QUILT_PC/$patch"
status=$?
else
printf $"Removing patch %s\n" "$(print_patch "$patch")"
$QUILT_DIR/scripts/backup-files $silent -r -t -B "$QUILT_PC/$patch/" -
status=$?
fi
remove_from_db "$patch"
rm -f "$QUILT_PC/$patch~refresh"
fi
trap - SIGINT
return $status
}
options=`getopt -o fRqvah -- "$@"`
if [ $? -ne 0 ]
then
usage
fi
eval set -- "$options"
while true
do
case "$1" in
-f)
opt_force=1
unset opt_remove
shift ;;
-R)
opt_remove=1
unset opt_force
shift ;;
-q)
opt_quiet=1
shift ;;
-v)
opt_verbose=1
shift ;;
-a)
opt_all=1
shift ;;
-h)
usage -h ;;
--)
shift
break ;;
esac
done
if [ $# -gt 1 -o \( -n "$opt_all" -a $# -ne 0 \) ]
then
usage
fi
if [ $# -eq 1 ]
then
if is_numeric "$1"
then
number=$1
else
stop_at_patch=$(find_applied_patch "$1") || exit 1
fi
else
[ -n "$opt_all" ] || number=1
fi
[ -n "$opt_quiet" ] && silent=-s
[ -z "$opt_verbose" ] && silent_unless_verbose=-s
top=$(top_patch)
if [ -n "$top" -a -e "$QUILT_PC/$top~refresh" -a -z "$opt_force" ]
then
printf $"Patch %s needs to be refreshed first.\n" \
"$(print_patch "$top")" >&2
exit 1
fi
if ! patches=$(list_patches) 2>&1
then
exit 1
elif [ -z "$patches" ]
then
printf $"No patch removed\n" >&2
exit 2
fi
for patch in $patches
do
if ! remove_patch "$patch"
then
exit 1
fi
[ -z "$opt_quiet" ] && echo
done
patch="$(top_patch)"
if [ -z "$patch" ]
then
printf $"No patches applied\n"
else
# Ensure that the files in the topmost patch have a link count
# of one: This will automatically be the case in the usual
# situations, but we don't want to risk file corruption in weird
# corner cases such as files added to a patch but not modified.
$QUILT_DIR/scripts/backup-files -L -s -B "$QUILT_PC/$patch/" -
printf $"Now at patch %s\n" "$(print_patch "$patch")"
fi
### Local Variables:
### mode: shell-script
### End:
# vim:filetype=sh
|