blob: e3aec7f13a8ee3bd54195434e74429196ff90831 (
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
|
#! @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 remove [-P patch] {file} ...\n"
if [ x$1 = x-h ]
then
printf $"
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
Remove named files from the named patch.
"
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=$(find_applied_patch "$opt_patch") || exit 1
status=0
for file in "$@"
do
if ! file_in_patch "$SUBDIR$file" "$patch"
then
printf $"File %s is not in patch %s\n" \
"$SUBDIR$file" "$(print_patch "$patch")" >&2
status=1
continue
fi
next_patch=$(next_patch_for_file "$patch" "$SUBDIR$file")
if [ -n "$next_patch" ]
then
printf $"File %s modified by patch %s\n" \
"$SUBDIR$file" "$(print_patch "$next_patch")"
status=1
continue
fi
# Restore file from backup
if ! $QUILT_DIR/scripts/backup-files -r -t -s -B "$QUILT_PC/$patch/" "$SUBDIR$file"
then
printf $"Failed to remove file %s from patch %s\n" \
"$SUBDIR$file" "$(print_patch "$patch")" >&2
status=1
continue
fi
if [ -e "$(dirname "$QUILT_PC/$patch~refresh")" -a \
-e "$(patch_file_name "$patch")" ]
then
# The patch must be refreshed in order to get rid of the
# patch permanently.
touch "$QUILT_PC/$patch~refresh"
fi
printf $"File %s removed from patch %s\n" \
"$SUBDIR$file" "$(print_patch $patch)"
done
exit $status
### Local Variables:
### mode: shell-script
### End:
# vim:filetype=sh
|
