blob: 9a91a2658bdddd27f523103d1c3b2f04b9e29457 (
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
|
#! @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/scripts/patchfns ]
then
echo "Cannot read library $QUILT/scripts/patchfns" >&2
exit 1
fi
. $QUILT/scripts/patchfns
fi
usage()
{
printf $"Usage: quilt fold [-p strip-level]\n"
if [ x$1 = x-h ]
then
printf $"
Integrate the patch read from standard input into the topmost patch:
After making sure that all files modified are part of the topmost
patch, the patch is applied with the specified strip level (which
defaults to 1).
-p strip-level
The number of pathname components to strip from file names
when applying patchfile.
"
exit 0
else
exit 1
fi
}
options=`getopt -o p:qh -- "$@"`
if [ $? -ne 0 ]
then
usage
fi
eval set -- "$options"
while true
do
case "$1" in
-p)
opt_strip_level=$2
shift 2 ;;
-q)
opt_silent=1
shift ;;
-h)
usage -h ;;
--)
shift
break ;;
esac
done
if [ $# -ne 0 ]
then
usage
fi
: ${opt_strip_level:=1}
[ -n "$opt_silent" ] && silent=-s
top=$(top_patch)
if [ -z "$top" ]
then
printf $"No patches applied\n" >&2
exit 1
fi
trap "failed=1" SIGINT
workdir=$(gen_tempfile -d $PWD)
patch -d ${SUBDIR:-.} $QUILT_PATCH_OPTS -p$opt_strip_level $silent \
--backup --prefix="$workdir/$SUBDIR" -E \
|| failed=1
if [ -z "$failed" ]
then
# Copy additional files from workdir to the backup directory
# For this patch
for file in $(find $workdir -type f -a ! -path "$workdir/.timestamp")
do
file="${file:${#workdir}+1}"
backup_file="$(backup_file_name $top "$file")"
if ! [ -e "$backup_file" ]
then
if ! mkdir -p "$(dirname "$backup_file")" ||
! ln "$workdir/$file" "$backup_file"
then
failed=1
break
fi
fi
done
fi
if [ -n "$failed" ]
then
# Restore all files to the state from before applying the patch
for file in $(find $workdir -type f -a ! -path "$workdir/.timestamp")
do
file="${file:${#workdir}+1}"
if ! mv -f "$workdir/$file" "$file"
then
printf $"File %s may be corrupted\n" "$file" >&2
fi
done
rm -rf $workdir
exit 1
fi
rm -rf $workdir
exit 0
### Local Variables:
### mode: shell-script
### End:
# vim:filetype=sh
|
