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

[Paul Bristow <pbristow@bluearc.com>]

Thanks for the quick response.  I have tried that patch and can confirm that it works for me.
Regards,
  Paul.


-----Original Message-----
From: Stefan Monnier [mailto:monnier@iro.umontreal.ca] 
Sent: 29 October 2010 18:09
To: Paul Bristow
Cc: 7302@debbugs.gnu.org
Subject: Re: bug#7302: vcdiff using "sccs get" rather than "get" breaks bitkeeper usage.

> 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.
[...]
> I have found that reverting to the old behaviour with the patch that
> I have included below solves the problem.

But using just `get' won't work with CSSC, for example.

> Perhaps the change might be reverted or parameterised in
> future releases?

We could first try `sccs get' and if that fails fallback on `get'.
Can you confirm that the patch below works for you?


        Stefan


=== modified file 'lib-src/vcdiff'
--- lib-src/vcdiff	2010-01-13 08:35:10 +0000
+++ lib-src/vcdiff	2010-10-29 17:08:47 +0000
@@ -79,6 +79,12 @@
 trap 'status=2; exit' 1 2 13 15
 trap 'rm -f $rev1 $rev2 || status=2; exit $status' 0
 
+if ! type sccs >/dev/null 2>&1 && type get >/dev/null 2>&1 ; then
+    sccsget="get"
+else
+    sccsget="sccs get"
+fi
+
 for f
 do
 	s=2
@@ -87,14 +93,14 @@
 	s.* | */s.*)
 		if
 			rev1=`mktemp /tmp/geta.XXXXXXXX`
-			sccs get -s -p -k $sid1 "$f" > $rev1 &&
+			$sccsget -s -p -k $sid1 "$f" > $rev1 &&
 			case $sid2 in
 			'')
 				workfile=`expr " /$f" : '.*/s.\(.*\)'`
 				;;
 			*)
 				rev2=`mktemp /tmp/getb.XXXXXXXX`
-				sccs get -s -p -k $sid2 "$f" > $rev2
+				$sccsget -s -p -k $sid2 "$f" > $rev2
 				workfile=$rev2
 			esac
 		then