diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2008-04-19 21:53:55 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2008-04-19 21:53:55 +0000 |
| commit | 14b114019ec13087e751547aa7f8784073463020 (patch) | |
| tree | 1499a3e62bc07b37ad73c1b296a3d28a7ba47131 /lib-src | |
| parent | 6ddfc11361786ff2ea0d1917910502b8471023c1 (diff) | |
| download | emacs-14b114019ec13087e751547aa7f8784073463020.tar.gz | |
* lisp/vc-sccs.el (vc-sccs-do-command): New fun. Use the "sccs" command.
(vc-sccs-register, vc-sccs-checkin, vc-sccs-find-revision)
(vc-sccs-checkout, vc-sccs-rollback, vc-sccs-revert)
(vc-sccs-steal-lock, vc-sccs-modify-change-comment)
(vc-sccs-print-log): Use it.
* lisp/vc-hooks.el (vc-path): Remove SCCS-specific hack.
* lib-src/vcdiff: Use "sccs get" rather than "get"; leave PATH alone.
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/ChangeLog | 4 | ||||
| -rwxr-xr-x | lib-src/vcdiff | 7 |
2 files changed, 8 insertions, 3 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 86448ddbde6..ab8d490faef 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,7 @@ +2008-04-19 Stefan Monnier <monnier@iro.umontreal.ca> + + * vcdiff: Use "sccs get" rather than "get"; leave PATH alone. + 2008-04-18 Steve Grubb <sgrubb@redhat.com> (tiny change) * vcdiff: Use mktemp (CVE-2008-1694). diff --git a/lib-src/vcdiff b/lib-src/vcdiff index cb977709db0..1fd4f3078fa 100755 --- a/lib-src/vcdiff +++ b/lib-src/vcdiff @@ -27,7 +27,8 @@ DIFF="diff" usage="$0: Usage: vcdiff [--brief] [-q] [-r<sid1>] [-r<sid2>] [diffopts] sccsfile..." -PATH=$PATH:/usr/ccs/bin:/usr/sccs:/usr/xpg4/bin # common SCCS hangouts +# 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= @@ -85,14 +86,14 @@ do s.* | */s.*) if rev1=`mktemp /tmp/geta.XXXXXXXX` - get -s -p -k $sid1 "$f" > $rev1 && + sccs get -s -p -k $sid1 "$f" > $rev1 && case $sid2 in '') workfile=`expr " /$f" : '.*/s.\(.*\)'` ;; *) rev2=`mktemp /tmp/getb.XXXXXXXX` - get -s -p -k $sid2 "$f" > $rev2 + sccs get -s -p -k $sid2 "$f" > $rev2 workfile=$rev2 esac then |