head	1.1;
branch	1.1.1;
access;
symbols
	EMACS_21_3:1.1.1.7
	EMACS_21_2:1.1.1.7
	EMACS_21_1:1.1.1.7
	EMACS_21_0_106:1.1.1.7
	EMACS_21_0_105:1.1.1.7
	EMACS_21_0_103:1.1.1.7
	EMACS_20_7:1.1.1.6
	EMACS_20_6:1.1.1.6
	EMACS_20_5:1.1.1.6
	EMACS_20_4:1.1.1.6
	EMACS_20_3:1.1.1.6
	EMACS_20_2:1.1.1.6
	EMACS_20_1:1.1.1.6
	EMACS_19_34:1.1.1.5
	EMACS_19_33:1.1.1.5
	EMACS_19_32:1.1.1.5
	EMACS_19_31:1.1.1.5
	EMACS_19_30:1.1.1.5
	EMACS_19_29:1.1.1.4
	EMACS_19_28:1.1.1.4
	EMACS_19_27:1.1.1.4
	EMACS_19_26:1.1.1.4
	EMACS_19_25:1.1.1.4
	EMACS_19_24:1.1.1.4
	EMACS_19_23:1.1.1.4
	EMACS_19_22:1.1.1.3
	EMACS_19_21:1.1.1.3
	EMACS_19_20:1.1.1.3
	EMACS_19_19:1.1.1.2
	EMACS_19_18:1.1.1.2
	EMACS_19_17:1.1.1.2
	EMACS_19_16:1.1.1.2
	EMACS_19_15:1.1.1.1
	EMACS_19_14:1.1.1.1
	EMACS_19_13:1.1.1.1
	EMACS_19_12:1.1.1.1
	EMACS_19_11:1.1.1.1
	EMACS_19_10:1.1.1.1
	EMACS_19_9:1.1.1.1
	EMACS_19_8:1.1.1.1
	EMACS_19_7:1.1.1.1
	FSF_DIST:1.1.1;
locks; strict;
comment	@# @;


1.1
date	2004.11.05.07.58.11;	author Ben Wing;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	2004.11.05.07.58.11;	author Ben Wing;	state Exp;
branches;
next	1.1.1.2;

1.1.1.2
date	2004.11.05.08.24.58;	author Ben Wing;	state Exp;
branches;
next	1.1.1.3;

1.1.1.3
date	2004.11.05.08.37.51;	author Ben Wing;	state Exp;
branches;
next	1.1.1.4;

1.1.1.4
date	2004.11.05.08.47.58;	author Ben Wing;	state Exp;
branches;
next	1.1.1.5;

1.1.1.5
date	2004.11.05.09.16.17;	author Ben Wing;	state Exp;
branches;
next	1.1.1.6;

1.1.1.6
date	2004.11.05.09.43.58;	author Ben Wing;	state Exp;
branches;
next	1.1.1.7;

1.1.1.7
date	2004.11.05.10.31.17;	author Ben Wing;	state Exp;
branches;
next	;


desc
@@


1.1
log
@Initial revision
@
text
@#!/bin/sh
#
# Enhanced sccs diff utility for use with vc mode.
# This version is more compatible with rcsdiff(1).
#
#	$Id: vcdiff,v 1.1 1992/08/04 16:08:22 eric Exp $
#

DIFF="diff"
usage="$0: Usage: vcdiff [-r<sid1>] [-r<sid2>] [diffopts] sccsfile..."

sid1=-r sid2=

for f
do
	case $f in
	-*)
		case $f in
		-r?*)
			case $sid1 in
			-r)
				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
			echo $DIFF $options $sid1 $sid2 $workfile >&2
			$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
@


1.1.1.1
log
@import emacs-19.7
@
text
@@


1.1.1.2
log
@import emacs-19.16
@
text
@d6 1
a6 1
#	$Id: vcdiff,v 1.2 1993/06/30 18:54:08 eggert Exp $
d10 1
a10 1
usage="$0: Usage: vcdiff [-q] [-r<sid1>] [-r<sid2>] [diffopts] sccsfile..."
a11 1
echo=
a18 2
		-q)
			echo=:;;
d74 1
a74 1
			$echo $DIFF $options $sid1 $sid2 $workfile >&2
@


1.1.1.3
log
@import emacs-19.20
@
text
@d6 1
a6 1
#	$Id: vcdiff,v 1.3 1993/08/25 08:18:56 eggert Exp $
a11 2
PATH=$PATH:/usr/ccs/bin:/usr/sccs # common SCCS hangouts

@


1.1.1.4
log
@import emacs-19.23
@
text
@d6 1
a6 1
#	$Id: vcdiff,v 1.4 1993/12/03 09:29:18 eggert Exp $
d10 1
a10 1
usage="$0: Usage: vcdiff [--brief] [-q] [-r<sid1>] [-r<sid2>] [diffopts] sccsfile..."
a21 2
		--brief)
			DIFF=cmp;;
@


1.1.1.5
log
@import emacs-19.30
@
text
@d1 1
a1 1
#! /bin/sh
d6 1
a6 1
#	$Id: vcdiff,v 1.5 1995/07/07 22:47:57 eggert Exp $
@


1.1.1.6
log
@import emacs-20.1
@
text
@d6 1
a6 1
#	$Id: vcdiff,v 1.6 1997/01/01 05:33:42 eggert Exp $
d12 1
a12 1
PATH=$PATH:/usr/ccs/bin:/usr/sccs:/usr/xpg4/bin # common SCCS hangouts
d15 1
a15 1
sid1= sid2=
d28 1
a28 1
			'')
@


1.1.1.7
log
@import emacs-21.0.103
@
text
@d6 1
a6 21
# Copyright (C) 1992, 1993, 1995, 1997, 2001
#   Free Software Foundation, Inc.
#
# 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
# the Free Software Foundation; either version 2, or (at your option)
# 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
# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA.
#
#	$Id: vcdiff,v 1.7 2001/02/20 12:36:28 gerd Exp $
@


