1995-07-07 22:47:57 +00:00
|
|
|
#! /bin/sh
|
1992-08-04 16:08:22 +00:00
|
|
|
#
|
|
|
|
# Enhanced sccs diff utility for use with vc mode.
|
|
|
|
# This version is more compatible with rcsdiff(1).
|
|
|
|
#
|
2005-08-07 10:56:27 +00:00
|
|
|
# Copyright (C) 1992, 1993, 1995, 1997, 2001, 2002, 2003, 2004,
|
2007-01-21 04:57:37 +00:00
|
|
|
# 2005, 2006, 2007 Free Software Foundation, Inc.
|
2001-02-20 13:36:21 +00:00
|
|
|
#
|
|
|
|
# This file is part of GNU Emacs.
|
|
|
|
#
|
|
|
|
# GNU Emacs is free software; you can redistribute it and/or modify
|
|
|
|
# it under the terms of the GNU General Public License as published by
|
2007-07-25 05:08:27 +00:00
|
|
|
# the Free Software Foundation; either version 3, or (at your option)
|
2001-02-20 13:36:21 +00:00
|
|
|
# any later version.
|
|
|
|
#
|
|
|
|
# GNU Emacs 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 GNU Emacs; see the file COPYING. If not, write to the
|
2005-07-04 15:47:28 +00:00
|
|
|
# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
|
|
|
# Boston, MA 02110-1301, USA.
|
2001-02-20 13:36:21 +00:00
|
|
|
#
|
1992-08-04 16:08:22 +00:00
|
|
|
|
|
|
|
DIFF="diff"
|
1993-12-03 09:29:18 +00:00
|
|
|
usage="$0: Usage: vcdiff [--brief] [-q] [-r<sid1>] [-r<sid2>] [diffopts] sccsfile..."
|
1992-08-04 16:08:22 +00:00
|
|
|
|
1997-01-01 05:33:42 +00:00
|
|
|
PATH=$PATH:/usr/ccs/bin:/usr/sccs:/usr/xpg4/bin # common SCCS hangouts
|
1993-08-25 08:18:56 +00:00
|
|
|
|
2006-03-18 14:47:20 +00:00
|
|
|
echo="echo"
|
1997-01-01 05:33:42 +00:00
|
|
|
sid1= sid2=
|
1992-08-04 16:08:22 +00:00
|
|
|
|
|
|
|
for f
|
|
|
|
do
|
|
|
|
case $f in
|
|
|
|
-*)
|
|
|
|
case $f in
|
1993-12-03 09:29:18 +00:00
|
|
|
--brief)
|
|
|
|
DIFF=cmp;;
|
1993-06-30 18:54:08 +00:00
|
|
|
-q)
|
|
|
|
echo=:;;
|
1992-08-04 16:08:22 +00:00
|
|
|
-r?*)
|
|
|
|
case $sid1 in
|
1997-01-01 05:33:42 +00:00
|
|
|
'')
|
1992-08-04 16:08:22 +00:00
|
|
|
sid1=$f
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
case $sid2 in
|
|
|
|
?*) echo "$usage" >&2; exit 2 ;;
|
|
|
|
esac
|
|
|
|
sid2=$f
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
options="$options $f"
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
shift
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
break
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
done
|
|
|
|
|
|
|
|
case $# in
|
|
|
|
0)
|
|
|
|
echo "$usage" >&2
|
|
|
|
exit 2
|
|
|
|
esac
|
|
|
|
|
|
|
|
|
|
|
|
rev1= rev2= status=0
|
|
|
|
trap 'status=2; exit' 1 2 13 15
|
|
|
|
trap 'rm -f $rev1 $rev2 || status=2; exit $status' 0
|
|
|
|
|
|
|
|
for f
|
|
|
|
do
|
|
|
|
s=2
|
|
|
|
|
|
|
|
case $f in
|
|
|
|
s.* | */s.*)
|
|
|
|
if
|
|
|
|
rev1=/tmp/geta$$
|
|
|
|
get -s -p -k $sid1 "$f" > $rev1 &&
|
|
|
|
case $sid2 in
|
|
|
|
'')
|
|
|
|
workfile=`expr " /$f" : '.*/s.\(.*\)'`
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
rev2=/tmp/getb$$
|
|
|
|
get -s -p -k $sid2 "$f" > $rev2
|
|
|
|
workfile=$rev2
|
|
|
|
esac
|
|
|
|
then
|
2006-03-18 14:47:20 +00:00
|
|
|
$echo $DIFF $options $rev1 $workfile >&2
|
1992-08-04 16:08:22 +00:00
|
|
|
$DIFF $options $rev1 $workfile
|
|
|
|
s=$?
|
|
|
|
fi
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
echo "$0: $f is not an SCCS file" >&2
|
|
|
|
esac
|
|
|
|
|
|
|
|
if test $status -lt $s
|
|
|
|
then status=$s
|
|
|
|
fi
|
|
|
|
done
|
2003-09-01 15:45:59 +00:00
|
|
|
|
|
|
|
# arch-tag: 4344ba3a-bcbe-4f77-971c-f43c1606953a
|