view lib-src/vcdiff @ 103444:61b1b668390e

(Top): Mention which Emacs version this FAQ is about. Recommend the latest release. Mention how to get older FAQs. Recommend the Emacs manual. (Guidelines for newsgroup postings): Discourage cross-posts. (Underlining paragraphs): Remove. (Editing MS-DOS files): Remove pre-Emacs 20 information. (Bugs and problems): Update key-binding. (Problems with very large files): Mention 64-bit. (Shell process exits abnormally): Remove. (Problems with Shell Mode): Rename and update. (Spontaneous entry into isearch-mode) (Problems talking to certain hosts): Remove. This is old information, in etc/PROBLEMS if needed. (Emacs takes a long time to visit files, Updating Emacs): Remove. (Dired claims that no file is on this line): Update. (Installing Emacs, Problems building Emacs): Simplify. (Emacs for MS-DOS): Refer to msdos/INSTALL rather than duplicating information. (Emacs for MS-Windows): Rename from "Emacs for Windows". Simplify. (Emacs for Mac OS X): Rename from "Emacs for Apple computers". (JDEE): "JDEE", not "JDE". (Handling C-s and C-q with flow control, Binding C-s and C-q): Remove. This is old information, in etc/PROBLEMS if needed. (stty and Backspace key, Kanji and Chinese characters): Remove. (Right-to-left alphabets): Update section. (Changing the included text prefix): Gnus uses message-yank-prefix. Add cross-reference to Supercite manual. (Saving a copy of outgoing mail): Simplify output file description. (Expanding aliases when sending mail): Refer to Emacs manual. Remove old info about RFC822. Correct description of how to rebuild aliases. (Rmail writes to /var/spool/mail): Update location from /usr/spool/mail. (MIME with Emacs mail packages) (Viewing articles with embedded underlining) (Saving a multi-part Gnus posting, Gnus hangs for a long time): Remove old sections. (Killing based on nonstandard headers): Remove. Scoring is preferable, and is well-documented in the Gnus manual. (Reading news with Emacs): Merge "Learning more about Gnus" into here. (Making Gnus faster): Rename from "Starting Gnus faster". Merge "Catch-up is slow in Gnus" into here.
author Glenn Morris <rgm@gnu.org>
date Tue, 16 Jun 2009 02:51:00 +0000
parents 1060b95add8a
children 1d1d5d9bd884
line wrap: on
line source

#! /bin/sh

# Enhanced sccs diff utility for use with vc mode.
# This version is more compatible with rcsdiff(1).

# Copyright (C) 1992, 1993, 1995, 1997, 2001, 2002, 2003, 2004, 2005,
#   2006, 2007, 2008, 2009  Free Software Foundation, Inc.

# Author: Paul Eggert
# (according to authors.el)

# 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 3 of the License, 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.  If not, see <http://www.gnu.org/licenses/>.


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

# Now that we use `sccs get' rather than just `get', we don't need this.
# PATH=$PATH:/usr/ccs/bin:/usr/sccs:/usr/xpg4/bin # common SCCS hangouts

echo="echo"
sid1= sid2=

for f
do
	case $f in
	-*)
		case $f in
		--brief)
			DIFF=cmp;;
		-q)
			echo=:;;
		-r?*)
			case $sid1 in
			'')
				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=`mktemp /tmp/geta.XXXXXXXX`
			sccs get -s -p -k $sid1 "$f" > $rev1 &&
			case $sid2 in
			'')
				workfile=`expr " /$f" : '.*/s.\(.*\)'`
				;;
			*)
				rev2=`mktemp /tmp/getb.XXXXXXXX`
				sccs get -s -p -k $sid2 "$f" > $rev2
				workfile=$rev2
			esac
		then
			$echo $DIFF $options $rev1 $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

# arch-tag: 4344ba3a-bcbe-4f77-971c-f43c1606953a