From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.bugs Subject: bug#7302: vcdiff using "sccs get" rather than "get" breaks bitkeeper usage. Date: Fri, 29 Oct 2010 13:09:24 -0400 Message-ID: References: NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1288372405 5988 80.91.229.12 (29 Oct 2010 17:13:25 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Fri, 29 Oct 2010 17:13:25 +0000 (UTC) Cc: 7302@debbugs.gnu.org To: Paul Bristow Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri Oct 29 19:13:23 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 1PBsW1-0004tZ-Dm for geb-bug-gnu-emacs@m.gmane.org; Fri, 29 Oct 2010 19:13:23 +0200 Original-Received: from localhost ([127.0.0.1]:50552 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PBsVz-0004Hp-EG for geb-bug-gnu-emacs@m.gmane.org; Fri, 29 Oct 2010 13:13:19 -0400 Original-Received: from [140.186.70.92] (port=57249 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PBsVq-0004H0-JJ for bug-gnu-emacs@gnu.org; Fri, 29 Oct 2010 13:13:11 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PBsVo-00023L-Py for bug-gnu-emacs@gnu.org; Fri, 29 Oct 2010 13:13:09 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:52968) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PBsVo-00023F-OT for bug-gnu-emacs@gnu.org; Fri, 29 Oct 2010 13:13:08 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.69) (envelope-from ) id 1PBsOw-000536-6k; Fri, 29 Oct 2010 13:06:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Monnier 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 17:06: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.128837191419396 (code B ref 7302); Fri, 29 Oct 2010 17:06:02 +0000 Original-Received: (at 7302) by debbugs.gnu.org; 29 Oct 2010 17:05:14 +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 1PBsOA-00052n-Fi for submit@debbugs.gnu.org; Fri, 29 Oct 2010 13:05:14 -0400 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.183] helo=ironport2-out.pppoe.ca) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1PBsO8-00052i-VO for 7302@debbugs.gnu.org; Fri, 29 Oct 2010 13:05:13 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AgwKAE+cykzO+Krc/2dsb2JhbACgVn1yvzqFSASSKg X-IronPort-AV: E=Sophos;i="4.58,260,1286164800"; d="scan'208";a="81049577" Original-Received: from 206-248-170-220.dsl.teksavvy.com (HELO ceviche.home) ([206.248.170.220]) by ironport2-out.pppoe.ca with ESMTP/TLS/ADH-AES256-SHA; 29 Oct 2010 13:09:24 -0400 Original-Received: by ceviche.home (Postfix, from userid 20848) id 6EEA1660F5; Fri, 29 Oct 2010 13:09:24 -0400 (EDT) In-Reply-To: (Paul Bristow's message of "Fri, 29 Oct 2010 16:21:49 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list Resent-Date: Fri, 29 Oct 2010 13:06: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:41234 Archived-At: > 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