Mercurial > hg > xemacs-beta

annotate lib-src/vcdiff @ 5471:00e79bbbe48f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with trunk.
author Mats Lidell <matsl@xemacs.org>
date Mon, 14 Feb 2011 22:43:46 +0100
parents 061f4f90f874
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
5406
061f4f90f874 Convert lib-src/ to GPLv3.
Mike Sperber <sperber@deinprogramm.de>
parents: 0
diff changeset
1 #! /bin/sh
061f4f90f874 Convert lib-src/ to GPLv3.
Mike Sperber <sperber@deinprogramm.de>
parents: 0
diff changeset
2
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3 # Enhanced sccs diff utility for use with vc mode.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4 # This version is more compatible with rcsdiff(1).
5406
061f4f90f874 Convert lib-src/ to GPLv3.
Mike Sperber <sperber@deinprogramm.de>
parents: 0
diff changeset
5
061f4f90f874 Convert lib-src/ to GPLv3.
Mike Sperber <sperber@deinprogramm.de>
parents: 0
diff changeset
6 # Copyright (C) 1992, 1993, 1995, 1997, 2001, 2002, 2003, 2004, 2005,
061f4f90f874 Convert lib-src/ to GPLv3.
Mike Sperber <sperber@deinprogramm.de>
parents: 0
diff changeset
7 # 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
061f4f90f874 Convert lib-src/ to GPLv3.
Mike Sperber <sperber@deinprogramm.de>
parents: 0
diff changeset
8
061f4f90f874 Convert lib-src/ to GPLv3.
Mike Sperber <sperber@deinprogramm.de>
parents: 0
diff changeset
9 # Author: Paul Eggert
061f4f90f874 Convert lib-src/ to GPLv3.
Mike Sperber <sperber@deinprogramm.de>
parents: 0
diff changeset
10 # (according to authors.el)
061f4f90f874 Convert lib-src/ to GPLv3.
Mike Sperber <sperber@deinprogramm.de>
parents: 0
diff changeset
11
061f4f90f874 Convert lib-src/ to GPLv3.
Mike Sperber <sperber@deinprogramm.de>
parents: 0
diff changeset
12 # This file is part of XEmacs.
061f4f90f874 Convert lib-src/ to GPLv3.
Mike Sperber <sperber@deinprogramm.de>
parents: 0
diff changeset
13
061f4f90f874 Convert lib-src/ to GPLv3.
Mike Sperber <sperber@deinprogramm.de>
parents: 0
diff changeset
14 # XEmacs is free software: you can redistribute it and/or modify
061f4f90f874 Convert lib-src/ to GPLv3.
Mike Sperber <sperber@deinprogramm.de>
parents: 0
diff changeset
15 # it under the terms of the GNU General Public License as published by
061f4f90f874 Convert lib-src/ to GPLv3.
Mike Sperber <sperber@deinprogramm.de>
parents: 0
diff changeset
16 # the Free Software Foundation, either version 3 of the License, or
061f4f90f874 Convert lib-src/ to GPLv3.
Mike Sperber <sperber@deinprogramm.de>
parents: 0
diff changeset
17 # (at your option) any later version.
061f4f90f874 Convert lib-src/ to GPLv3.
Mike Sperber <sperber@deinprogramm.de>
parents: 0
diff changeset
18
061f4f90f874 Convert lib-src/ to GPLv3.
Mike Sperber <sperber@deinprogramm.de>
parents: 0
diff changeset
19 # XEmacs is distributed in the hope that it will be useful,
061f4f90f874 Convert lib-src/ to GPLv3.
Mike Sperber <sperber@deinprogramm.de>
parents: 0
diff changeset
20 # but WITHOUT ANY WARRANTY; without even the implied warranty of
061f4f90f874 Convert lib-src/ to GPLv3.
Mike Sperber <sperber@deinprogramm.de>
parents: 0
diff changeset
21 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
061f4f90f874 Convert lib-src/ to GPLv3.
Mike Sperber <sperber@deinprogramm.de>
parents: 0
diff changeset
22 # GNU General Public License for more details.
061f4f90f874 Convert lib-src/ to GPLv3.
Mike Sperber <sperber@deinprogramm.de>
parents: 0
diff changeset
23
061f4f90f874 Convert lib-src/ to GPLv3.
Mike Sperber <sperber@deinprogramm.de>
parents: 0
diff changeset
24 # You should have received a copy of the GNU General Public License
061f4f90f874 Convert lib-src/ to GPLv3.
Mike Sperber <sperber@deinprogramm.de>
parents: 0
diff changeset
25 # along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
061f4f90f874 Convert lib-src/ to GPLv3.
Mike Sperber <sperber@deinprogramm.de>
parents: 0
diff changeset
26
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
27
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
28 DIFF="diff"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
29 usage="$0: Usage: vcdiff [--brief] [-q] [-r<sid1>] [-r<sid2>] [diffopts] sccsfile..."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
30
5406
061f4f90f874 Convert lib-src/ to GPLv3.
Mike Sperber <sperber@deinprogramm.de>
parents: 0
diff changeset
31 # Now that we use `sccs get' rather than just `get', we don't need this.
061f4f90f874 Convert lib-src/ to GPLv3.
Mike Sperber <sperber@deinprogramm.de>
parents: 0
diff changeset
32 # PATH=$PATH:/usr/ccs/bin:/usr/sccs:/usr/xpg4/bin # common SCCS hangouts
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
33
5406
061f4f90f874 Convert lib-src/ to GPLv3.
Mike Sperber <sperber@deinprogramm.de>
parents: 0
diff changeset
34 echo="echo"
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
35 sid1= sid2=
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
36
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
37 for f
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
38 do
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
39 case $f in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
40 -*)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
41 case $f in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
42 --brief)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
43 DIFF=cmp;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
44 -q)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
45 echo=:;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
46 -r?*)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
47 case $sid1 in
5406
061f4f90f874 Convert lib-src/ to GPLv3.
Mike Sperber <sperber@deinprogramm.de>
parents: 0
diff changeset
48 '')
061f4f90f874 Convert lib-src/ to GPLv3.
Mike Sperber <sperber@deinprogramm.de>
parents: 0
diff changeset
49 sid1=$f
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
50 ;;
5406
061f4f90f874 Convert lib-src/ to GPLv3.
Mike Sperber <sperber@deinprogramm.de>
parents: 0
diff changeset
51 *)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
52 case $sid2 in
5406
061f4f90f874 Convert lib-src/ to GPLv3.
Mike Sperber <sperber@deinprogramm.de>
parents: 0
diff changeset
53 ?*) echo "$usage" >&2; exit 2 ;;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
54 esac
5406
061f4f90f874 Convert lib-src/ to GPLv3.
Mike Sperber <sperber@deinprogramm.de>
parents: 0
diff changeset
55 sid2=$f
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
56 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
57 esac
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
58 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
59 *)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
60 options="$options $f"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
61 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
62 esac
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
63 shift
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
64 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
65 *)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
66 break
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
67 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
68 esac
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
69 done
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
70
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
71 case $# in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
72 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
73 echo "$usage" >&2
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
74 exit 2
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
75 esac
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
76
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
77
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
78 rev1= rev2= status=0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
79 trap 'status=2; exit' 1 2 13 15
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
80 trap 'rm -f $rev1 $rev2 || status=2; exit $status' 0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
81
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
82 for f
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
83 do
5406
061f4f90f874 Convert lib-src/ to GPLv3.
Mike Sperber <sperber@deinprogramm.de>
parents: 0
diff changeset
84 s=2
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
85
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
86 case $f in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
87 s.* | */s.*)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
88 if
5406
061f4f90f874 Convert lib-src/ to GPLv3.
Mike Sperber <sperber@deinprogramm.de>
parents: 0
diff changeset
89 rev1=`mktemp /tmp/geta.XXXXXXXX`
061f4f90f874 Convert lib-src/ to GPLv3.
Mike Sperber <sperber@deinprogramm.de>
parents: 0
diff changeset
90 sccs get -s -p -k $sid1 "$f" > $rev1 &&
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
91 case $sid2 in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
92 '')
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
93 workfile=`expr " /$f" : '.*/s.\(.*\)'`
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
94 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
95 *)
5406
061f4f90f874 Convert lib-src/ to GPLv3.
Mike Sperber <sperber@deinprogramm.de>
parents: 0
diff changeset
96 rev2=`mktemp /tmp/getb.XXXXXXXX`
061f4f90f874 Convert lib-src/ to GPLv3.
Mike Sperber <sperber@deinprogramm.de>
parents: 0
diff changeset
97 sccs get -s -p -k $sid2 "$f" > $rev2
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
98 workfile=$rev2
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
99 esac
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
100 then
5406
061f4f90f874 Convert lib-src/ to GPLv3.
Mike Sperber <sperber@deinprogramm.de>
parents: 0
diff changeset
101 $echo $DIFF $options $rev1 $workfile >&2
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
102 $DIFF $options $rev1 $workfile
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
103 s=$?
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
104 fi
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
105 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
106 *)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
107 echo "$0: $f is not an SCCS file" >&2
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
108 esac
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
109
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
110 if test $status -lt $s
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
111 then status=$s
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
112 fi
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
113 done
5406
061f4f90f874 Convert lib-src/ to GPLv3.
Mike Sperber <sperber@deinprogramm.de>
parents: 0
diff changeset
114