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
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
|
#! @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()
{
printf $"Usage: quilt diff [-p n] [-u|-U num|-c|-C num] [--combine patch|-z] [-R] [-P patch] [--snapshot] [--diff=utility] [--color] [file ...]\n"
if [ x$1 = x-h ]
then
printf $"
Produces a diff of the specified file(s) in the topmost or specified
patch. If no files are specified, all files that are modified are
included.
-p n Create a -p n style patch (-p0 or -p1 are supported).
-u, -U num, -c, -C num
Create a unified diff (-u, -U) with num lines of context. Create
a context diff (-c, -C) with num lines of context. The number of
context lines defaults to 3.
--no-timestamps
Do not include file timestamps in patch headers.
-z Write to standard output the changes that have been made
relative to the topmost or specified patch.
-R Create a reverse diff.
-P patch
Create a diff for the specified patch. (Defaults to the topmost
patch.)
--combine patch
Create a combined diff for all patches between this patch and
the patch specified with -P. A patch name of \"-\" is equivalent
to specifying the first applied patch.
--snapshot
Diff agains snapshot (see \`quilt snapshot -h').
--diff=utility
Use the specified utility for generating the diff. The utility
is invoked with the original and new file name as arguments.
--color[=always|auto|never]
Use syntax coloring.
"
exit 0
else
exit 1
fi
}
colorize() {
if [ -n "$opt_color" ]; then
@AWK@ '
function esc(x) { return "'$'\e''[" x "m" }
{ if (/^(Index:|\-\-\-|\+\+\+|\*\*\*) /)
print esc(32) $0 esc(0)
else if (/^\+/)
print esc(36) $0 esc(0)
else if (/^(\-|!)/)
print esc(35) $0 esc(0)
else if (/^@@ \-[0-9]+(,[0-9]+)? \+[0-9]+(,[0-9]+)? @@/)
print gensub(/^(@@[^@]*@@)([ \t]*)(.*)/,
esc(33) "\\1" esc(0) "\\2" esc(35) "\\3" esc(0), "")
else if (/^\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*/)
print esc(33) $0 esc(0)
else
print
}'
else
cat
fi
}
do_diff()
{
local file=$1 old_file=$2 new_file=$3
if [ -n "$opt_reverse" ]
then
local f=$new_file
new_file=$old_file
old_file=$f
fi
if [ -n "$opt_diff" ]
then
[ -s "$old_file" ] || old_file=/dev/null
[ -s "$new_file" ] || new_file=/dev/null
if ! @DIFF@ -qN $old_file $new_file >/dev/null
then
export LANG=$ORIGINAL_LANG
$opt_diff $old_file $new_file
export LANG=POSIX
true
fi
else
diff_file $file $old_file $new_file
fi
}
die ()
{
local status=$1
[ -e "$tmp_files" ] && rm -f $tmp_files
[ -n "$workdir" ] && rm -rf $workdir
exit $status
}
options=`getopt -o p:P:RuU:cC:zh --long diff:,snapshot,no-timestamps,combine:,color:: -- "$@"`
if [ $? -ne 0 ]
then
usage
fi
eval set -- "$options"
opt_format=-u
while true
do
case "$1" in
-p)
opt_strip_level=$2
shift 2 ;;
-P)
if ! last_patch=$(find_patch $2)
then
printf $"Patch %s is not in series\n" "$2" >&2
exit 1
fi
shift 2 ;;
--combine)
opt_combine=1
if [ "$2" = - ]
then
first_patch=-
elif ! first_patch=$(find_patch $2)
then
printf $"Patch %s is not in series\n" \
"$(print_patch $2)" >&2
exit 1
fi
shift 2 ;;
-R)
opt_reverse=1
shift ;;
-z)
opt_relative=1
shift ;;
-u|-c)
opt_format=$1
shift ;;
-U|-C)
opt_format="$1 $2"
shift 2 ;;
-h)
usage -h ;;
--snapshot)
opt_snapshot=1
snap_subdir=.snap
shift ;;
--diff)
opt_diff="$2"
shift 2 ;;
--no-timestamps)
QUILT_NO_DIFF_TIMESTAMPS=1
shift ;;
--color)
case "$2" in
"" | always)
opt_color=1 ;;
auto | tty)
opt_color=
[ -t 1 ] && opt_color=1 ;;
never)
opt_color= ;;
*)
usage ;;
esac
shift 2 ;;
--)
shift
break ;;
esac
done
QUILT_DIFF_OPTS="$QUILT_DIFF_OPTS $opt_format"
opt_files=( $(for file in "$@"; do echo "$SUBDIR$file" ; done) )
if [ $[0$opt_combine + 0$opt_snapshot + 0$opt_relative] -gt 1 ]
then
printf $"Options \`-c patch', \`--snapshot', and \`-z' cannot be combined.\n" >&2
die 1
fi
if [ -n "$last_patch" ]
then
if ! is_applied "$last_patch"
then
printf $"Patch %s is not applied\n" \
"$(print_patch $last_patch)" >&2
die 1
fi
else
last_patch=$(top_patch)
if [ -z "$last_patch" ]
then
printf $"No patches applied\n" >&2
die 1
fi
fi
if [ -z "$opt_strip_level" ]
then
opt_strip_level=$(patch_strip_level $last_patch)
fi
if [ "$opt_strip_level" != 0 -a "$opt_strip_level" != 1 ]
then
printf $"Cannot diff patches with -p%s, please specify -p0 or -p1 instead\n" \
"$opt_strip_level" >&2
die 1
fi
trap "die 1" SIGTERM
tmp_files=$(gen_tempfile)
exec 4> $tmp_files # open $tmp_files
if [ -n "$opt_snapshot" -a ${#opt_files[@]} -eq 0 ]
then
# Add all files in the snapshot into the file list (they may all
# have changed).
while read file
do
echo "${file#$QUILT_PC/$snap_subdir/}" >&4
done \
< <(find $QUILT_PC/$snap_subdir -type f)
# Also look at all patches that are currently applied.
opt_combine=1
first_patch="$(applied_patches | head -n 1)"
fi
if [ -n "$opt_combine" ]
then
set -- $(patches_before $last_patch) $last_patch
if [ "$first_patch" != "-" ]
then
while [ $# -ge 1 -a "$1" != "$first_patch" ]
do
shift
done
if [ $# -eq 0 ]
then
printf $"Patch %s not applied before patch %s\n" \
"$(print_patch $first_patch)" \
"$(print_patch $last_patch)" >&2
die 1
fi
fi
patches=( $@ )
else
patches=( $last_patch )
fi
for patch in ${patches[@]}
do
for file in $(files_in_patch_ordered $patch)
do
if [ ${#opt_files[@]} -gt 0 ] && \
! in_array "$file" "${opt_files[@]#./}"
then
continue
fi
echo "$file" >&4
done
done
exec 4>&- # close $tmp_files
files=( $(sort -u $tmp_files) )
if [ -n "$opt_relative" ]
then
patch_file=$(patch_file_name $last_patch)
patch_args=$(patch_args $last_patch)
workdir=$(gen_tempfile -d $PWD/quilt)
pwd=$PWD
if ! cd $QUILT_PC/$last_patch
then
printf $"Cannot change into directory %s\n" \
"$QUILT_PC/$last_patch" >&2
die 1
fi
if [ ${#files[@]} -gt 0 ] \
&& ! cp -l --parents "${files[@]}" $workdir/
then
printf $"Failed to copy files to temporary directory\n" >&2
die 1
fi
# Now we may have some zero-size files that have no permissions
# (which represent files that the patch creates). Those may have
# been created in the meantime, but patch would refuse to touch
# them: We must remove them here.
find $workdir -type f -size 0 -exec rm -f '{}' ';'
if ! cd $workdir
then
printf $"Cannot change to temporary directory\n" >&2
die 1
fi
if [ -s $pwd/$patch_file ]
then
if ! cat_file $pwd/$patch_file \
| @PATCH@ $QUILT_PATCH_OPTS $patch_args \
--no-backup-if-mismatch -Ef \
>/dev/null 2>/dev/null
then
# Generating a relative diff for a subset of files in
# the patch will fail. Also, if a patch was force
# applied, we know that it won't apply cleanly. In
# all other cases, print a warning.
if [ ! -e $pwd/$QUILT_PC/$last_patch~refresh -a \
${#opt_files[@]} -eq 0 ]
then
printf $"Failed to patch temporary files\n" >&2
fi
fi
fi
if ! cd $pwd
then
printf $"Cannot change to source directory\n" >&2
die 1
fi
fi
for file in "${files[@]}"
do
if [ -n "$opt_snapshot" -a -e "$QUILT_PC/$snap_subdir/$file" ]
then
old_file="$QUILT_PC/$snap_subdir/$file"
elif [ -n "$opt_relative" ]
then
old_file="$workdir/$file"
else
patch="$(first_modified_by $file ${patches[@]})"
if [ -z "$patch" ]
then
[ -z "$opt_snapshot" ] \
&& printf $"File %s is not being modified\n" "$file" >&2
continue
fi
old_file="$(backup_file_name $patch $file)"
fi
next_patch=$(next_patch_for_file $last_patch $file)
if [ -z "$next_patch" ]
then
new_file="$file"
else
new_file="$(backup_file_name $next_patch $file)"
files_were_shadowed=1
fi
do_diff "$file" "$old_file" "$new_file" \
| colorize
if [ $? -ne 0 ]
then
printf $"Diff failed, aborting\n" >&2
die 1
fi
done
if [ -n "$files_were_shadowed" ]
then
printf $"More recent patches modify files in patch %s\n" \
"$(print_patch $last_patch)" >&2
die 1
fi
die 0
### Local Variables:
### mode: shell-script
### End:
# vim:filetype=sh
|