Mercurial > emacs
annotate lib-src/vcdiff @ 104833:2d2110ae11b5
* tramp.texi (Frequently Asked Questions): New item for
emacsclient (extended).
author | Michael Albinus <michael.albinus@gmx.de> |
---|---|
date | Thu, 03 Sep 2009 15:21:47 +0000 |
parents | 1060b95add8a |
children | 1d1d5d9bd884 |
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 |
101096
1060b95add8a
Comment (add Author:, based on authors.el).
Glenn Morris <rgm@gnu.org>
parents:
100958
diff
changeset
|
2 |
928 | 3 # Enhanced sccs diff utility for use with vc mode. |
4 # This version is more compatible with rcsdiff(1). | |
101096
1060b95add8a
Comment (add Author:, based on authors.el).
Glenn Morris <rgm@gnu.org>
parents:
100958
diff
changeset
|
5 |
94828
3a4bc081639c
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94190
diff
changeset
|
6 # Copyright (C) 1992, 1993, 1995, 1997, 2001, 2002, 2003, 2004, 2005, |
100958 | 7 # 2006, 2007, 2008, 2009 Free Software Foundation, Inc. |
94828
3a4bc081639c
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94190
diff
changeset
|
8 |
101096
1060b95add8a
Comment (add Author:, based on authors.el).
Glenn Morris <rgm@gnu.org>
parents:
100958
diff
changeset
|
9 # Author: Paul Eggert |
1060b95add8a
Comment (add Author:, based on authors.el).
Glenn Morris <rgm@gnu.org>
parents:
100958
diff
changeset
|
10 # (according to authors.el) |
1060b95add8a
Comment (add Author:, based on authors.el).
Glenn Morris <rgm@gnu.org>
parents:
100958
diff
changeset
|
11 |
36226 | 12 # This file is part of GNU Emacs. |
94828
3a4bc081639c
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94190
diff
changeset
|
13 |
3a4bc081639c
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94190
diff
changeset
|
14 # GNU Emacs is free software: you can redistribute it and/or modify |
36226 | 15 # it under the terms of the GNU General Public License as published by |
94828
3a4bc081639c
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94190
diff
changeset
|
16 # the Free Software Foundation, either version 3 of the License, or |
3a4bc081639c
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94190
diff
changeset
|
17 # (at your option) any later version. |
3a4bc081639c
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94190
diff
changeset
|
18 |
36226 | 19 # GNU Emacs is distributed in the hope that it will be useful, |
20 # but WITHOUT ANY WARRANTY; without even the implied warranty of | |
21 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
22 # GNU General Public License for more details. | |
94828
3a4bc081639c
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94190
diff
changeset
|
23 |
36226 | 24 # You should have received a copy of the GNU General Public License |
94828
3a4bc081639c
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94190
diff
changeset
|
25 # along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
3a4bc081639c
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94190
diff
changeset
|
26 |
928 | 27 |
28 DIFF="diff" | |
5211 | 29 usage="$0: Usage: vcdiff [--brief] [-q] [-r<sid1>] [-r<sid2>] [diffopts] sccsfile..." |
928 | 30 |
94190
fad57210c7d2
* lisp/vc-sccs.el (vc-sccs-do-command): New fun. Use the "sccs" command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
80512
diff
changeset
|
31 # 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:
80512
diff
changeset
|
32 # 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
|
33 |
69559
130314bad206
Use "echo" as a default for $echo, otherwise we'll execute $DIFF
André Spiegel <spiegel@gnu.org>
parents:
68647
diff
changeset
|
34 echo="echo" |
16804
0ba6599135d6
(PATH): Add /usr/xpg4/bin,
Paul Eggert <eggert@twinsun.com>
parents:
12507
diff
changeset
|
35 sid1= sid2= |
928 | 36 |
37 for f | |
38 do | |
39 case $f in | |
40 -*) | |
41 case $f in | |
5211 | 42 --brief) |
43 DIFF=cmp;; | |
3933 | 44 -q) |
45 echo=:;; | |
928 | 46 -r?*) |
47 case $sid1 in | |
16804
0ba6599135d6
(PATH): Add /usr/xpg4/bin,
Paul Eggert <eggert@twinsun.com>
parents:
12507
diff
changeset
|
48 '') |
928 | 49 sid1=$f |
50 ;; | |
51 *) | |
52 case $sid2 in | |
53 ?*) echo "$usage" >&2; exit 2 ;; | |
54 esac | |
55 sid2=$f | |
56 ;; | |
57 esac | |
58 ;; | |
59 *) | |
60 options="$options $f" | |
61 ;; | |
62 esac | |
63 shift | |
64 ;; | |
65 *) | |
66 break | |
67 ;; | |
68 esac | |
69 done | |
70 | |
71 case $# in | |
72 0) | |
73 echo "$usage" >&2 | |
74 exit 2 | |
75 esac | |
76 | |
77 | |
78 rev1= rev2= status=0 | |
79 trap 'status=2; exit' 1 2 13 15 | |
80 trap 'rm -f $rev1 $rev2 || status=2; exit $status' 0 | |
81 | |
82 for f | |
83 do | |
84 s=2 | |
85 | |
86 case $f in | |
87 s.* | */s.*) | |
88 if | |
80512
444a87e05509
2008-04-18 Steve Grubb <sgrubb@redhat.com> (tiny change)
Romain Francoise <romain@orebokech.com>
parents:
79748
diff
changeset
|
89 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:
80512
diff
changeset
|
90 sccs get -s -p -k $sid1 "$f" > $rev1 && |
928 | 91 case $sid2 in |
92 '') | |
93 workfile=`expr " /$f" : '.*/s.\(.*\)'` | |
94 ;; | |
95 *) | |
80512
444a87e05509
2008-04-18 Steve Grubb <sgrubb@redhat.com> (tiny change)
Romain Francoise <romain@orebokech.com>
parents:
79748
diff
changeset
|
96 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:
80512
diff
changeset
|
97 sccs get -s -p -k $sid2 "$f" > $rev2 |
928 | 98 workfile=$rev2 |
99 esac | |
100 then | |
69559
130314bad206
Use "echo" as a default for $echo, otherwise we'll execute $DIFF
André Spiegel <spiegel@gnu.org>
parents:
68647
diff
changeset
|
101 $echo $DIFF $options $rev1 $workfile >&2 |
928 | 102 $DIFF $options $rev1 $workfile |
103 s=$? | |
104 fi | |
105 ;; | |
106 *) | |
107 echo "$0: $f is not an SCCS file" >&2 | |
108 esac | |
109 | |
110 if test $status -lt $s | |
111 then status=$s | |
112 fi | |
113 done | |
52401 | 114 |
115 # arch-tag: 4344ba3a-bcbe-4f77-971c-f43c1606953a |