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
|
#!/bin/bash
#
# editdiff - simple wrapper around rediff
# Copyright (C) 2001-2002, 2011 Tim Waugh <twaugh@redhat.com>
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
version() {
echo "editdiff - patchutils version @VERSION@"
}
usage() {
echo "usage: editdiff FILE"
}
while [ "$#" -gt 0 ]
do
case "$1" in
--help)
usage
exit 0
;;
--version)
version
exit 0
;;
--)
shift || { usage; exit 1; }
if [ -z "$FILE" ]
then
FILE="$1"
fi
shift
[ "$#" -gt 0 ] && { usage; exit 1; }
;;
*)
if [ -z "$FILE" ]
then
FILE="$1"
fi
shift
;;
esac
done
[ "$#" -gt 0 ] && { usage; exit 1; }
[ -n "$FILE" ] || { usage; exit 1; }
TMPD="$(mktemp -d /tmp/editdiff.XXXXXX)" || \
{ echo >&2 "Failed to create temporary directory"; exit 1; }
trap 'rm -rf "${TMPD}"' EXIT
NAME="$(basename "${FILE}")"
filterdiff -v --format=unified <"${FILE}" >"${TMPD}/${NAME}.orig" || exit 1
cp "${TMPD}/${NAME}.orig" "${TMPD}/${NAME}" || exit 1
${EDITOR:-${VISUAL:-@DEFAULT_EDITOR@}} "${TMPD}/${NAME}" || \
{ echo >&2 "Editor exited with non-zero exit status"; exit 1; }
cmp -s "${TMPD}/${NAME}" "${TMPD}/${NAME}.orig" && \
{ echo >&2 "No changes" ; exit 0; }
mv "${FILE}" "${FILE}.orig"
rediff "${TMPD}/${NAME}.orig" "${TMPD}/${NAME}" > "${FILE}" || \
{ cat "${TMPD}/${NAME}" > "${FILE}"; \
echo 1>&2 "rediff failed."
echo 1>&2 "Unedited patch is in ${FILE}.orig, edited patch is in ${FILE}";
exit 1; }
|
