From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Paul Bristow Newsgroups: gmane.emacs.bugs Subject: bug#7302: cliff using "sccs get" rather than "get" breaks bitkeeper usage. Date: Mon, 1 Nov 2010 08:44:34 +0000 Message-ID: References: NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable X-Trace: dough.gmane.org 1288602818 13028 80.91.229.12 (1 Nov 2010 09:13:38 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Mon, 1 Nov 2010 09:13:38 +0000 (UTC) Cc: "7302@debbugs.gnu.org" <7302@debbugs.gnu.org> To: Stefan Monnier Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon Nov 01 10:13:33 2010 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1PCqSI-0004kS-6z for geb-bug-gnu-emacs@m.gmane.org; Mon, 01 Nov 2010 10:13:31 +0100 Original-Received: from localhost ([127.0.0.1]:53199 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PCqSG-00015X-2Z for geb-bug-gnu-emacs@m.gmane.org; Mon, 01 Nov 2010 05:13:28 -0400 Original-Received: from [140.186.70.92] (port=60068 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PCqS7-00015S-TM for bug-gnu-emacs@gnu.org; Mon, 01 Nov 2010 05:13:21 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PCqS6-0008Vp-J6 for bug-gnu-emacs@gnu.org; Mon, 01 Nov 2010 05:13:19 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:55017) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PCqS6-0008UE-HJ for bug-gnu-emacs@gnu.org; Mon, 01 Nov 2010 05:13:18 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.69) (envelope-from ) id 1PCpws-00016T-MR; Mon, 01 Nov 2010 04:41:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Paul Bristow Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-To: owner@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 01 Nov 2010 08:41:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 7302 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 7302-submit@debbugs.gnu.org id=B7302.12886008314232 (code B ref 7302); Mon, 01 Nov 2010 08:41:02 +0000 Original-Received: (at 7302) by debbugs.gnu.org; 1 Nov 2010 08:40:31 +0000 Original-Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1PCpwM-00016D-OD for submit@debbugs.gnu.org; Mon, 01 Nov 2010 04:40:30 -0400 Original-Received: from p01c12o141.mxlogic.net ([208.65.145.64]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1PCpwK-000168-Om for 7302@debbugs.gnu.org; Mon, 01 Nov 2010 04:40:29 -0400 Original-Received: from unknown [213.121.168.131] (EHLO p01c12o141.mxlogic.net) by p01c12o141.mxlogic.net(mxl_mta-6.7.0-2) with ESMTP id 50e7ecc4.6e48f940.308301.00-486.690026.p01c12o141.mxlogic.net (envelope-from ); Mon, 01 Nov 2010 02:44:53 -0600 (MDT) X-MXL-Hash: 4cce7e0528609c6b-23a041aa53ca61d9e81e51d0bc8a0534ee5315c3 Original-Received: from unknown [213.121.168.131] (EHLO ukmx1.bluearc.com) by p01c12o141.mxlogic.net(mxl_mta-6.7.0-2) over TLS secured channel with ESMTP id 4fd7ecc4.0.308278.00-332.689951.p01c12o141.mxlogic.net (envelope-from ); Mon, 01 Nov 2010 02:44:38 -0600 (MDT) X-MXL-Hash: 4cce7df6185b0486-74e70ae79a0f26e2a62d1cb81e74bbe368871be4 Original-Received: from uk-ex-mbx1.terastack.bluearc.com ([fe80::b043:d9a0:8849:e7e5]) by uk-ex-cas.terastack.bluearc.com ([fe80::1d69:5adf:7e78:a1dc%10]) with mapi; Mon, 1 Nov 2010 08:44:35 +0000 Thread-Topic: bug#7302: cliff using "sccs get" rather than "get" breaks bitkeeper usage. Thread-Index: Act3jArdvhwZ/25ISpO1dh7xPlDbjQCFLu3A In-Reply-To: Accept-Language: en-US, en-GB Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US, en-GB X-Spam: [F=0.2000000000; CM=0.500; S=0.200(2010073001)] X-MAIL-FROM: X-SOURCE-IP: [213.121.168.131] X-AnalysisOut: [v=1.0 c=1 a=LLexYsgmVGYA:10 a=BLceEmwcHowA:10 a=kj9zAlcOel] X-AnalysisOut: [0A:10 a=xqWC_Br6kY4A:10 a=sIqM7rbIUs2FIam8obyq6w==:17 a=mD] X-AnalysisOut: [V3o1hIAAAA:8 a=9uQkZDGA7_cCUQk3gQgA:9 a=f3UQiiVyCta2B4XO59] X-AnalysisOut: [9FX2fHBMEA:4 a=CjuIK1q_8ugA:10] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list Resent-Date: Mon, 01 Nov 2010 04:41:02 -0400 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:41330 Archived-At: Thanks for the quick response. I have tried that patch and can confirm tha= t it works for me. Regards, Paul. -----Original Message----- From: Stefan Monnier [mailto:monnier@iro.umontreal.ca]=20 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 bit= keeper 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 =3D=3D=3D 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=3D2; exit' 1 2 13 15 trap 'rm -f $rev1 $rev2 || status=3D2; exit $status' 0 =20 +if ! type sccs >/dev/null 2>&1 && type get >/dev/null 2>&1 ; then + sccsget=3D"get" +else + sccsget=3D"sccs get" +fi + for f do s=3D2 @@ -87,14 +93,14 @@ s.* | */s.*) if rev1=3D`mktemp /tmp/geta.XXXXXXXX` - sccs get -s -p -k $sid1 "$f" > $rev1 && + $sccsget -s -p -k $sid1 "$f" > $rev1 && case $sid2 in '') workfile=3D`expr " /$f" : '.*/s.\(.*\)'` ;; *) rev2=3D`mktemp /tmp/getb.XXXXXXXX` - sccs get -s -p -k $sid2 "$f" > $rev2 + $sccsget -s -p -k $sid2 "$f" > $rev2 workfile=3D$rev2 esac then