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: vcdiff using "sccs get" rather than "get" breaks bitkeeper usage. Date: Fri, 29 Oct 2010 16:21:49 +0100 Message-ID: NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: multipart/alternative; boundary="_000_ABFC24E4C13D81489F7F624E14891C860992D6D837ukexmbx1teras_" X-Trace: dough.gmane.org 1288367014 12583 80.91.229.12 (29 Oct 2010 15:43:34 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Fri, 29 Oct 2010 15:43:34 +0000 (UTC) To: 7302@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri Oct 29 17:43:30 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 1PBr71-00087L-GA for geb-bug-gnu-emacs@m.gmane.org; Fri, 29 Oct 2010 17:43:28 +0200 Original-Received: from localhost ([127.0.0.1]:57074 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PBr70-0007Is-Fk for geb-bug-gnu-emacs@m.gmane.org; Fri, 29 Oct 2010 11:43:26 -0400 Original-Received: from [140.186.70.92] (port=60560 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PBr6s-0007Gm-Ua for bug-gnu-emacs@gnu.org; Fri, 29 Oct 2010 11:43:20 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PBr6r-0006UQ-BF for bug-gnu-emacs@gnu.org; Fri, 29 Oct 2010 11:43:18 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:52731) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PBr6r-0006Tl-8Y for bug-gnu-emacs@gnu.org; Fri, 29 Oct 2010 11:43:17 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.69) (envelope-from ) id 1PBqpC-0004K2-Rr; Fri, 29 Oct 2010 11:25: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: Fri, 29 Oct 2010 15:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 7302 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: X-Debbugs-Original-To: "bug-gnu-emacs@gnu.org" Original-Received: via spool by submit@debbugs.gnu.org id=B.128836587016605 (code B ref -1); Fri, 29 Oct 2010 15:25:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 29 Oct 2010 15:24:30 +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 1PBqoe-0004Jm-NN for submit@debbugs.gnu.org; Fri, 29 Oct 2010 11:24:29 -0400 Original-Received: from eggs.gnu.org ([140.186.70.92]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1PBqiE-0004Gm-2Q for submit@debbugs.gnu.org; Fri, 29 Oct 2010 11:17:51 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PBqmG-00027L-7q for submit@debbugs.gnu.org; Fri, 29 Oct 2010 11:22:02 -0400 Original-Received: from lists.gnu.org ([199.232.76.165]:57916) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PBqmG-00027G-22 for submit@debbugs.gnu.org; Fri, 29 Oct 2010 11:22:00 -0400 Original-Received: from [140.186.70.92] (port=50275 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PBqmB-0006Br-7d for bug-gnu-emacs@gnu.org; Fri, 29 Oct 2010 11:21:59 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PBqm9-00024O-BB for bug-gnu-emacs@gnu.org; Fri, 29 Oct 2010 11:21:55 -0400 Original-Received: from p01c11o144.mxlogic.net ([208.65.144.67]:55701) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PBqm9-00023p-34 for bug-gnu-emacs@gnu.org; Fri, 29 Oct 2010 11:21:53 -0400 Original-Received: from unknown [213.121.168.131] (EHLO ukmx1.bluearc.com) by p01c11o144.mxlogic.net(mxl_mta-6.7.0-2) over TLS secured channel with ESMTP id e86eacc4.0.12077.00-302.34046.p01c11o144.mxlogic.net (envelope-from ); Fri, 29 Oct 2010 09:21:52 -0600 (MDT) X-MXL-Hash: 4ccae69078f9a85c-a9ed30b5f3978ed0852a70456f7d014df03af7c4 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; Fri, 29 Oct 2010 16:21:49 +0100 Thread-Topic: vcdiff using "sccs get" rather than "get" breaks bitkeeper usage. Thread-Index: Act3fQGMXwswT1joTzejH1IffB1wTg== 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=q_ef9CGgqxkA:10 a=BLceEmwcHowA:10 a=xqWC_Br6kY] X-AnalysisOut: [4A:10 a=sIqM7rbIUs2FIam8obyq6w==:17 a=vCRRhdo5AwGxAWxxfBUA] X-AnalysisOut: [:9 a=HdzpgNOxwW4F8GqbkLgA:7 a=qmFOur4xRsFTEaCO27m3viVyvbMA] X-AnalysisOut: [:4 a=CjuIK1q_8ugA:10 a=SSmOFEACAAAA:8 a=Y2VNeNrzAAAA:8 a=y] X-AnalysisOut: [MhMjlubAAAA:8 a=TW66zc2HAAAA:8 a=HQ31llbKAAAA:8 a=EeqF8PR8] X-AnalysisOut: [SeLHqD_FUnYA:9 a=r92GSP60U79g1wwdtx4A:7 a=FK0Zpk4OBOjQgf0y] X-AnalysisOut: [O1-EJsk4QRoA:4] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Mailman-Approved-At: Fri, 29 Oct 2010 11:24:27 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list Resent-Date: Fri, 29 Oct 2010 11:25: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:41228 Archived-At: --_000_ABFC24E4C13D81489F7F624E14891C860992D6D837ukexmbx1teras_ Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable GNU Emacs 23.2.1 (x86_64-pc-linux-gnu, GTK+ Version 2.20.1) of 2010-08-15 o= n barber, modified by Debian I previously used Emacs 21.4 and its version of the vcdiff script is compat= ible 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 somethi= ng 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 bit= keeper 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 o= r 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=3D`mktemp /tmp/geta.XX= XXXXXX` - 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=3D= `expr " /$f" : '.*/s.\(.*\)'` --_000_ABFC24E4C13D81489F7F624E14891C860992D6D837ukexmbx1teras_ Content-Type: text/html; charset="us-ascii" Content-Transfer-Encoding: quoted-printable

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 vc= diff script is compatible with bk as it just calls “get” and bitkeep= er supplies a get command.  In 23.2.1 the command is “sccs get̶= 1; but there is no sccs with bitkeeper.

 

Although I do not make much use of “M-x vc-diff&= #8221; 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 c= all 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 chan= ge might be reverted or parameterised in future releases?

 

Regards,

  Paul Bristow.

 

 

pbristow@rubin:/usr/lib/emacs/23.2/x86_64-linux-gnu$ d= iff -u vcdiff~ vcdiff

--- vcdiff~       &= nbsp;    2010-08-15 06:59:41.000000000 +0100

+++ vcdiff       &n= bsp;    2010-10-29 16:00:08.000000000 +0100

@@ -87,7 +87,8 @@

         =        s.* | */s.*)

         =             &nb= sp;          if

         =             &nb= sp;            =             &nb= sp; rev1=3D`mktemp /tmp/geta.XXXXXXXX`

-         = ;            &n= bsp;            = ;            sccs get -s -p -k $sid1 "$f" > $rev1 &&

+         = ;            &n= bsp;            = ;            #sccs get -s -p -k $sid1 "$f" > $rev1 &&

+         = ;   get -s -p -k $sid1 "$f" > $rev1 &&

         =             &nb= sp;            =             &nb= sp; case $sid2 in

         =             &nb= sp;            =             &nb= sp; '')

         =             &nb= sp;            =             &nb= sp;            =      workfile=3D`expr " /$f" : '.*/s.\(.*\)'`

--_000_ABFC24E4C13D81489F7F624E14891C860992D6D837ukexmbx1teras_--