Mercurial > emacs
annotate lib-src/vcdiff @ 94638:3c1eb3e10285
Actually supply needed arguments.
author | Eric S. Raymond <esr@snark.thyrsus.com> |
---|---|
date | Mon, 05 May 2008 18:21:27 +0000 |
parents | fad57210c7d2 |
children | 3a4bc081639c |
rev | line source |
---|---|
12507
da322c027bf0
Replace `#!/bin/sh' with `#! /bin/sh', for benefit of systems
Paul Eggert <eggert@twinsun.com>
parents:
5211
diff
changeset
|
1 #! /bin/sh |
928 | 2 # |
3 # Enhanced sccs diff utility for use with vc mode. | |
4 # This version is more compatible with rcsdiff(1). | |
5 # | |
64769
6358e3c6075c
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
64083
diff
changeset
|
6 # Copyright (C) 1992, 1993, 1995, 1997, 2001, 2002, 2003, 2004, |
79748 | 7 # 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
36226 | 8 # |
9 # This file is part of GNU Emacs. | |
10 # | |
11 # GNU Emacs is free software; you can redistribute it and/or modify | |
12 # it under the terms of the GNU General Public License as published by | |
78257
1f2482de3237
Switch license to GPLv3 or later.
Glenn Morris <rgm@gnu.org>
parents:
75348
diff
changeset
|
13 # the Free Software Foundation; either version 3, or (at your option) |
36226 | 14 # any later version. |
15 # | |
16 # GNU Emacs is distributed in the hope that it will be useful, | |
17 # but WITHOUT ANY WARRANTY; without even the implied warranty of | |
18 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
19 # GNU General Public License for more details. | |
20 # | |
21 # You should have received a copy of the GNU General Public License | |
22 # along with GNU Emacs; see the file COPYING. If not, write to the | |
64083 | 23 # Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
24 # Boston, MA 02110-1301, USA. | |
36226 | 25 # |
928 | 26 |
27 DIFF="diff" | |
5211 | 28 usage="$0: Usage: vcdiff [--brief] [-q] [-r<sid1>] [-r<sid2>] [diffopts] sccsfile..." |
928 | 29 |
94190
fad57210c7d2
* lisp/vc-sccs.el (vc-sccs-do-command): New fun. Use the "sccs" command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94177
diff
changeset
|
30 # Now that we use `sccs get' rather than just `get', we don't need this. |
fad57210c7d2
* lisp/vc-sccs.el (vc-sccs-do-command): New fun. Use the "sccs" command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94177
diff
changeset
|
31 # PATH=$PATH:/usr/ccs/bin:/usr/sccs:/usr/xpg4/bin # common SCCS hangouts |
4653
8e72792f2d18
Append /usr/ccs/bin and /usr/sccs to PATH.
Paul Eggert <eggert@twinsun.com>
parents:
3933
diff
changeset
|
32 |
69559
130314bad206
Use "echo" as a default for $echo, otherwise we'll execute $DIFF
André Spiegel <spiegel@gnu.org>
parents:
68647
diff
changeset
|
33 echo="echo" |
16804
0ba6599135d6
(PATH): Add /usr/xpg4/bin,
Paul Eggert <eggert@twinsun.com>
parents:
12507
diff
changeset
|
34 sid1= sid2= |
928 | 35 |
36 for f | |
37 do | |
38 case $f in | |
39 -*) | |
40 case $f in | |
5211 | 41 --brief) |
42 DIFF=cmp;; | |
3933 | 43 -q) |
44 echo=:;; | |
928 | 45 -r?*) |
46 case $sid1 in | |
16804
0ba6599135d6
(PATH): Add /usr/xpg4/bin,
Paul Eggert <eggert@twinsun.com>
parents:
12507
diff
changeset
|
47 '') |
928 | 48 sid1=$f |
49 ;; | |
50 *) | |
51 case $sid2 in | |
52 ?*) echo "$usage" >&2; exit 2 ;; | |
53 esac | |
54 sid2=$f | |
55 ;; | |
56 esac | |
57 ;; | |
58 *) | |
59 options="$options $f" | |
60 ;; | |
61 esac | |
62 shift | |
63 ;; | |
64 *) | |
65 break | |
66 ;; | |
67 esac | |
68 done | |
69 | |
70 case $# in | |
71 0) | |
72 echo "$usage" >&2 | |
73 exit 2 | |
74 esac | |
75 | |
76 | |
77 rev1= rev2= status=0 | |
78 trap 'status=2; exit' 1 2 13 15 | |
79 trap 'rm -f $rev1 $rev2 || status=2; exit $status' 0 | |
80 | |
81 for f | |
82 do | |
83 s=2 | |
84 | |
85 case $f in | |
86 s.* | */s.*) | |
87 if | |
94177
bc3f03ffbdf9
2008-04-18 Steve Grubb <sgrubb@redhat.com> (tiny change)
Romain Francoise <romain@orebokech.com>
parents:
79748
diff
changeset
|
88 rev1=`mktemp /tmp/geta.XXXXXXXX` |
94190
fad57210c7d2
* lisp/vc-sccs.el (vc-sccs-do-command): New fun. Use the "sccs" command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94177
diff
changeset
|
89 sccs get -s -p -k $sid1 "$f" > $rev1 && |
928 | 90 case $sid2 in |
91 '') | |
92 workfile=`expr " /$f" : '.*/s.\(.*\)'` | |
93 ;; | |
94 *) | |
94177
bc3f03ffbdf9
2008-04-18 Steve Grubb <sgrubb@redhat.com> (tiny change)
Romain Francoise <romain@orebokech.com>
parents:
79748
diff
changeset
|
95 rev2=`mktemp /tmp/getb.XXXXXXXX` |
94190
fad57210c7d2
* lisp/vc-sccs.el (vc-sccs-do-command): New fun. Use the "sccs" command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94177
diff
changeset
|
96 sccs get -s -p -k $sid2 "$f" > $rev2 |
928 | 97 workfile=$rev2 |
98 esac | |
99 then | |
69559
130314bad206
Use "echo" as a default for $echo, otherwise we'll execute $DIFF
André Spiegel <spiegel@gnu.org>
parents:
68647
diff
changeset
|
100 $echo $DIFF $options $rev1 $workfile >&2 |
928 | 101 $DIFF $options $rev1 $workfile |
102 s=$? | |
103 fi | |
104 ;; | |
105 *) | |
106 echo "$0: $f is not an SCCS file" >&2 | |
107 esac | |
108 | |
109 if test $status -lt $s | |
110 then status=$s | |
111 fi | |
112 done | |
52401 | 113 |
114 # arch-tag: 4344ba3a-bcbe-4f77-971c-f43c1606953a |