bug#7302: vcdiff using "sccs get" rather than "get" breaks bitkeeper usage.

[Paul Bristow <pbristow@bluearc.com>]

[-- Attachment #1: Type: text/plain, Size: 1734 bytes --]

GNU Emacs 23.2.1 (x86_64-pc-linux-gnu, GTK+ Version 2.20.1) of 2010-08-15 on barber, modified by Debian

I previously used Emacs 21.4 and its version of the vcdiff script is compatible with bk as it just calls "get" and bitkeeper supplies a get command.  In 23.2.1 the command is "sccs get" but there is no sccs with bitkeeper.

Although I do not make much use of "M-x vc-diff" and could just use something different instead it does cause some problems as I have my "EDITOR" set to emacs in the environment and therefore when I fix merge conflicts in bitkeeper the file is passed to emacs.  The call to emacs always fails like so:
/usr/lib/emacs/23.2/x86_64-linux-gnu/vcdiff: 113: sccs: not found

I have found that reverting to the old behaviour with the patch that I have included below solves the problem.  Perhaps the change might be reverted or parameterised in future releases?

Regards,
  Paul Bristow.


pbristow@rubin:/usr/lib/emacs/23.2/x86_64-linux-gnu$ diff -u vcdiff~ vcdiff
--- vcdiff~            2010-08-15 06:59:41.000000000 +0100
+++ vcdiff            2010-10-29 16:00:08.000000000 +0100
@@ -87,7 +87,8 @@
                s.* | */s.*)
                                if
                                                rev1=`mktemp /tmp/geta.XXXXXXXX`
-                                              sccs get -s -p -k $sid1 "$f" > $rev1 &&
+                                              #sccs get -s -p -k $sid1 "$f" > $rev1 &&
+            get -s -p -k $sid1 "$f" > $rev1 &&
                                                case $sid2 in
                                                '')
                                                                workfile=`expr " /$f" : '.*/s.\(.*\)'`

[-- Attachment #2: Type: text/html, Size: 8959 bytes --]